hg/stx-libjava: comparison JavaMonitor.st

equal deleted inserted replaced

-:32e335ed7c6f
+:f7c384698e7f
 "{ Package: 'stx:libjava' }"
 "{ NameSpace: Smalltalk }"
 Object subclass:#JavaMonitor
-	instanceVariableNames:'owningProcess monitorSema count waitingSema waitEnabled
+	instanceVariableNames:'process sema count waitingSema waitEnabled ownerPrintString'
-		ownerPrintString'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Languages-Java-Support'
 !
 owningProcess
 "Return the process that has acquired (entered) the receiver or
 nil if no process currently has the monitor."
-^ owningProcess
+^ process
 "Created: / 12-08-2017 / 23:11:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 processesEntered
 "Return a alist of processes that entered the monitor. For testing / debugging purposes only!!"
-^ owningProcess isNil
+^ process isNil
 ifTrue:[ #() ]
-ifFalse:[ (Array with: owningProcess) , monitorSema waitingProcesses ]
+ifFalse:[ (Array with: process) , sema waitingProcesses ]
 "Created: / 20-11-2011 / 13:22:15 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 "Modified (format): / 03-06-2017 / 23:10:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 enableWait
 "/ critical region not needed here
 "/ self instVarAccessCritical: [waitEnabled := true].
 waitEnabled := true
 "Created: / 30-11-2011 / 20:34:31 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 "Modified (format): / 11-10-2013 / 11:17:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 waitEnabled
 "Created: / 30-11-2011 / 20:39:31 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 "Modified: / 26-08-2012 / 17:25:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 initializeFor:owningObject thread:threadId nestedLockCount:cnt
 "/    self assert: (owningObject isJavaObject or:[owningObject isJavaClass]).
 waitEnabled := true.
 waitingSema := Semaphore new:0.
 ownerPrintString := owningObject class name , '@' , owningObject identityHash printString.
 "/Not locked...
 threadId == 0 ifTrue:[
-monitorSema := Semaphore new:1.
+sema := Semaphore new:1.
 count := 0.
 ^self.
 ] ifFalse: [
 "threadId is not zero (zero is threadId of scheduler process, which will never try to acquire the monitor)"
 "so it means it is possible that the thin lock is already locked for other thread, we must be careful "
-owningProcess := ObjectMemory processesKnownInVM detect:[:p|p id == threadId] ifNone:[nil].
+process := ObjectMemory processesKnownInVM detect:[:p|p id == threadId] ifNone:[nil].
-self assert: owningProcess notNil.
+self assert: process notNil.
 cnt timesRepeat:[
 "/            JavaVM enteredMonitorsOf:  owningProcess add: owningObject.
 "/            JavaVM acquiredMonitorsOf: owningProcess add: owningObject.
 ].
-monitorSema := Semaphore new: 0.
+sema := Semaphore new: 0.
 count := cnt.
 ].
 "Created: / 26-08-2012 / 17:02:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 03-06-2017 / 23:10:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 acquire
 "Acquire (enter) the monitor and return `true`.
 See JVM spec, section 4.5, MONITORENTER.
 "
-| thisProcess wasBlocked hasAcquired |
+| active wasBlocked acquired |
-hasAcquired := nil.
+acquired := nil.
-thisProcess := Processor activeProcess.
+active := Processor activeProcess.
-owningProcess == thisProcess ifTrue:[
+process == active ifTrue:[
 "/ Process already ackquired the monitor, increase the
 "/ count and continue...
 count := count + 1.
-^self.
+^true.
 ].
 wasBlocked := OperatingSystem blockInterrupts.
 [
-(owningProcess notNil and:[ owningProcess isDead ]) ifTrue:[
+(process notNil and:[ process isDead ]) ifTrue:[
 "/ Process that acquired the monitor died without releasing it.
 "/ This should not happen.
 wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
 self assert: false description: 'Process that acquired the monitor died without releasing it'.
-owningProcess := nil.
+process := nil.
 count := 0.
 ].
 "/ We need to know that we already waited on and got semaphore
 "/ in case the Semaphore >> #wait is prematurely terminated.
 "/ Q: Can this actually happen? If so, how?
-hasAcquired := monitorSema wait.
+acquired := sema wait.
-owningProcess := thisProcess.
+process := active.
 count := 1.
 wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
 ] ifCurtailed:[
-hasAcquired notNil ifTrue:[
+acquired notNil ifTrue:[
 OperatingSystem blockInterrupts.
 count := 0.
-owningProcess := nil.
+process := nil.
-monitorSema signal.
+sema signal.
 ].
 wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
-]
+].
+^true.
 "Created: / 20-11-2011 / 13:21:46 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 "Modified: / 11-08-2017 / 22:08:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified (comment): / 14-08-2017 / 09:34:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 enter
 <resource: #obsolete>
 self obsoleteMethodWarning: 'Use #acquire instead'.
 ^ self acquire.
 "Created: / 20-11-2011 / 13:21:42 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 "Modified: / 14-08-2017 / 10:20:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 exit
 <resource: #obsolete>
 self obsoleteMethodWarning: 'Use #release instead'.
 ^ self release.
 "Created: / 20-11-2011 / 13:21:54 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 "Modified: / 14-08-2017 / 10:20:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 notify: all
 "
 An implementation of java.lang.Object#notify() and #notifyAll(). If `all` is
 `true` then all waiting threads are notified (see #norifyAll()) otherwise only
 one thread is notified (see #notify()). Returns `true` after when threads have
 been notified or `false` if calling thread does not own the monitor.
 See Java API documentation for java.lang.Object#notify() and #notifyAll().
 https://docs.oracle.com/javase/7/docs/api/java/lang/Object.html#notify()
 https://docs.oracle.com/javase/7/docs/api/java/lang/Object.html#notifyAll()
 "
-| thisProcess |
+| active |
-thisProcess := Processor activeProcess.
+active := Processor activeProcess.
-owningProcess == thisProcess ifFalse:[
+process == active ifFalse:[
 "/ Oops,  calling thread does not own the monitor. return false
 "/ immediately. The caller is responsible for throwing
 "/ IllegalMonitorStateException...
 ^ false.
 ].
 JavaVM monitorTrace ifTrue:[
 Logger
-log: ('%1: notifying %1%2 processes' bindWith: thisProcess printString
+log: ('%1: notifying %1%2 processes' bindWith: active printString
 with: (all ifTrue:[ 'all ' ] ifFalse:[ '' ])
 with: waitingSema waitingProcesses size)
 severity: Logger severityDEBUG
 facility: #JVM.
 ].
 release
 "Release (leave) the monitor and return `true` if
 monitor was release, `false` if monitor has not
 been released (because calling thread does not own it).
 See JVM spec, section 4.5, MONITOREXIT.
 "
-| thisProcess wasBlocked |
+| active wasBlocked |
-thisProcess := Processor activeProcess.
+active := Processor activeProcess.
-owningProcess == thisProcess ifFalse:[
+process == active ifFalse:[
 "/ Oops,  calling thread does not own the monitor. return false
 "/ immediately. The caller is responsible for throwing
 "/ IllegalMonitorStateException...
 ^ false.
 ].
 wasBlocked := OperatingSystem blockInterrupts.
 count == 1 ifTrue:[
-owningProcess := nil.
+process := nil.
 count := 0.
-monitorSema signal.
+sema signal.
 ] ifFalse:[
 count := count - 1.
 ].
 wasBlocked ifFalse:[ OperatingSystem unblockInterrupts ].
 ^ true
 "Modified: / 12-08-2017 / 21:28:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified (comment): / 14-08-2017 / 09:35:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 wait
 <resource: #obsolete>
 self obsoleteFeatureWarning: 'Use `waitForMilliseconds: nil` insteead'.
 ^ self waitForMilliseconds: nil.
 "Created: / 22-11-2011 / 11:57:56 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 "Modified: / 14-08-2017 / 09:37:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 waitForMilliseconds: timeOut
 "
 An implementation of java.lang.Object#wait(long). Returns `true`
 after waiting or `false` immediately (i.e., won't block) if calling
 thread does not own the monitor.
 See Java API documentation for java.lang.Object#wait(long):
 https://docs.oracle.com/javase/7/docs/api/java/lang/Object.html#wait(long)
 "
-| thisProcess countBeforeWait |
+| active countBeforeWait |
-thisProcess := Processor activeProcess.
+active := Processor activeProcess.
-owningProcess == thisProcess ifFalse:[
+process == active ifFalse:[
 "/ Oops,  calling thread does not own the monitor. return false
 "/ immediately. The caller is responsible for throwing
 "/ IllegalMonitorStateException...
 ^ false.
 ].
 self waitEnabled ifFalse: [
 JavaVM monitorTrace ifTrue:[
 Logger
 log: ('%1 wanted to go to sleep, but it cant, this monitor is for %2 which is already dead'
-bindWith: thisProcess printString
+bindWith: active printString
 with: ownerPrintString)
 severity: Logger severityDEBUG
 facility: #JVM.
 ].
 ^ true.
 ].
 JavaVM monitorTrace ifTrue:[
 Logger
 log: ('%1 is going to wait on %3 for timeout: %2'
-bindWith: thisProcess printString
+bindWith: active printString
 with: timeOut
 with: ownerPrintString printString)
 severity: #debug
 facility: #JVM.
 ].
 "/ Monitor released, wait...
 "JV@2011-11-25: zero timeout means wait without timeout!!!!!!"
 timeOut == 0 ifTrue: [ waitingSema wait ] ifFalse: [
 waitingSema waitWithTimeoutMs: timeOut
 ].
 JavaVM monitorTrace ifTrue:[
 Logger
 log: ('%1 has been notified and is trying to acquire monitor for %2 which is owned by %3'
-bindWith: thisProcess printString with: ownerPrintString printString with: owningProcess printString)
+bindWith: active printString with: ownerPrintString printString with: process printString)
 severity: #debug
 facility: #JVM.
 ].
 "/ We have been notified, re-acquire the monitor
 self acquire.
 "Modified (comment): / 14-08-2017 / 09:52:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !JavaMonitor methodsFor:'queries'!
 isOwnedBy: aProcess
-^ owningProcess == aProcess.
+^ process == aProcess.
 "Created: / 20-11-2011 / 13:23:14 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 "Modified: / 12-08-2017 / 21:24:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !

changeset 3783	f7c384698e7f
parent 3780	57bbc3e4d650
child 3784	b0c56287a058