--- a/Semaphore.st Sat Aug 13 06:52:18 2016 +0200
+++ b/Semaphore.st Tue Aug 23 09:54:28 2016 +0100
@@ -912,7 +912,7 @@
waitUncountedWithTimeoutMs:milliSeconds
"wait for the semaphore; do not consume the resource
- (i.e. do not count down).
+ (i.e. do not count down).
Abort the wait after some time.
return the receiver if the semaphore triggered normal, nil if we return
due to a timeout.
@@ -921,7 +921,7 @@
However, polling is not the intended use of semaphores, though.
If milliSeconds is nil, wait without timeout."
- |activeProcess timeoutOccured wasBlocked timeoutBlock now endTime|
+ |activeProcess timeoutOccurred wasBlocked timeoutBlock now endTime|
count > 0 ifTrue:[
^ self
@@ -937,7 +937,7 @@
].
activeProcess := Processor activeProcess.
- timeoutOccured := false.
+ timeoutOccurred := false.
milliSeconds notNil ifTrue:[
"Wait with timeout: calculate the end-time"
@@ -945,7 +945,7 @@
endTime := OperatingSystem millisecondTimeAdd:now and:milliSeconds.
timeoutBlock := [
- timeoutOccured := true.
+ timeoutOccurred := true.
timeoutBlock:= nil.
Processor resume:activeProcess.
].
@@ -980,7 +980,7 @@
].
self removeWaitingProcess:activeProcess.
- timeoutOccured ifTrue:[
+ timeoutOccurred ifTrue:[
wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
^ nil
].
@@ -1028,7 +1028,7 @@
However, polling is not the intended use of semaphores, though.
If milliSeconds is nil, wait without timeout."
- |activeProcess timeoutOccured wasBlocked timeoutBlock now endTime|
+ |activeProcess timeoutOccurred wasBlocked timeoutBlock now endTime|
wasBlocked := OperatingSystem blockInterrupts.
@@ -1040,7 +1040,7 @@
].
activeProcess := Processor activeProcess.
- timeoutOccured := false.
+ timeoutOccurred := false.
milliSeconds notNil ifTrue:[
"Wait with timeout: calculate the end-time"
@@ -1048,7 +1048,7 @@
endTime := OperatingSystem millisecondTimeAdd:now and:milliSeconds.
timeoutBlock := [
- timeoutOccured := true.
+ timeoutOccurred := true.
timeoutBlock:= nil.
Processor resume:activeProcess.
].
@@ -1083,7 +1083,7 @@
].
self removeWaitingProcess:activeProcess.
- timeoutOccured ifTrue:[
+ timeoutOccurred ifTrue:[
wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
^ nil
].
@@ -1120,7 +1120,7 @@
waitStateSymbol is the state the process is set to while waiting - normally #wait."
- |activeProcess timeoutOccured wasBlocked timeoutBlock now endTime|
+ |activeProcess timeoutOccurred wasBlocked timeoutBlock now endTime|
wasBlocked := OperatingSystem blockInterrupts.
@@ -1132,7 +1132,7 @@
].
activeProcess := Processor activeProcess.
- timeoutOccured := false.
+ timeoutOccurred := false.
milliSeconds notNil ifTrue:[
"Wait with timeout: calculate the end-time"
@@ -1140,7 +1140,7 @@
endTime := OperatingSystem millisecondTimeAdd:now and:milliSeconds.
timeoutBlock := [
- timeoutOccured := true.
+ timeoutOccurred := true.
timeoutBlock:= nil.
Processor resume:activeProcess.
].
@@ -1175,7 +1175,7 @@
].
self removeWaitingProcess:activeProcess.
- timeoutOccured ifTrue:[
+ timeoutOccurred ifTrue:[
wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
^ nil
].