RecursionLock.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Mon, 31 Oct 2011 22:19:21 +0000
branchjv
changeset 17892 d86c8bd5ece3
parent 17869 9610c6c94e71
child 17910 8d796ca8bd1d
permissions -rw-r--r--
Merged with CVS
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
330
claus
parents:
diff changeset
     1
"
claus
parents:
diff changeset
     2
 COPYRIGHT (c) 1995 by Claus Gittinger
341
claus
parents: 330
diff changeset
     3
	      All Rights Reserved
330
claus
parents:
diff changeset
     4
claus
parents:
diff changeset
     5
 This software is furnished under a license and may be used
claus
parents:
diff changeset
     6
 only in accordance with the terms of that license and with the
claus
parents:
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
claus
parents:
diff changeset
     8
 be provided or otherwise made available to, or used by, any
claus
parents:
diff changeset
     9
 other person.  No title to or ownership of the software is
claus
parents:
diff changeset
    10
 hereby transferred.
claus
parents:
diff changeset
    11
"
6552
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    12
"{ Package: 'stx:libbasic' }"
5735
3c1f1f115640 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 5104
diff changeset
    13
330
claus
parents:
diff changeset
    14
Object subclass:#RecursionLock
776
f3c0c579c0d2 commentary
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
    15
	instanceVariableNames:'process sema'
f3c0c579c0d2 commentary
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
    16
	classVariableNames:''
f3c0c579c0d2 commentary
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
    17
	poolDictionaries:''
f3c0c579c0d2 commentary
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
    18
	category:'Kernel-Processes'
330
claus
parents:
diff changeset
    19
!
claus
parents:
diff changeset
    20
claus
parents:
diff changeset
    21
!RecursionLock class methodsFor:'documentation'!
claus
parents:
diff changeset
    22
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
    23
copyright
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
    24
"
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
    25
 COPYRIGHT (c) 1995 by Claus Gittinger
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
    26
	      All Rights Reserved
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
    27
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
    28
 This software is furnished under a license and may be used
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
    29
 only in accordance with the terms of that license and with the
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
    30
 inclusion of the above copyright notice.   This software may not
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
    31
 be provided or otherwise made available to, or used by, any
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
    32
 other person.  No title to or ownership of the software is
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
    33
 hereby transferred.
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
    34
"
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
    35
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
    36
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
    37
330
claus
parents:
diff changeset
    38
documentation
claus
parents:
diff changeset
    39
"
claus
parents:
diff changeset
    40
    like a Semaphore for mutual exclusion, but avoids the deadlock
claus
parents:
diff changeset
    41
    if a critical region is reentered by the same process again.
2143
09af9c997961 commentary
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
    42
    I.e. allows reentering the critical region IFF the current process 
341
claus
parents: 330
diff changeset
    43
    is the one which did the original locking.
330
claus
parents:
diff changeset
    44
3524
b5fe623f0e4d warning in documentation
Claus Gittinger <cg@exept.de>
parents: 3326
diff changeset
    45
    WARNING:
6552
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    46
	for now, recursionLocks are not unlocked when an image is
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    47
	restarted. You may have to recreate them to avoid a deadLock.
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    48
	(this may change in the future, but recreating a recursionLock in
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    49
	 the #earlyRestart handling does not hurt)
1294
e26bbb61f6b2 documentation
Claus Gittinger <cg@exept.de>
parents: 1273
diff changeset
    50
e26bbb61f6b2 documentation
Claus Gittinger <cg@exept.de>
parents: 1273
diff changeset
    51
    [author:]
6552
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    52
	Claus Gittinger
1294
e26bbb61f6b2 documentation
Claus Gittinger <cg@exept.de>
parents: 1273
diff changeset
    53
1273
f8449f53a6a3 commentary
Claus Gittinger <cg@exept.de>
parents: 1216
diff changeset
    54
    [see also:]
6552
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    55
	Semaphore
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    56
	Process ProcessorScheduler
1273
f8449f53a6a3 commentary
Claus Gittinger <cg@exept.de>
parents: 1216
diff changeset
    57
"
f8449f53a6a3 commentary
Claus Gittinger <cg@exept.de>
parents: 1216
diff changeset
    58
!
f8449f53a6a3 commentary
Claus Gittinger <cg@exept.de>
parents: 1216
diff changeset
    59
f8449f53a6a3 commentary
Claus Gittinger <cg@exept.de>
parents: 1216
diff changeset
    60
examples
f8449f53a6a3 commentary
Claus Gittinger <cg@exept.de>
parents: 1216
diff changeset
    61
"
2143
09af9c997961 commentary
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
    62
  example (good):
6552
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    63
									[exBegin]
2143
09af9c997961 commentary
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
    64
    |lock|
776
f3c0c579c0d2 commentary
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
    65
2143
09af9c997961 commentary
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
    66
    lock := RecursionLock new.
09af9c997961 commentary
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
    67
    lock critical:[
6552
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    68
	Transcript showCR:'in lock ...'.
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    69
	lock critical:[
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    70
	    Transcript showCR:'again ...'
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    71
	]
2143
09af9c997961 commentary
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
    72
    ]
6552
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    73
									[exEnd]
776
f3c0c579c0d2 commentary
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
    74
2143
09af9c997961 commentary
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
    75
  in contrast to (wrong example - deadlocks):
6552
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    76
									[exBegin]
2143
09af9c997961 commentary
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
    77
    |lock|
776
f3c0c579c0d2 commentary
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
    78
2143
09af9c997961 commentary
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
    79
    lock := Semaphore forMutualExclusion.
09af9c997961 commentary
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
    80
    lock critical:[
6552
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    81
	Transcript showCR:'in lock ...'.
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    82
	lock critical:[
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    83
	    '*** never reached - deadlock because sema is already locked ***'.
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    84
	    '    (press CTRL-c and abort in the debugger)'.
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    85
	    Transcript showCR:'again ...'
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    86
	]
2143
09af9c997961 commentary
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
    87
    ]
6552
5ebab8a33da9 Moved from libbasic2 to libbasic
Stefan Vogel <sv@exept.de>
parents: 5735
diff changeset
    88
									[exEnd]
330
claus
parents:
diff changeset
    89
"
claus
parents:
diff changeset
    90
! !
claus
parents:
diff changeset
    91
claus
parents:
diff changeset
    92
!RecursionLock class methodsFor:'instance creation'!
claus
parents:
diff changeset
    93
5735
3c1f1f115640 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 5104
diff changeset
    94
forMutualExclusion
3c1f1f115640 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 5104
diff changeset
    95
    "for easy exchangability with mutual-exclusion Semaphores..."
3c1f1f115640 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 5104
diff changeset
    96
3c1f1f115640 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 5104
diff changeset
    97
    ^ self new 
3c1f1f115640 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 5104
diff changeset
    98
!
3c1f1f115640 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 5104
diff changeset
    99
330
claus
parents:
diff changeset
   100
new
claus
parents:
diff changeset
   101
    ^ self basicNew initialize
claus
parents:
diff changeset
   102
claus
parents:
diff changeset
   103
! !
claus
parents:
diff changeset
   104
2722
f6c7146fced2 added naming protocol
Claus Gittinger <cg@exept.de>
parents: 2266
diff changeset
   105
!RecursionLock methodsFor:'printing & storing'!
f6c7146fced2 added naming protocol
Claus Gittinger <cg@exept.de>
parents: 2266
diff changeset
   106
17841
7abcc4aef871 Merged with trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17834
diff changeset
   107
displayOn:aGCOrStream
2722
f6c7146fced2 added naming protocol
Claus Gittinger <cg@exept.de>
parents: 2266
diff changeset
   108
    "return a string to display the receiver - include the
17841
7abcc4aef871 Merged with trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17834
diff changeset
   109
     count for your convenience"
2722
f6c7146fced2 added naming protocol
Claus Gittinger <cg@exept.de>
parents: 2266
diff changeset
   110
17841
7abcc4aef871 Merged with trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17834
diff changeset
   111
    "/ what a kludge - Dolphin and Squeak mean: printOn: a stream;
7abcc4aef871 Merged with trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17834
diff changeset
   112
    "/ ST/X (and some old ST80's) mean: draw-yourself on a GC.
7abcc4aef871 Merged with trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17834
diff changeset
   113
    (aGCOrStream isStream) ifFalse:[
7abcc4aef871 Merged with trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17834
diff changeset
   114
        ^ super displayOn:aGCOrStream
7abcc4aef871 Merged with trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17834
diff changeset
   115
    ].
7abcc4aef871 Merged with trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17834
diff changeset
   116
    aGCOrStream
7abcc4aef871 Merged with trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17834
diff changeset
   117
        nextPutAll:self class name;
7abcc4aef871 Merged with trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17834
diff changeset
   118
        nextPut:$(.
7abcc4aef871 Merged with trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17834
diff changeset
   119
    sema count printOn:aGCOrStream.
7abcc4aef871 Merged with trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17834
diff changeset
   120
    aGCOrStream nextPutAll:' name: '.
7abcc4aef871 Merged with trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17834
diff changeset
   121
    (self name ? 'unnamed') printOn:aGCOrStream.
7abcc4aef871 Merged with trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17834
diff changeset
   122
    aGCOrStream nextPut:$).
2722
f6c7146fced2 added naming protocol
Claus Gittinger <cg@exept.de>
parents: 2266
diff changeset
   123
!
f6c7146fced2 added naming protocol
Claus Gittinger <cg@exept.de>
parents: 2266
diff changeset
   124
f6c7146fced2 added naming protocol
Claus Gittinger <cg@exept.de>
parents: 2266
diff changeset
   125
name
5104
99233ab3f6f5 comments
Claus Gittinger <cg@exept.de>
parents: 4938
diff changeset
   126
    "return the semaphores userFriendly name"
99233ab3f6f5 comments
Claus Gittinger <cg@exept.de>
parents: 4938
diff changeset
   127
2722
f6c7146fced2 added naming protocol
Claus Gittinger <cg@exept.de>
parents: 2266
diff changeset
   128
    ^ sema name
f6c7146fced2 added naming protocol
Claus Gittinger <cg@exept.de>
parents: 2266
diff changeset
   129
5104
99233ab3f6f5 comments
Claus Gittinger <cg@exept.de>
parents: 4938
diff changeset
   130
    "Created: / 28.6.1997 / 16:19:40 / cg"
99233ab3f6f5 comments
Claus Gittinger <cg@exept.de>
parents: 4938
diff changeset
   131
    "Modified: / 14.12.1999 / 21:03:46 / cg"
2722
f6c7146fced2 added naming protocol
Claus Gittinger <cg@exept.de>
parents: 2266
diff changeset
   132
!
f6c7146fced2 added naming protocol
Claus Gittinger <cg@exept.de>
parents: 2266
diff changeset
   133
f6c7146fced2 added naming protocol
Claus Gittinger <cg@exept.de>
parents: 2266
diff changeset
   134
name:aString
5104
99233ab3f6f5 comments
Claus Gittinger <cg@exept.de>
parents: 4938
diff changeset
   135
    "set the semaphores userFriendly name"
99233ab3f6f5 comments
Claus Gittinger <cg@exept.de>
parents: 4938
diff changeset
   136
4938
d5640f1c8894 Add #numberOfWaitingProcesse
Stefan Vogel <sv@exept.de>
parents: 3670
diff changeset
   137
    sema name:aString
2722
f6c7146fced2 added naming protocol
Claus Gittinger <cg@exept.de>
parents: 2266
diff changeset
   138
5104
99233ab3f6f5 comments
Claus Gittinger <cg@exept.de>
parents: 4938
diff changeset
   139
    "Created: / 28.6.1997 / 16:19:47 / cg"
99233ab3f6f5 comments
Claus Gittinger <cg@exept.de>
parents: 4938
diff changeset
   140
    "Modified: / 14.12.1999 / 21:03:52 / cg"
2722
f6c7146fced2 added naming protocol
Claus Gittinger <cg@exept.de>
parents: 2266
diff changeset
   141
! !
f6c7146fced2 added naming protocol
Claus Gittinger <cg@exept.de>
parents: 2266
diff changeset
   142
7258
9ccdbee7d1ad method category rename
Claus Gittinger <cg@exept.de>
parents: 6985
diff changeset
   143
!RecursionLock methodsFor:'private-initialization'!
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   144
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   145
initialize
2266
a94af740c68a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2263
diff changeset
   146
    sema := Semaphore forMutualExclusion name:'recursionLock'
a94af740c68a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2263
diff changeset
   147
a94af740c68a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2263
diff changeset
   148
    "Modified: 25.1.1997 / 00:19:15 / cg"
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   149
! !
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   150
1215
43e8e17fd9f5 added #wouldBlock
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
   151
!RecursionLock methodsFor:'queries'!
43e8e17fd9f5 added #wouldBlock
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
   152
4938
d5640f1c8894 Add #numberOfWaitingProcesse
Stefan Vogel <sv@exept.de>
parents: 3670
diff changeset
   153
numberOfWaitingProcesses
d5640f1c8894 Add #numberOfWaitingProcesse
Stefan Vogel <sv@exept.de>
parents: 3670
diff changeset
   154
    "return the number of waiting processes"
d5640f1c8894 Add #numberOfWaitingProcesse
Stefan Vogel <sv@exept.de>
parents: 3670
diff changeset
   155
d5640f1c8894 Add #numberOfWaitingProcesse
Stefan Vogel <sv@exept.de>
parents: 3670
diff changeset
   156
    ^ sema numberOfWaitingProcesses
d5640f1c8894 Add #numberOfWaitingProcesse
Stefan Vogel <sv@exept.de>
parents: 3670
diff changeset
   157
d5640f1c8894 Add #numberOfWaitingProcesse
Stefan Vogel <sv@exept.de>
parents: 3670
diff changeset
   158
    "Created: 18.4.1996 / 17:18:08 / cg"
d5640f1c8894 Add #numberOfWaitingProcesse
Stefan Vogel <sv@exept.de>
parents: 3670
diff changeset
   159
!
d5640f1c8894 Add #numberOfWaitingProcesse
Stefan Vogel <sv@exept.de>
parents: 3670
diff changeset
   160
7428
84f4d9f08f04 owner & wouldBlock
Claus Gittinger <cg@exept.de>
parents: 7258
diff changeset
   161
owner
84f4d9f08f04 owner & wouldBlock
Claus Gittinger <cg@exept.de>
parents: 7258
diff changeset
   162
    "return the owning processes (or nil)"
84f4d9f08f04 owner & wouldBlock
Claus Gittinger <cg@exept.de>
parents: 7258
diff changeset
   163
84f4d9f08f04 owner & wouldBlock
Claus Gittinger <cg@exept.de>
parents: 7258
diff changeset
   164
    ^ process
84f4d9f08f04 owner & wouldBlock
Claus Gittinger <cg@exept.de>
parents: 7258
diff changeset
   165
!
1215
43e8e17fd9f5 added #wouldBlock
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
   166
7428
84f4d9f08f04 owner & wouldBlock
Claus Gittinger <cg@exept.de>
parents: 7258
diff changeset
   167
wouldBlock
84f4d9f08f04 owner & wouldBlock
Claus Gittinger <cg@exept.de>
parents: 7258
diff changeset
   168
    "Check if the resource represented by the receiver is  
84f4d9f08f04 owner & wouldBlock
Claus Gittinger <cg@exept.de>
parents: 7258
diff changeset
   169
     already in use by another Process."
1215
43e8e17fd9f5 added #wouldBlock
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
   170
7428
84f4d9f08f04 owner & wouldBlock
Claus Gittinger <cg@exept.de>
parents: 7258
diff changeset
   171
    ^ process notNil and:[Processor activeProcess ~~ process]
1215
43e8e17fd9f5 added #wouldBlock
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
   172
! !
43e8e17fd9f5 added #wouldBlock
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
   173
8568
624bfd00371f category change
Stefan Vogel <sv@exept.de>
parents: 7590
diff changeset
   174
!RecursionLock methodsFor:'waiting'!
330
claus
parents:
diff changeset
   175
claus
parents:
diff changeset
   176
critical:aBlock
claus
parents:
diff changeset
   177
    "evaluate aBlock as a critical region, but do not block,
claus
parents:
diff changeset
   178
     if this lock is already held by the current process."
claus
parents:
diff changeset
   179
6985
ca488dd4a56c Save a block in #critical:
Stefan Vogel <sv@exept.de>
parents: 6975
diff changeset
   180
    |active retVal wasBlocked gotSema|
330
claus
parents:
diff changeset
   181
claus
parents:
diff changeset
   182
    active := Processor activeProcess.
claus
parents:
diff changeset
   183
    process == active ifTrue:[
6985
ca488dd4a56c Save a block in #critical:
Stefan Vogel <sv@exept.de>
parents: 6975
diff changeset
   184
        "I have already got the lock"
6603
bf9b8a0d489b Use #ifCurtailed: instead of #valueOnUnwindDo:
Stefan Vogel <sv@exept.de>
parents: 6552
diff changeset
   185
        ^ aBlock value
330
claus
parents:
diff changeset
   186
    ].
3670
91b4524a74b3 avoid an assignment if I already have the sema (in #critical)
Claus Gittinger <cg@exept.de>
parents: 3524
diff changeset
   187
91b4524a74b3 avoid an assignment if I already have the sema (in #critical)
Claus Gittinger <cg@exept.de>
parents: 3524
diff changeset
   188
    "/
91b4524a74b3 avoid an assignment if I already have the sema (in #critical)
Claus Gittinger <cg@exept.de>
parents: 3524
diff changeset
   189
    "/ sema wait & process := active
91b4524a74b3 avoid an assignment if I already have the sema (in #critical)
Claus Gittinger <cg@exept.de>
parents: 3524
diff changeset
   190
    "/ and:
91b4524a74b3 avoid an assignment if I already have the sema (in #critical)
Claus Gittinger <cg@exept.de>
parents: 3524
diff changeset
   191
    "/ proces := nil & sema signal
91b4524a74b3 avoid an assignment if I already have the sema (in #critical)
Claus Gittinger <cg@exept.de>
parents: 3524
diff changeset
   192
    "/ must both be done atomic
91b4524a74b3 avoid an assignment if I already have the sema (in #critical)
Claus Gittinger <cg@exept.de>
parents: 3524
diff changeset
   193
    "/ Scenario:
91b4524a74b3 avoid an assignment if I already have the sema (in #critical)
Claus Gittinger <cg@exept.de>
parents: 3524
diff changeset
   194
    "/   ... recLock critical
91b4524a74b3 avoid an assignment if I already have the sema (in #critical)
Claus Gittinger <cg@exept.de>
parents: 3524
diff changeset
   195
    "/         got lock
91b4524a74b3 avoid an assignment if I already have the sema (in #critical)
Claus Gittinger <cg@exept.de>
parents: 3524
diff changeset
   196
    "/         evaluated
91b4524a74b3 avoid an assignment if I already have the sema (in #critical)
Claus Gittinger <cg@exept.de>
parents: 3524
diff changeset
   197
    "/         set process to nil
91b4524a74b3 avoid an assignment if I already have the sema (in #critical)
Claus Gittinger <cg@exept.de>
parents: 3524
diff changeset
   198
    "/         -> timer interrupt
91b4524a74b3 avoid an assignment if I already have the sema (in #critical)
Claus Gittinger <cg@exept.de>
parents: 3524
diff changeset
   199
    "/              recLock critical in timeOut action
91b4524a74b3 avoid an assignment if I already have the sema (in #critical)
Claus Gittinger <cg@exept.de>
parents: 3524
diff changeset
   200
    "/              process isNil
91b4524a74b3 avoid an assignment if I already have the sema (in #critical)
Claus Gittinger <cg@exept.de>
parents: 3524
diff changeset
   201
    "/                 sema wait !!!!!! DEADLOCK
91b4524a74b3 avoid an assignment if I already have the sema (in #critical)
Claus Gittinger <cg@exept.de>
parents: 3524
diff changeset
   202
    "/
91b4524a74b3 avoid an assignment if I already have the sema (in #critical)
Claus Gittinger <cg@exept.de>
parents: 3524
diff changeset
   203
    wasBlocked := OperatingSystem blockInterrupts.
6985
ca488dd4a56c Save a block in #critical:
Stefan Vogel <sv@exept.de>
parents: 6975
diff changeset
   204
    [
ca488dd4a56c Save a block in #critical:
Stefan Vogel <sv@exept.de>
parents: 6975
diff changeset
   205
        gotSema := sema wait.
ca488dd4a56c Save a block in #critical:
Stefan Vogel <sv@exept.de>
parents: 6975
diff changeset
   206
        process := active.
ca488dd4a56c Save a block in #critical:
Stefan Vogel <sv@exept.de>
parents: 6975
diff changeset
   207
        wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
ca488dd4a56c Save a block in #critical:
Stefan Vogel <sv@exept.de>
parents: 6975
diff changeset
   208
        retVal := aBlock value.
ca488dd4a56c Save a block in #critical:
Stefan Vogel <sv@exept.de>
parents: 6975
diff changeset
   209
    ] ifCurtailed:[
ca488dd4a56c Save a block in #critical:
Stefan Vogel <sv@exept.de>
parents: 6975
diff changeset
   210
        "be careful - the unwind may occur both while waiting
ca488dd4a56c Save a block in #critical:
Stefan Vogel <sv@exept.de>
parents: 6975
diff changeset
   211
         AND while evaluating the block"
ca488dd4a56c Save a block in #critical:
Stefan Vogel <sv@exept.de>
parents: 6975
diff changeset
   212
        gotSema notNil ifTrue:[
6603
bf9b8a0d489b Use #ifCurtailed: instead of #valueOnUnwindDo:
Stefan Vogel <sv@exept.de>
parents: 6552
diff changeset
   213
            OperatingSystem blockInterrupts.
bf9b8a0d489b Use #ifCurtailed: instead of #valueOnUnwindDo:
Stefan Vogel <sv@exept.de>
parents: 6552
diff changeset
   214
            process := nil.
6985
ca488dd4a56c Save a block in #critical:
Stefan Vogel <sv@exept.de>
parents: 6975
diff changeset
   215
            sema signal.
6975
480fec265743 FIX RACE CONDITION
Stefan Vogel <sv@exept.de>
parents: 6603
diff changeset
   216
        ].
6985
ca488dd4a56c Save a block in #critical:
Stefan Vogel <sv@exept.de>
parents: 6975
diff changeset
   217
        wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
3670
91b4524a74b3 avoid an assignment if I already have the sema (in #critical)
Claus Gittinger <cg@exept.de>
parents: 3524
diff changeset
   218
    ].
6985
ca488dd4a56c Save a block in #critical:
Stefan Vogel <sv@exept.de>
parents: 6975
diff changeset
   219
    OperatingSystem blockInterrupts.
ca488dd4a56c Save a block in #critical:
Stefan Vogel <sv@exept.de>
parents: 6975
diff changeset
   220
    process := nil.
ca488dd4a56c Save a block in #critical:
Stefan Vogel <sv@exept.de>
parents: 6975
diff changeset
   221
    sema signal.
3670
91b4524a74b3 avoid an assignment if I already have the sema (in #critical)
Claus Gittinger <cg@exept.de>
parents: 3524
diff changeset
   222
    wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
6985
ca488dd4a56c Save a block in #critical:
Stefan Vogel <sv@exept.de>
parents: 6975
diff changeset
   223
    ^ retVal.
10860
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   224
!
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   225
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   226
critical:aBlock ifBlocking:blockingBlock
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   227
    "like critical:, but do not block if the lock cannot be aquired.
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   228
     Instead, return the value of the second argument, blockingBlock."
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   229
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   230
    |active wasBlocked result|
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   231
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   232
    active := Processor activeProcess.
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   233
    "I already have the lock"
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   234
    process == active ifTrue:[
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   235
        ^ aBlock value
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   236
    ].
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   237
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   238
    wasBlocked := OperatingSystem blockInterrupts.
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   239
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   240
    process notNil ifTrue:[
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   241
        wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   242
        ^ blockingBlock value
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   243
    ].
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   244
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   245
    [
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   246
        process := active.
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   247
        wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   248
        result := aBlock value
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   249
    ] ensure:[
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   250
        process := nil.
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   251
        sema signalIf.
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   252
    ].
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   253
    ^ result
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   254
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   255
    "Created: / 08-06-2007 / 13:23:03 / cg"
cd924455cfa9 +critical:ifBlocking:
Claus Gittinger <cg@exept.de>
parents: 8568
diff changeset
   256
    "Modified: / 09-06-2007 / 14:22:47 / cg"
17751
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   257
!
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   258
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   259
critical:aBlock timeoutMs:timeoutMs ifBlocking:blockingBlock
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   260
    "like critical:, but do not block if the lock cannot be aquired 
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   261
     within timeoutMs milliseconds.
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   262
     Instead, return the value of blockingBlock."
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   263
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   264
    |active retVal wasBlocked gotSema|
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   265
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   266
    active := Processor activeProcess.
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   267
    process == active ifTrue:[
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   268
        "I have already got the lock"
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   269
        ^ aBlock value
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   270
    ].
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   271
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   272
    "/
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   273
    "/ sema wait & process := active
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   274
    "/ and:
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   275
    "/ proces := nil & sema signal
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   276
    "/ must both be done atomic
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   277
    "/ Scenario:
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   278
    "/   ... recLock critical
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   279
    "/         got lock
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   280
    "/         evaluated
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   281
    "/         set process to nil
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   282
    "/         -> timer interrupt
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   283
    "/              recLock critical in timeOut action
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   284
    "/              process isNil
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   285
    "/                 sema wait !!!!!! DEADLOCK
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   286
    "/
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   287
    wasBlocked := OperatingSystem blockInterrupts.
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   288
    [
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   289
        gotSema := sema waitWithTimeoutMs:timeoutMs.
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   290
        gotSema notNil ifTrue:[
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   291
            process := active.
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   292
            wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   293
            retVal := aBlock value.
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   294
        ].
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   295
    ] ifCurtailed:[
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   296
        "be careful - the unwind may occur both while waiting
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   297
         AND while evaluating the block"
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   298
        gotSema notNil ifTrue:[
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   299
            OperatingSystem blockInterrupts.
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   300
            process := nil.
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   301
            sema signal.
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   302
        ].
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   303
        wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   304
    ].
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   305
    gotSema notNil ifTrue:[
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   306
        OperatingSystem blockInterrupts.
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   307
        process := nil.
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   308
        sema signal.
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   309
        wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   310
    ] ifFalse:[
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   311
        wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   312
        retVal := blockingBlock value.
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   313
    ].
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   314
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   315
    ^ retVal.
330
claus
parents:
diff changeset
   316
! !
claus
parents:
diff changeset
   317
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   318
!RecursionLock class methodsFor:'documentation'!
330
claus
parents:
diff changeset
   319
1216
d7cbc6eb8dd4 critical was critical (deadlock with timeouts)
Claus Gittinger <cg@exept.de>
parents: 1215
diff changeset
   320
version
17892
d86c8bd5ece3 Merged with CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17869
diff changeset
   321
    ^ '$Header: /cvs/stx/stx/libbasic/RecursionLock.st,v 1.36 2011/04/27 15:14:06 stefan Exp $'
17751
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   322
!
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   323
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   324
version_CVS
17845
7e0cfaac936d Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17841
diff changeset
   325
    ^ '§Header: /cvs/stx/stx/libbasic/RecursionLock.st,v 1.36 2011/04/27 15:14:06 stefan Exp §'
17865
598963c6ff8e Recommited from itself
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17846
diff changeset
   326
!
598963c6ff8e Recommited from itself
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17846
diff changeset
   327
598963c6ff8e Recommited from itself
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17846
diff changeset
   328
version_SVN
17892
d86c8bd5ece3 Merged with CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17869
diff changeset
   329
    ^ '$Id: RecursionLock.st 10729 2011-10-31 22:19:21Z vranyj1 $'
17846
24edc476ac18 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17845
diff changeset
   330
! !
17892
d86c8bd5ece3 Merged with CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17869
diff changeset
   331