JavaMonitor.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Fri, 25 Aug 2017 12:38:06 +0100
changeset 3783 f7c384698e7f
parent 3780 57bbc3e4d650
child 3784 b0c56287a058
permissions -rw-r--r--
Issue #94 [10/x]: renamed (some) variables ...to make names shorter and to align them with those in `RecursionLock`.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     1
"
3324
a58245c0e83a Updated copyright notices.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2884
diff changeset
     2
 COPYRIGHT (c) 1996-2015 by Claus Gittinger
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     3
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     4
 New code and modifications done at SWING Research Group [1]:
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     5
3324
a58245c0e83a Updated copyright notices.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2884
diff changeset
     6
 COPYRIGHT (c) 2010-2015 by Jan Vrany, Jan Kurs and Marcel Hlopko
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     7
                            SWING Research Group, Czech Technical University in Prague
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     8
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     9
 This software is furnished under a license and may be used
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    10
 only in accordance with the terms of that license and with the
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    11
 inclusion of the above copyright notice.   This software may not
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    12
 be provided or otherwise made available to, or used by, any
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    13
 other person.  No title to or ownership of the software is
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    14
 hereby transferred.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    15
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    16
 [1] Code written at SWING Research Group contains a signature
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    17
     of one of the above copright owners. For exact set of such code,
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    18
     see the differences between this version and version stx:libjava
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    19
     as of 1.9.2010
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    20
"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    21
"{ Package: 'stx:libjava' }"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    22
3384
98eb8443f4f4 Use new Logger API (use Logger severityXXX instead of symbols)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3324
diff changeset
    23
"{ NameSpace: Smalltalk }"
98eb8443f4f4 Use new Logger API (use Logger severityXXX instead of symbols)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3324
diff changeset
    24
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    25
Object subclass:#JavaMonitor
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
    26
	instanceVariableNames:'process sema count waitingSema waitEnabled ownerPrintString'
3779
973f2396c750 Issue #94 [7/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3778
diff changeset
    27
	classVariableNames:''
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    28
	poolDictionaries:''
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    29
	category:'Languages-Java-Support'
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    30
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    31
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    32
!JavaMonitor class methodsFor:'documentation'!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    33
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    34
copyright
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    35
"
3324
a58245c0e83a Updated copyright notices.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2884
diff changeset
    36
 COPYRIGHT (c) 1996-2015 by Claus Gittinger
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    37
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    38
 New code and modifications done at SWING Research Group [1]:
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    39
3324
a58245c0e83a Updated copyright notices.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2884
diff changeset
    40
 COPYRIGHT (c) 2010-2015 by Jan Vrany, Jan Kurs and Marcel Hlopko
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    41
                            SWING Research Group, Czech Technical University in Prague
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    42
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    43
 This software is furnished under a license and may be used
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    44
 only in accordance with the terms of that license and with the
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    45
 inclusion of the above copyright notice.   This software may not
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    46
 be provided or otherwise made available to, or used by, any
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    47
 other person.  No title to or ownership of the software is
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    48
 hereby transferred.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    49
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    50
 [1] Code written at SWING Research Group contains a signature
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    51
     of one of the above copright owners. For exact set of such code,
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    52
     see the differences between this version and version stx:libjava
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    53
     as of 1.9.2010
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    54
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    55
"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    56
! !
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    57
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    58
!JavaMonitor class methodsFor:'instance creation'!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    59
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    60
for: owningObject
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    61
    ^ self basicNew initializeFor: owningObject.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    62
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    63
    "Created: / 30-11-2011 / 20:39:55 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    64
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    65
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    66
for: owningObject thread: threadOrNil nestedLockCount: count
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    67
    ^ self basicNew initializeFor: owningObject thread: threadOrNil nestedLockCount: count
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    68
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    69
    "Created: / 26-08-2012 / 17:01:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    70
! !
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    71
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    72
!JavaMonitor methodsFor:'accessing'!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    73
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    74
count
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    75
    ^ count
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    76
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    77
3779
973f2396c750 Issue #94 [7/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3778
diff changeset
    78
owningProcess
973f2396c750 Issue #94 [7/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3778
diff changeset
    79
    "Return the process that has acquired (entered) the receiver or
973f2396c750 Issue #94 [7/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3778
diff changeset
    80
     nil if no process currently has the monitor."
973f2396c750 Issue #94 [7/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3778
diff changeset
    81
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
    82
    ^ process
3779
973f2396c750 Issue #94 [7/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3778
diff changeset
    83
973f2396c750 Issue #94 [7/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3778
diff changeset
    84
    "Created: / 12-08-2017 / 23:11:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
973f2396c750 Issue #94 [7/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3778
diff changeset
    85
!
973f2396c750 Issue #94 [7/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3778
diff changeset
    86
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    87
processesEntered
3777
971961e59d5e Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3773
diff changeset
    88
    "Return a alist of processes that entered the monitor. For testing / debugging purposes only!!"
971961e59d5e Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3773
diff changeset
    89
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
    90
    ^ process isNil
3777
971961e59d5e Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3773
diff changeset
    91
        ifTrue:[ #() ]
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
    92
        ifFalse:[ (Array with: process) , sema waitingProcesses ]
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    93
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    94
    "Created: / 20-11-2011 / 13:22:15 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3777
971961e59d5e Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3773
diff changeset
    95
    "Modified (format): / 03-06-2017 / 23:10:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    96
! !
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    97
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    98
!JavaMonitor methodsFor:'atomic'!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    99
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   100
disableWait
2850
e4f0dcc42f4a Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2731
diff changeset
   101
    JavaVM monitorTrace ifTrue:[
3384
98eb8443f4f4 Use new Logger API (use Logger severityXXX instead of symbols)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3324
diff changeset
   102
        Logger log: ('Waiting is disabled on monitor for %1' bindWith: ownerPrintString) severity:Logger severityDEBUG facility:#JVM.
2850
e4f0dcc42f4a Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2731
diff changeset
   103
    ].
3773
f2fdd527603f #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3431
diff changeset
   104
    "/ critical region not needed here
3777
971961e59d5e Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3773
diff changeset
   105
    "/ self instVarAccessCritical: [ waitEnabled := false ].
3773
f2fdd527603f #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3431
diff changeset
   106
    waitEnabled := false.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   107
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   108
    "Created: / 30-11-2011 / 20:34:40 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3384
98eb8443f4f4 Use new Logger API (use Logger severityXXX instead of symbols)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3324
diff changeset
   109
    "Modified: / 02-03-2015 / 14:06:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   110
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   111
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   112
enableWait
3773
f2fdd527603f #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3431
diff changeset
   113
    "/ critical region not needed here
3777
971961e59d5e Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3773
diff changeset
   114
    "/ self instVarAccessCritical: [waitEnabled := true].
3773
f2fdd527603f #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3431
diff changeset
   115
    waitEnabled := true
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   116
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   117
    "Created: / 30-11-2011 / 20:34:31 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
2850
e4f0dcc42f4a Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2731
diff changeset
   118
    "Modified (format): / 11-10-2013 / 11:17:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   119
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   120
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   121
waitEnabled
3773
f2fdd527603f #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3431
diff changeset
   122
    "/ critical region not needed here
3777
971961e59d5e Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3773
diff changeset
   123
    "/ self instVarAccessCritical: [ ^ waitEnabled].
3773
f2fdd527603f #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3431
diff changeset
   124
    ^ waitEnabled.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   125
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   126
    "Created: / 30-11-2011 / 20:34:56 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   127
! !
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   128
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   129
!JavaMonitor methodsFor:'initialization'!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   130
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   131
initializeFor: owningObject
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   132
    self initializeFor: owningObject thread: 0 nestedLockCount: 0.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   133
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   134
    "Created: / 30-11-2011 / 20:39:31 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   135
    "Modified: / 26-08-2012 / 17:25:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   136
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   137
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   138
initializeFor:owningObject thread:threadId nestedLockCount:cnt
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   139
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   140
"/    self assert: (owningObject isJavaObject or:[owningObject isJavaClass]).
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   141
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   142
    waitEnabled := true.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   143
    waitingSema := Semaphore new:0.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   144
    ownerPrintString := owningObject class name , '@' , owningObject identityHash printString.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   145
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   146
    "/Not locked...
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   147
    threadId == 0 ifTrue:[
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   148
        sema := Semaphore new:1.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   149
        count := 0.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   150
        ^self.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   151
    ] ifFalse: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   152
        "threadId is not zero (zero is threadId of scheduler process, which will never try to acquire the monitor)"
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   153
        "so it means it is possible that the thin lock is already locked for other thread, we must be careful "
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   154
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   155
        process := ObjectMemory processesKnownInVM detect:[:p|p id == threadId] ifNone:[nil].
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   156
        self assert: process notNil.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   157
        cnt timesRepeat:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   158
"/            JavaVM enteredMonitorsOf:  owningProcess add: owningObject.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   159
"/            JavaVM acquiredMonitorsOf: owningProcess add: owningObject.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   160
        ].
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   161
        sema := Semaphore new: 0.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   162
        count := cnt.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   163
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   164
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   165
    "Created: / 26-08-2012 / 17:02:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3777
971961e59d5e Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3773
diff changeset
   166
    "Modified: / 03-06-2017 / 23:10:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   167
! !
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   168
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   169
!JavaMonitor methodsFor:'public'!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   170
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   171
acquire
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   172
    "Acquire (enter) the monitor and return `true`.
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   173
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   174
     See JVM spec, section 4.5, MONITORENTER.
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   175
    "
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   176
    | active wasBlocked acquired |
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   177
    acquired := nil.
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   178
    active := Processor activeProcess.
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   179
    process == active ifTrue:[
3778
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   180
        "/ Process already ackquired the monitor, increase the
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   181
        "/ count and continue...
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   182
        count := count + 1.
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   183
        ^true.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   184
    ].
3778
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   185
    wasBlocked := OperatingSystem blockInterrupts.
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   186
    [
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   187
        (process notNil and:[ process isDead ]) ifTrue:[
3778
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   188
            "/ Process that acquired the monitor died without releasing it.
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   189
            "/ This should not happen.
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   190
            wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
3778
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   191
            self assert: false description: 'Process that acquired the monitor died without releasing it'.
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   192
            process := nil.
3778
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   193
            count := 0.
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   194
        ].
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   195
        "/ We need to know that we already waited on and got semaphore
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   196
        "/ in case the Semaphore >> #wait is prematurely terminated.
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   197
        "/ Q: Can this actually happen? If so, how?
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   198
        acquired := sema wait.
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   199
        process := active.
3778
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   200
        count := 1.
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   201
        wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   202
    ] ifCurtailed:[
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   203
        acquired notNil ifTrue:[
3778
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   204
            OperatingSystem blockInterrupts.
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   205
            count := 0.
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   206
            process := nil.
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   207
            sema signal.
3778
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   208
        ].
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   209
        wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   210
    ].
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   211
    ^true.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   212
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   213
    "Created: / 20-11-2011 / 13:21:46 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3778
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   214
    "Modified: / 11-08-2017 / 22:08:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   215
    "Modified (comment): / 14-08-2017 / 09:34:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   216
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   217
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   218
enter
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   219
    <resource: #obsolete>
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   220
    self obsoleteMethodWarning: 'Use #acquire instead'.
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   221
    ^ self acquire.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   222
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   223
    "Created: / 20-11-2011 / 13:21:42 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   224
    "Modified: / 14-08-2017 / 10:20:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   225
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   226
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   227
exit
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   228
    <resource: #obsolete>
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   229
    self obsoleteMethodWarning: 'Use #release instead'.
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   230
    ^ self release.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   231
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   232
    "Created: / 20-11-2011 / 13:21:54 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   233
    "Modified: / 14-08-2017 / 10:20:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   234
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   235
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   236
notify
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   237
    <resource: #obsolete>
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   238
    self obsoleteMethodWarning: 'Use `notify: false` instead'.
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   239
    ^ self notify: false.
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   240
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   241
    "Created: / 22-11-2011 / 12:14:23 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   242
    "Modified: / 14-08-2017 / 10:19:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   243
!
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   244
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   245
notify: all
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   246
    "
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   247
    An implementation of java.lang.Object#notify() and #notifyAll(). If `all` is
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   248
    `true` then all waiting threads are notified (see #norifyAll()) otherwise only
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   249
    one thread is notified (see #notify()). Returns `true` after when threads have
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   250
    been notified or `false` if calling thread does not own the monitor.
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   251
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   252
    See Java API documentation for java.lang.Object#notify() and #notifyAll().
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   253
        https://docs.oracle.com/javase/7/docs/api/java/lang/Object.html#notify()
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   254
        https://docs.oracle.com/javase/7/docs/api/java/lang/Object.html#notifyAll()
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   255
    "
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   256
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   257
    | active |
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   258
    active := Processor activeProcess.
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   259
    process == active ifFalse:[
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   260
        "/ Oops,  calling thread does not own the monitor. return false
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   261
        "/ immediately. The caller is responsible for throwing
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   262
        "/ IllegalMonitorStateException...
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   263
        ^ false.
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   264
    ].
2850
e4f0dcc42f4a Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2731
diff changeset
   265
    JavaVM monitorTrace ifTrue:[
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   266
        Logger
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   267
            log: ('%1: notifying %1%2 processes' bindWith: active printString
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   268
                    with: (all ifTrue:[ 'all ' ] ifFalse:[ '' ])
3777
971961e59d5e Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3773
diff changeset
   269
                    with: waitingSema waitingProcesses size)
3384
98eb8443f4f4 Use new Logger API (use Logger severityXXX instead of symbols)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3324
diff changeset
   270
            severity: Logger severityDEBUG
2850
e4f0dcc42f4a Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2731
diff changeset
   271
            facility: #JVM.
e4f0dcc42f4a Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2731
diff changeset
   272
    ].
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   273
    all ifTrue:[ waitingSema signalForAll ] ifFalse:[ waitingSema signal ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   274
    Processor yield.
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   275
    ^ true
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   276
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   277
    "Created: / 14-08-2017 / 10:17:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   278
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   279
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   280
notifyAll
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   281
    <resource: #obsolete>
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   282
    self obsoleteMethodWarning: 'Use `notify: true` instead'.
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   283
    ^ self notify: true.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   284
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   285
    "Created: / 22-11-2011 / 12:14:36 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   286
    "Modified: / 14-08-2017 / 10:19:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   287
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   288
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   289
release
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   290
    "Release (leave) the monitor and return `true` if
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   291
     monitor was release, `false` if monitor has not
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   292
     been released (because calling thread does not own it).
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   293
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   294
     See JVM spec, section 4.5, MONITOREXIT.
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   295
    "
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   296
    | active wasBlocked |
3778
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   297
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   298
    active := Processor activeProcess.
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   299
    process == active ifFalse:[
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   300
        "/ Oops,  calling thread does not own the monitor. return false
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   301
        "/ immediately. The caller is responsible for throwing
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   302
        "/ IllegalMonitorStateException...
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   303
        ^ false.
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   304
    ].
3778
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   305
    wasBlocked := OperatingSystem blockInterrupts.
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   306
    count == 1 ifTrue:[
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   307
        process := nil.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   308
        count := 0.
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   309
        sema signal.
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   310
    ] ifFalse:[
3778
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   311
        count := count - 1.
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   312
    ].
3779
973f2396c750 Issue #94 [7/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3778
diff changeset
   313
    wasBlocked ifFalse:[ OperatingSystem unblockInterrupts ].
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   314
    ^ true
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   315
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   316
    "Created: / 20-11-2011 / 13:21:52 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3779
973f2396c750 Issue #94 [7/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3778
diff changeset
   317
    "Modified: / 12-08-2017 / 21:28:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   318
    "Modified (comment): / 14-08-2017 / 09:35:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   319
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   320
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   321
wait
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   322
    <resource: #obsolete>
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   323
    self obsoleteFeatureWarning: 'Use `waitForMilliseconds: nil` insteead'.
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   324
    ^ self waitForMilliseconds: nil.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   325
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   326
    "Created: / 22-11-2011 / 11:57:56 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   327
    "Modified: / 14-08-2017 / 09:37:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   328
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   329
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   330
waitForMilliseconds: timeOut
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   331
    "
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   332
    An implementation of java.lang.Object#wait(long). Returns `true`
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   333
    after waiting or `false` immediately (i.e., won't block) if calling
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   334
    thread does not own the monitor.
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   335
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   336
    See Java API documentation for java.lang.Object#wait(long):
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   337
        https://docs.oracle.com/javase/7/docs/api/java/lang/Object.html#wait(long)
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   338
    "
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   339
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   340
    | active countBeforeWait |
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   341
    active := Processor activeProcess.
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   342
    process == active ifFalse:[
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   343
        "/ Oops,  calling thread does not own the monitor. return false
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   344
        "/ immediately. The caller is responsible for throwing
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   345
        "/ IllegalMonitorStateException...
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   346
        ^ false.
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   347
    ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   348
    self waitEnabled ifFalse: [
2850
e4f0dcc42f4a Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2731
diff changeset
   349
        JavaVM monitorTrace ifTrue:[
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   350
            Logger
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   351
                log: ('%1 wanted to go to sleep, but it cant, this monitor is for %2 which is already dead'
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   352
                        bindWith: active printString
2850
e4f0dcc42f4a Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2731
diff changeset
   353
                        with: ownerPrintString)
3384
98eb8443f4f4 Use new Logger API (use Logger severityXXX instead of symbols)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3324
diff changeset
   354
                severity: Logger severityDEBUG
2850
e4f0dcc42f4a Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2731
diff changeset
   355
                facility: #JVM.
e4f0dcc42f4a Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2731
diff changeset
   356
        ].
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   357
        ^ true.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   358
    ].
2850
e4f0dcc42f4a Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2731
diff changeset
   359
    JavaVM monitorTrace ifTrue:[
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   360
        Logger
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   361
            log: ('%1 is going to wait on %3 for timeout: %2'
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   362
                    bindWith: active printString
2850
e4f0dcc42f4a Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2731
diff changeset
   363
                    with: timeOut
e4f0dcc42f4a Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2731
diff changeset
   364
                    with: ownerPrintString printString)
e4f0dcc42f4a Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2731
diff changeset
   365
            severity: #debug
e4f0dcc42f4a Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2731
diff changeset
   366
            facility: #JVM.
e4f0dcc42f4a Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2731
diff changeset
   367
    ].
3778
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   368
    countBeforeWait := count.
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   369
    "/ Release the monitor so other thread can acquire it
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   370
    "/ and call #notify or #notifyAll
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   371
    count := 1. "/ note that at this point we still own the monitor
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   372
    self release.
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   373
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   374
    "/ Monitor released, wait...
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   375
     "JV@2011-11-25: zero timeout means wait without timeout!!!!!!"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   376
    timeOut == 0 ifTrue: [ waitingSema wait ] ifFalse: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   377
        waitingSema waitWithTimeoutMs: timeOut
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   378
    ].
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   379
    JavaVM monitorTrace ifTrue:[
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   380
        Logger
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   381
            log: ('%1 has been notified and is trying to acquire monitor for %2 which is owned by %3'
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   382
                    bindWith: active printString with: ownerPrintString printString with: process printString)
2850
e4f0dcc42f4a Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2731
diff changeset
   383
            severity: #debug
e4f0dcc42f4a Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2731
diff changeset
   384
            facility: #JVM.
e4f0dcc42f4a Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2731
diff changeset
   385
    ].
3778
2297f9daef8a Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3777
diff changeset
   386
    "/ We have been notified, re-acquire the monitor
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   387
    self acquire.
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   388
    count := countBeforeWait. "/ note that at this point we already own the monitor.
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   389
    ^ true.
2884
a284a338f355 Fixed a very. very nasty bug in wait().
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2850
diff changeset
   390
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   391
    "Created: / 22-11-2011 / 12:52:45 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   392
    "Modified: / 01-12-2011 / 10:57:52 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3780
57bbc3e4d650 Issue #94 [7/x]: revamp of `JavaMonitor` API
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3779
diff changeset
   393
    "Modified (comment): / 14-08-2017 / 09:52:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   394
! !
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   395
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   396
!JavaMonitor methodsFor:'queries'!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   397
3783
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   398
isOwnedBy: aProcess
f7c384698e7f Issue #94 [10/x]: renamed (some) variables
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3780
diff changeset
   399
    ^ process == aProcess.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   400
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   401
    "Created: / 20-11-2011 / 13:23:14 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3779
973f2396c750 Issue #94 [7/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3778
diff changeset
   402
    "Modified: / 12-08-2017 / 21:24:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   403
! !
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   404
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   405
!JavaMonitor class methodsFor:'documentation'!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   406
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   407
version_CVS
3773
f2fdd527603f #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3431
diff changeset
   408
    ^ '$Header$'
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   409
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   410
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   411
version_HG
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   412
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   413
    ^ '$Changeset: <not expanded> $'
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   414
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   415
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   416
version_SVN
3773
f2fdd527603f #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3431
diff changeset
   417
    ^ '$Id$'
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   418
! !
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   419