author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Fri, 11 Aug 2017 22:37:56 +0100 | |
changeset 3778 | 2297f9daef8a |
parent 3777 | 971961e59d5e |
child 3779 | 973f2396c750 |
permissions | -rw-r--r-- |
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 |
3777
971961e59d5e
Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3773
diff
changeset
|
26 |
instanceVariableNames:'owningProcess monitorSema count waitingSema waitEnabled |
971961e59d5e
Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3773
diff
changeset
|
27 |
ownerPrintString' |
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 |
classVariableNames:'instVarAccess' |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
29 |
poolDictionaries:'' |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
30 |
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
|
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 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
33 |
!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
|
34 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
35 |
copyright |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
36 |
" |
3324
a58245c0e83a
Updated copyright notices.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2884
diff
changeset
|
37 |
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
|
38 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
39 |
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
|
40 |
|
3324
a58245c0e83a
Updated copyright notices.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2884
diff
changeset
|
41 |
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
|
42 |
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
|
43 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
44 |
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
|
45 |
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
|
46 |
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
|
47 |
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
|
48 |
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
|
49 |
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
|
50 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
51 |
[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
|
52 |
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
|
53 |
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
|
54 |
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
|
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 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
59 |
!JavaMonitor class 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
|
60 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
61 |
initialize |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
62 |
instVarAccess := RecursionLock forMutualExclusion. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
63 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
64 |
"Created: / 29-11-2011 / 11:23: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
|
65 |
"Modified (format): / 09-01-2013 / 16:10:10 / 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
|
66 |
! ! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
67 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
68 |
!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
|
69 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
70 |
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
|
71 |
^ 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
|
72 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
73 |
"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
|
74 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
75 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
76 |
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
|
77 |
^ 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
|
78 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
79 |
"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
|
80 |
! ! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
81 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
82 |
!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
|
83 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
84 |
count |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
85 |
^ count |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
86 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
87 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
88 |
processesEntered |
3777
971961e59d5e
Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3773
diff
changeset
|
89 |
"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
|
90 |
|
971961e59d5e
Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3773
diff
changeset
|
91 |
^ owningProcess isNil |
971961e59d5e
Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3773
diff
changeset
|
92 |
ifTrue:[ #() ] |
971961e59d5e
Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3773
diff
changeset
|
93 |
ifFalse:[ (Array with: owningProcess) , monitorSema 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
|
94 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
95 |
"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
|
96 |
"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
|
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 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
99 |
!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
|
100 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
101 |
disableWait |
2850
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
102 |
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
|
103 |
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
|
104 |
]. |
3773 | 105 |
"/ 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
|
106 |
"/ self instVarAccessCritical: [ waitEnabled := false ]. |
3773 | 107 |
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
|
108 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
109 |
"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
|
110 |
"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
|
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 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
113 |
enableWait |
3773 | 114 |
"/ 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
|
115 |
"/ self instVarAccessCritical: [waitEnabled := true]. |
3773 | 116 |
waitEnabled := true |
117 |
||
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
118 |
"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
|
119 |
"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
|
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 |
|
3777
971961e59d5e
Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3773
diff
changeset
|
122 |
instVarAccessCritical: aBlock |
971961e59d5e
Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3773
diff
changeset
|
123 |
^ instVarAccess critical: aBlock. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
124 |
|
3777
971961e59d5e
Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3773
diff
changeset
|
125 |
"Created: / 03-06-2017 / 22:09:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
971961e59d5e
Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3773
diff
changeset
|
126 |
"Modified: / 03-06-2017 / 23:15:27 / 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
|
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 |
waitEnabled |
3773 | 130 |
"/ 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
|
131 |
"/ self instVarAccessCritical: [ ^ waitEnabled]. |
3773 | 132 |
^ 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
|
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: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
|
135 |
! ! |
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 |
!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
|
138 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
139 |
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
|
140 |
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
|
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 |
"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
|
143 |
"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
|
144 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
145 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
146 |
initializeFor:owningObject thread:threadId nestedLockCount:cnt |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
147 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
148 |
"/ 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
|
149 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
150 |
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
|
151 |
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
|
152 |
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
|
153 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
154 |
"/Not locked... |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
155 |
threadId == 0 ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
156 |
monitorSema := Semaphore new:1. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
157 |
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
|
158 |
^self. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
159 |
] ifFalse: [ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
160 |
"threadId is not zero (zero is threadId of scheduler process, which will never try to acquire the monitor)" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
161 |
"so it means it is possible that the thin lock is already locked for other thread, we must be careful " |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
162 |
|
2678
c865275e48a7
Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2396
diff
changeset
|
163 |
owningProcess := ObjectMemory processesKnownInVM detect:[:p|p id == threadId] ifNone:[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
|
164 |
self assert: owningProcess notNil. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
165 |
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
|
166 |
"/ 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
|
167 |
"/ 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
|
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 |
monitorSema := 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
|
170 |
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
|
171 |
]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
172 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
173 |
"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
|
174 |
"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
|
175 |
! ! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
176 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
177 |
!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
|
178 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
179 |
acquire |
3778
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
180 |
| thisProcess wasBlocked hasAcquired | |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
181 |
hasAcquired := nil. |
3777
971961e59d5e
Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3773
diff
changeset
|
182 |
thisProcess := Processor activeProcess. |
3778
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
183 |
owningProcess == thisProcess ifTrue:[ |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
184 |
"/ 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
|
185 |
"/ count and continue... |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
186 |
count := count + 1. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
187 |
^self. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
188 |
]. |
3778
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
189 |
wasBlocked := OperatingSystem blockInterrupts. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
190 |
[ |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
191 |
(owningProcess notNil and:[ owningProcess isDead ]) ifTrue:[ |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
192 |
"/ 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
|
193 |
"/ This should not happen. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
194 |
wasBlocked ifFalse:[OperatingSystem unblockInterrupts]. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
195 |
self assert: false description: '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
|
196 |
owningProcess := nil. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
197 |
count := 0. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
198 |
]. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
199 |
"/ 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
|
200 |
"/ 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
|
201 |
"/ Q: Can this actually happen? If so, how? |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
202 |
hasAcquired := monitorSema wait. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
203 |
owningProcess := thisProcess. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
204 |
count := 1. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
205 |
wasBlocked ifFalse:[OperatingSystem unblockInterrupts]. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
206 |
] ifCurtailed:[ |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
207 |
hasAcquired notNil ifTrue:[ |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
208 |
OperatingSystem blockInterrupts. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
209 |
count := 0. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
210 |
owningProcess := nil. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
211 |
monitorSema signal. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
212 |
]. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
213 |
wasBlocked ifFalse:[OperatingSystem unblockInterrupts]. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
214 |
] |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
215 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
216 |
"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
|
217 |
"Modified: / 11-08-2017 / 22:08: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
|
218 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
219 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
220 |
enter |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
221 |
self acquire. |
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>" |
3777
971961e59d5e
Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3773
diff
changeset
|
224 |
"Modified: / 03-06-2017 / 23:11:03 / 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 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
228 |
| thisProcess | |
3777
971961e59d5e
Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3773
diff
changeset
|
229 |
|
971961e59d5e
Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3773
diff
changeset
|
230 |
"JV@2017-06-03: Question: Is it legal (i.e., is the good reason to) call #exit |
971961e59d5e
Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3773
diff
changeset
|
231 |
on a monitor by a process that does not own it? Shouldn't we rather throw an |
971961e59d5e
Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3773
diff
changeset
|
232 |
error" |
971961e59d5e
Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3773
diff
changeset
|
233 |
thisProcess := Processor activeProcess. |
971961e59d5e
Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3773
diff
changeset
|
234 |
(self isOwnedBy: thisProcess) ifTrue: [ 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
|
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 |
"Created: / 20-11-2011 / 13:21:54 / 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
|
237 |
"Modified (format): / 03-06-2017 / 23:13:39 / 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
|
238 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
239 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
240 |
notify |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
241 |
"wakeup one waiting process" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
242 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
243 |
| thisProcess | |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
244 |
thisProcess := Processor activeProcess. |
3778
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
245 |
self assert: owningProcess == thisProcess. |
2850
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
246 |
JavaVM monitorTrace ifTrue:[ |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
247 |
Logger |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
248 |
log: ('%1: notifying %2 processes' bindWith: thisProcess printString |
3777
971961e59d5e
Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3773
diff
changeset
|
249 |
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
|
250 |
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
|
251 |
facility: #JVM. |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
252 |
]. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
253 |
waitingSema signal. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
254 |
Processor yield. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
255 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
256 |
"Created: / 22-11-2011 / 12:14:23 / 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
|
257 |
"Modified: / 11-08-2017 / 22:25:44 / 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
|
258 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
259 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
260 |
notifyAll |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
261 |
"wakeup one waiting process" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
262 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
263 |
| thisProcess | |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
264 |
thisProcess := Processor activeProcess. |
3778
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
265 |
self assert: owningProcess == thisProcess. |
2850
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
266 |
JavaVM monitorTrace ifTrue:[ |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
267 |
Logger |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
268 |
log: ('%1: notifying all %2 processes' bindWith: thisProcess printString |
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 |
]. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
273 |
waitingSema signalForAll. |
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. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
275 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
276 |
"Created: / 22-11-2011 / 12:14:36 / 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
|
277 |
"Modified: / 11-08-2017 / 22:26:01 / 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 |
release |
3778
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
281 |
| wasBlocked | |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
282 |
|
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
283 |
self assert: (self isOwnedBy: owningProcess). |
3778
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
284 |
wasBlocked := OperatingSystem blockInterrupts. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
285 |
count == 1 ifTrue:[ |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
286 |
owningProcess := 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
|
287 |
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
|
288 |
monitorSema signal. |
3778
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
289 |
] ifFalse:[ |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
290 |
count := count - 1. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
291 |
]. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
292 |
OperatingSystem unblockInterrupts. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
293 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
294 |
"Created: / 20-11-2011 / 13:21:52 / 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
|
295 |
"Modified: / 11-08-2017 / 22:18: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
|
296 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
297 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
298 |
wait |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
299 |
"make owning process to go to wait" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
300 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
301 |
self waitForMilliseconds: nil. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
302 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
303 |
"Created: / 22-11-2011 / 11:57: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
|
304 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
305 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
306 |
waitForMilliseconds: timeOut |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
307 |
"make owning process to go to wait, but not longer than timeout" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
308 |
|
2884
a284a338f355
Fixed a very. very nasty bug in wait().
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2850
diff
changeset
|
309 |
| thisProcess countBeforeWait | |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
310 |
thisProcess := Processor activeProcess. |
3778
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
311 |
self assert: owningProcess == thisProcess. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
312 |
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
|
313 |
JavaVM monitorTrace ifTrue:[ |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
314 |
Logger |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
315 |
log: ('%1 wanted to go to sleep, but it cant, this monitor is for %2 which is already dead' |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
316 |
bindWith: thisProcess printString |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
317 |
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
|
318 |
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
|
319 |
facility: #JVM. |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
320 |
]. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
321 |
^ self. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
322 |
]. |
2850
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
323 |
JavaVM monitorTrace ifTrue:[ |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
324 |
Logger |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
325 |
log: ('%1 is going to wait on %3 for timeout: %2' |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
326 |
bindWith: thisProcess printString |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
327 |
with: timeOut |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
328 |
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
|
329 |
severity: #debug |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
330 |
facility: #JVM. |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
331 |
]. |
3778
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
332 |
countBeforeWait := count. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
333 |
"/ 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
|
334 |
"/ and call #notify or #notifyAll |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
335 |
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
|
336 |
self release. |
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
337 |
|
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
338 |
"/ 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
|
339 |
"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
|
340 |
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
|
341 |
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
|
342 |
]. |
2850
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
343 |
JavaVM monitorTrace ifTrue:[ |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
344 |
Logger |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
345 |
log: ('%1 has been notified and is trying to acquire monitor for %2 which is owned by %3' |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
346 |
bindWith: thisProcess printString with: ownerPrintString printString with: owningProcess printString) |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
347 |
severity: #debug |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
348 |
facility: #JVM. |
e4f0dcc42f4a
Fixed logging of monitor-related events - honour JavaVM.MonitorTrace flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2731
diff
changeset
|
349 |
]. |
3778
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
350 |
"/ 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
|
351 |
self acquire. |
3778
2297f9daef8a
Issue #94 [6/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3777
diff
changeset
|
352 |
count := countBeforeWait. "/ note that at this point we already own the monitor |
2884
a284a338f355
Fixed a very. very nasty bug in wait().
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2850
diff
changeset
|
353 |
|
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
354 |
"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
|
355 |
"Modified: / 01-12-2011 / 10:57:52 / 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
|
356 |
"Modified: / 11-08-2017 / 23:04:45 / 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
|
357 |
! ! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
358 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
359 |
!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
|
360 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
361 |
isAcquired |
3777
971961e59d5e
Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3773
diff
changeset
|
362 |
^ self instVarAccessCritical: [ owningProcess 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
|
363 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
364 |
"Created: / 20-11-2011 / 13:22:26 / 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
|
365 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
366 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
367 |
isOwnedBy: aProcess |
3777
971961e59d5e
Issue #94 [5/x]: cleanup of JavaMonitor
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3773
diff
changeset
|
368 |
^ self instVarAccessCritical: [ owningProcess == 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
|
369 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
370 |
"Created: / 20-11-2011 / 13:23:14 / 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
|
371 |
! ! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
372 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
373 |
!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
|
374 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
375 |
version_CVS |
3773 | 376 |
^ '$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
|
377 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
378 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
379 |
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
|
380 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
381 |
^ '$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
|
382 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
383 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
384 |
version_SVN |
3773 | 385 |
^ '$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
|
386 |
! ! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
387 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
388 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
389 |
JavaMonitor initialize! |