Merge pull request #1 from dionisiydk/dev

dionisiydk · web-flow · commit 83cb428a78a5 · 2018-02-05T13:22:26.000+01:00
processTerminationLogicFixed
diff --git a/ReadWriteLock-Tests.package/LocksTestCase.class/instance/passForkedProcesses.st b/ReadWriteLock-Tests.package/LocksTestCase.class/instance/passForkedProcesses.st
@@ -0,0 +1,6 @@
+helpers
+passForkedProcesses
+	"While this trick looks bad it is quite difficult to control processes which are forked by tested code.
+	This yield loop works well in practice.
+	It allow all forked processes proceed"
+	10 timesRepeat: [Processor yield]
diff --git a/ReadWriteLock-Tests.package/LocksTestCase.class/instance/waitForkedProcesses.st b/ReadWriteLock-Tests.package/LocksTestCase.class/instance/waitForkedProcesses.st
@@ -0,0 +1,5 @@
+helpers
+waitForkedProcesses
+
+	[forkedProcesses allSatisfy: [ :each | each isTerminated ]] 
+		whileFalse: [ Processor yield ]
diff --git a/ReadWriteLock-Tests.package/LocksTestCase.class/instance/waitUntil..st b/ReadWriteLock-Tests.package/LocksTestCase.class/instance/waitUntil..st
@@ -0,0 +1,4 @@
+helpers
+waitUntil: conditionBlock
+	
+	conditionBlock whileFalse: [Processor yield]
diff --git a/ReadWriteLock-Tests.package/PrimitiveLockTest.class/instance/testAcquireLockWhenItsAlreadyBusy.st b/ReadWriteLock-Tests.package/PrimitiveLockTest.class/instance/testAcquireLockWhenItsAlreadyBusy.st
@@ -1,11 +1,15 @@
 tests
 testAcquireLockWhenItsAlreadyBusy
 
-	| lastLockAcquired |
+	| lastLockAcquired syncSemaphore lockSemaphore |
 	lastLockAcquired := false.
-	self fork: [ lock acquire. 10 seconds wait. ].
+	syncSemaphore := Semaphore new.
+	lockSemaphore := Semaphore new.
+	self fork: [ lock acquire. syncSemaphore signal. lockSemaphore wait. ].
+	syncSemaphore wait.
 	self fork: [ lock acquire. lastLockAcquired := true ].
-	10 milliSeconds wait.
+	self passForkedProcesses.
+	lockSemaphore signal.
 	
 	self deny: lastLockAcquired
 	
diff --git a/ReadWriteLock-Tests.package/PrimitiveLockTest.class/instance/testReleasingLock.st b/ReadWriteLock-Tests.package/PrimitiveLockTest.class/instance/testReleasingLock.st
@@ -1,11 +1,15 @@
 tests
 testReleasingLock
 
-	| lastExecuted |
+	| lastExecuted syncSemaphore lockSemaphore |
 	lastExecuted := false.
-	self fork: [ lock acquire. 10 seconds wait].
+	syncSemaphore := Semaphore new.
+	lockSemaphore := Semaphore new.
+
+	self fork: [ lock acquire. syncSemaphore signal. lockSemaphore wait].
 	self fork: [ lock acquire. lastExecuted := true].
-	10 milliSeconds wait.
+	syncSemaphore wait.
+	self passForkedProcesses.
 	lock release.	
 	self waitLastProcessFinished.
 	self assert: lastExecuted
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testFailedReadShouldUnblockWrite.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testFailedReadShouldUnblockWrite.st
@@ -6,7 +6,7 @@ testFailedReadShouldUnblockWrite
 		[lock criticalRead: [ 10 milliSeconds wait. self error: 'failed read']] ifError: [  ]
 	].	
 	self fork: [lock criticalWrite: [ executed := true ]].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	executed should be: true
 	
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testFailedWriteShouldUnblockRead.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testFailedWriteShouldUnblockRead.st
@@ -6,7 +6,7 @@ testFailedWriteShouldUnblockRead
 		[lock criticalWrite: [ 10 milliSeconds wait. self error: 'failed write']] ifError: [  ]
 	].	
 	self fork: [lock criticalRead: [ executed := true ]].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	executed should be: true
 	
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testMultipleReadsShouldNotBlockEachOthers.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testMultipleReadsShouldNotBlockEachOthers.st
@@ -10,7 +10,7 @@ testMultipleReadsShouldNotBlockEachOthers
 			firstReadExecutedAfterLast := lastReadExecuted]
 	].	
 	self fork: [lock criticalRead: [ lastReadExecuted := true ]].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	lastReadExecuted should be: true.
 	firstReadExecutedAfterLast should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testMultipleWritesShouldWaitEachOther.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testMultipleWritesShouldWaitEachOther.st
@@ -10,7 +10,7 @@ testMultipleWritesShouldWaitEachOther
 			lastWriteExecutedAfterFirst := lastWriteExecuted not]
 	].	
 	self fork: [lock criticalWrite: [ lastWriteExecuted := true ]].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	lastWriteExecuted should be: true.
 	lastWriteExecutedAfterFirst should be: true.
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testReadShouldWaitTwoRecursiveWritesInSameProcess.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testReadShouldWaitTwoRecursiveWritesInSameProcess.st
@@ -12,7 +12,7 @@ testReadShouldWaitTwoRecursiveWritesInSameProcess
 		].
 	].
 	self fork: [ lock criticalRead: [ readExecuted := true ] ].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	readExecuted should be: true.
 	readExecutedAfterWrites should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testReadShouldWaitWrite.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testReadShouldWaitWrite.st
@@ -10,7 +10,7 @@ testReadShouldWaitWrite
 			readExecutedAfterWrite := readExecuted not]
 	].	
 	self fork: [lock criticalRead: [ readExecuted := true ]].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	readExecuted should be: true.
 	readExecutedAfterWrite should be: true.
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testRecursiveReadAndWriteInsideSameProcess.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testRecursiveReadAndWriteInsideSameProcess.st
@@ -6,6 +6,6 @@ testRecursiveReadAndWriteInsideSameProcess
 		lock criticalRead: [ 
 			lock criticalWrite: [executed := true]].
 	].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	executed should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testRecursiveReadsInsideSameProcess.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testRecursiveReadsInsideSameProcess.st
@@ -6,6 +6,6 @@ testRecursiveReadsInsideSameProcess
 		lock criticalRead: [ 
 			lock criticalRead: [executed := true]].
 	].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	executed should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testRecursiveWriteAndReadInsideSameProcess.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testRecursiveWriteAndReadInsideSameProcess.st
@@ -7,6 +7,6 @@ testRecursiveWriteAndReadInsideSameProcess
 			lock criticalRead: [executed := true]
 		].
 	].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	executed should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testRecursiveWritesInsideSameProcess.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testRecursiveWritesInsideSameProcess.st
@@ -7,6 +7,6 @@ testRecursiveWritesInsideSameProcess
 			lock criticalWrite: [executed := true]
 		].
 	].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	executed should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testTerminatingReadWhichWaitingWriteAndAnotherRead.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testTerminatingReadWhichWaitingWriteAndAnotherRead.st
@@ -1,20 +1,28 @@
 tests
 testTerminatingReadWhichWaitingWriteAndAnotherRead
 
-	| lastReadExecutedAfterWrite lastReaderExecuted secondReaderExecuted secondReader |
+	| lastReadExecutedAfterWrite lastReaderExecuted secondReaderExecuted secondReader syncSemaphore writeSemaphore |
 	lastReadExecutedAfterWrite := false.
 	secondReaderExecuted := false.
 	lastReaderExecuted := false.
-
+	syncSemaphore := Semaphore new.
+	writeSemaphore := Semaphore new.
 	self fork: [
-		lock criticalWrite: [ 10 milliSeconds wait. 
+		lock criticalWrite: [ syncSemaphore signal. writeSemaphore wait. 
 			lastReadExecutedAfterWrite := lastReaderExecuted not ]
 	].	
+	syncSemaphore wait.
 	secondReader := self fork: [lock criticalRead: [ secondReaderExecuted := true ]].	
 	self fork: [lock criticalRead: [ lastReaderExecuted := true ]].
-	10 milliSeconds wait.
+	
+	self passForkedProcesses.
+	lastReaderExecuted should be: false.
 	secondReader terminate.
-	15 milliSeconds wait.	
+	
+	self passForkedProcesses. "Now last read should be still locked"
+	lastReaderExecuted should be: false.
+	writeSemaphore signal.
+	self waitForkedProcesses.
 	lastReaderExecuted should be: true.
 	secondReaderExecuted should be: false.
 	lastReadExecutedAfterWrite should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testTerminatingWriteWhichWaitingAnotherTwoWrites.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testTerminatingWriteWhichWaitingAnotherTwoWrites.st
@@ -1,20 +1,25 @@
 tests
 testTerminatingWriteWhichWaitingAnotherTwoWrites
 
-	| lastWriteExecutedAfterFirst lastWriteExecuted secondWriteExecuted secondWriter |
+	| lastWriteExecutedAfterFirst lastWriteExecuted secondWriteExecuted secondWriter syncSemaphore writeSemaphore |
 	lastWriteExecutedAfterFirst := false.
 	secondWriteExecuted := false.
 	lastWriteExecuted := false.
-
+	syncSemaphore := Semaphore new.
+	writeSemaphore := Semaphore new.
 	self fork: [
-		lock criticalWrite: [ 10 milliSeconds wait. 
+		lock criticalWrite: [ syncSemaphore signal. writeSemaphore wait.
 			lastWriteExecutedAfterFirst := lastWriteExecuted not ]
 	].	
+	syncSemaphore wait.
 	secondWriter := self fork: [lock criticalWrite: [ secondWriteExecuted := true ]].	
 	self fork: [lock criticalWrite: [ lastWriteExecuted := true ]].
-	5 milliSeconds wait.
+	
+	self passForkedProcesses.
+	lastWriteExecuted should be: false.
 	secondWriter terminate.
-	15 milliSeconds wait.	
+	writeSemaphore signal.	
+	self waitForkedProcesses.
 	lastWriteExecuted should be: true.
 	secondWriteExecuted should be: false.
 	lastWriteExecutedAfterFirst should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitRead.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitRead.st
@@ -10,7 +10,7 @@ testWriteShouldWaitRead
 			writeExecutedAfterRead := writeExecuted not ]
 	].	
 	self fork: [lock criticalWrite: [ writeExecuted := true ]].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	writeExecuted should be: true.
 	writeExecutedAfterRead should be: true.
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitThreeRecursiveReadReadWriteInSameProcess.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitThreeRecursiveReadReadWriteInSameProcess.st
@@ -11,7 +11,7 @@ testWriteShouldWaitThreeRecursiveReadReadWriteInSameProcess
 		].
 	].
 	self fork: [ lock criticalWrite: [ lastWriteExecuted := true ] ].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	lastWriteExecuted should be: true.
 	lastWriteExecutedAfterRecursiveWriteRead should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitThreeRecursiveReadWriteWriteInSameProcess.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitThreeRecursiveReadWriteWriteInSameProcess.st
@@ -11,7 +11,7 @@ testWriteShouldWaitThreeRecursiveReadWriteWriteInSameProcess
 		].
 	].
 	self fork: [ lock criticalWrite: [ lastWriteExecuted := true ] ].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	lastWriteExecuted should be: true.
 	lastWriteExecutedAfterRecursiveWriteRead should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitTwoRead.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitTwoRead.st
@@ -11,7 +11,7 @@ testWriteShouldWaitTwoRead
 			writeExecutedAfterRead := writeExecuted not ].		
 	].	
 	self fork: [lock criticalWrite: [ writeExecuted := true ]].
-	35 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	writeExecuted should be: true.
 	writeExecutedAfterRead should be: true.
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitTwoRecursiveReadWriteInSameProcess.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitTwoRecursiveReadWriteInSameProcess.st
@@ -12,7 +12,7 @@ testWriteShouldWaitTwoRecursiveReadWriteInSameProcess
 		].
 	].
 	self fork: [ lock criticalWrite: [ lastWriteExecuted := true ] ].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	lastWriteExecuted should be: true.
 	lastWriteExecutedAfterRecursiveWriteRead should be: true
diff --git a/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitTwoRecursiveWriteReadInSameProcess.st b/ReadWriteLock-Tests.package/ReadWriteLockTests.class/instance/testWriteShouldWaitTwoRecursiveWriteReadInSameProcess.st
@@ -12,7 +12,7 @@ testWriteShouldWaitTwoRecursiveWriteReadInSameProcess
 		].
 	].
 	self fork: [ lock criticalWrite: [ lastWriteExecuted := true ] ].
-	15 milliSeconds wait.
+	self waitForkedProcesses.
 	
 	lastWriteExecuted should be: true.
 	lastWriteExecutedAfterRecursiveWriteRead should be: true
diff --git a/ReadWriteLock.package/PrimitiveLock.class/instance/handleProcessTerminationOfWaitingContext..st b/ReadWriteLock.package/PrimitiveLock.class/instance/handleProcessTerminationOfWaitingContext..st
@@ -7,18 +7,15 @@ This method called from Process>>terminate when it detects waiting me. My users
 		ensure: [ releaseNotRequired ifFalse: [ lock release ] ]
 This code is not working correctly by itself. When current process waits on 'lock acquire' somebody can terminate it and ensure will release me which shoud not happens in this case. But if I was acquired but process is just suspended on 'lock acquire' then process termination should execute ensure block to release me.  
 This problem solved by this special method. Process>>terminate detects first case and inject right value for tracking variable.  Senders should mark method with special pragma 
-<lockAt: #lockVariableName tracksStateAt: 1> 'index of local variable'
-Method can contain mulpible pragmas for referenced locks. (ReadWriteLock for example needs this).
-"
-	| receiver lockFlagIndex |
+<lockAt: #lockVariableName tracksStateAt: #tempName> 'var name which keeps the lock state'
+Method can contain multiple pragmas for referenced locks. (ReadWriteLock for example needs this)"
+	| receiver |
 	receiver := suspendedContext receiver.
 	
-	suspendedContext method pragmas do: [ :pragma | 
-		
+	suspendedContext method pragmas do: [ :pragma | 		
 		pragma keyword == #lockAt:tracksStateAt: ifTrue: [ 
 			(receiver readSlotNamed: pragma arguments first) == self ifTrue: [ 
-				lockFlagIndex := pragma arguments last.
-				suspendedContext home namedTempAt: lockFlagIndex put: true
+				self resetLockFlag: pragma arguments last in: suspendedContext home.
 			 ]
 		]
 	 ].
diff --git a/ReadWriteLock.package/PrimitiveLock.class/instance/resetLockFlag.in..st b/ReadWriteLock.package/PrimitiveLock.class/instance/resetLockFlag.in..st
@@ -0,0 +1,4 @@
+process termination handling
+resetLockFlag: flagTempName in: criticalContext
+	
+	criticalContext debuggerMap tempNamed: flagTempName in: criticalContext put: true
diff --git a/ReadWriteLock.package/ReadWriteLock.class/instance/criticalRead..st b/ReadWriteLock.package/ReadWriteLock.class/instance/criticalRead..st
@@ -7,8 +7,8 @@ criticalRead: aBlock
 	Given block is safe for recursive read/write sections
 "
 	| readLockAcquiredNotHere newReadersCount  writeLockAcquiredNotHere readingPrepared writeLockWasAsked |
-	<lockAt: #readLock tracksStateAt: 1>
-	<lockAt: #writeLock tracksStateAt: 3>
+	<lockAt: #readLock tracksStateAt: #readLockAcquiredNotHere>
+	<lockAt: #writeLock tracksStateAt: #writeLockAcquiredNotHere>
 		
 	readLockAcquiredNotHere := true.
 	writeLockAcquiredNotHere := true.
@@ -26,9 +26,10 @@ criticalRead: aBlock
 	readingPrepared := true.
 	readLockAcquiredNotHere := true.
 	readLock release] ifCurtailed: [
+
 		newReadersCount ifNotNil: [ currentReaders := newReadersCount - 1 ]. "we should restore previous value because we can't prepare reading (process was terminated)"
 		readLockAcquiredNotHere ifFalse: [readLock release].
-		writeLockAcquiredNotHere ifFalse: [ writeLock release]].		
+		writeLockAcquiredNotHere ifFalse: [writeLock release]].		
 	^aBlock value] ensure: [ 
 		readingPrepared ifTrue: [ 
 			readLock acquire.
diff --git a/ReadWriteLock.package/ReadWriteLock.class/instance/criticalWrite..st b/ReadWriteLock.package/ReadWriteLock.class/instance/criticalWrite..st
@@ -7,7 +7,7 @@ criticalWrite: aBlock
 	Given block is safe for recursive read/write sections
 "
 	| lockAcquiredNotHere |
-	<lockAt: #writeLock tracksStateAt: 1>
+	<lockAt: #writeLock tracksStateAt: #lockAcquiredNotHere>
 	
 	lockAcquiredNotHere := true.
 	

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +helpers
 +waitUntil: conditionBlock
++
 +	conditionBlock whileFalse: [Processor yield]