hg/stx-libbasic: comparison ProcessorScheduler.st

equal deleted inserted replaced

-:8119975c55ce
+:96bb8fce61cf
 	instanceVariableNames:'quiescentProcessLists scheduler zombie activeProcess
 		currentPriority readFdArray readSemaphoreArray readCheckArray
 		writeFdArray writeSemaphoreArray timeoutArray timeoutActionArray
 		timeoutProcessArray timeoutSemaphoreArray idleActions anyTimeouts
 		dispatching interruptedProcess useIOInterrupts gotIOInterrupt
-		osChildExitActions exitWhenNoMoreUserProcesses'
+		osChildExitActions gotChildSignalInterrupt
+		exitWhenNoMoreUserProcesses'
 	classVariableNames:'KnownProcesses KnownProcessIds PureEventDriven
 		UserSchedulingPriority UserInterruptPriority TimingPriority
 		HighestPriority SchedulingPriority MaxNumberOfProcesses'
 	poolDictionaries:''
 	category:'Kernel-Processes'
 "
 handle all timeout actions
 "
 anyTimeouts ifTrue:[
-	self evaluateTimeouts
+self evaluateTimeouts
 ].
 "first do a quick check for semaphores using checkActions - this is needed for
 devices like the X-connection, where some events might be in the event
 queue. Without these checks, a select might block even though there is work to do
 "
 any := false.
 nActions := readCheckArray size.
 1 to:nActions do:[:index |
-	checkBlock := readCheckArray at:index.
+checkBlock := readCheckArray at:index.
-	(checkBlock notNil and:[checkBlock value]) ifTrue:[
+(checkBlock notNil and:[checkBlock value]) ifTrue:[
-	    sema := readSemaphoreArray at:index.
+sema := readSemaphoreArray at:index.
-	    sema notNil ifTrue:[
+sema notNil ifTrue:[
-		sema signalOnce.
+sema signalOnce.
-	    ].
+].
-	    any := true.
+any := true.
-	]
+]
 ].
 "now, someone might be runnable ..."
 p := self highestPriorityRunnableProcess.
 p isNil ifTrue:[
-	"/ no one runnable, hard wait for event or timeout
+"/ no one runnable, hard wait for event or timeout
-	self waitForEventOrTimeout.
+self waitForEventOrTimeout.
-	^ self
+^ self
 ].
 pri := p priority.
 "
 (a future version will have a process running to handle a timeout queue)
 "
 "
 pri < TimingPriority ifTrue:[
-	anyTimeouts ifTrue:[
+anyTimeouts ifTrue:[
-	    millis := self timeToNextTimeout.
+millis := self timeToNextTimeout.
-	    millis == 0 ifTrue:[^ self].
+millis == 0 ifTrue:[^ self].
-	]
+]
 ].
 "
 "
 if the process to run has a lower than UserInterruptPriority,
 or by installing a poll-interrupt after 50ms (if the OS does not).
 "
 pri < UserInterruptPriority ifTrue:[
 "comment out this if above is uncommented"
-	anyTimeouts ifTrue:[
+anyTimeouts ifTrue:[
-	    millis := self timeToNextTimeout.
+millis := self timeToNextTimeout.
-	    millis == 0 ifTrue:[^ self].
+millis == 0 ifTrue:[^ self].
-	].
+].
 "---"
-	useIOInterrupts ifTrue:[
+useIOInterrupts ifTrue:[
-	    readFdArray do:[:fd |
+readFdArray do:[:fd |
-		fd notNil ifTrue:[
+fd notNil ifTrue:[
-		    OperatingSystem enableIOInterruptsOn:fd
+OperatingSystem enableIOInterruptsOn:fd
-		].
+].
-	    ].
+].
-	] ifFalse:[
+] ifFalse:[
-	    millis notNil ifTrue:[
+millis notNil ifTrue:[
-		millis := millis min:50
+millis := millis min:50
-	    ] ifFalse:[
+] ifFalse:[
-		millis := 50
+millis := 50
-	    ]
+]
-	]
+]
 ].
 millis notNil ifTrue:[
-	"schedule a clock interrupt after millis milliseconds"
+"schedule a clock interrupt after millis milliseconds"
-	OperatingSystem enableTimer:millis rounded.
+OperatingSystem enableTimer:millis rounded.
 ].
 "
 now let the process run - will come back here by reschedule
 from ioInterrupt or timerInterrupt ... (running at max+1)
 "
 self threadSwitch:p.
 "... when we arrive here, we are back on stage.
-	 Either by an ALARM or IO signal, or by a suspend of another process
+Either by an ALARM or IO signal, or by a suspend of another process
 "
 millis notNil ifTrue:[
-	OperatingSystem disableTimer.
+OperatingSystem disableTimer.
+].
+"/ check for OS process termination
+gotChildSignalInterrupt ifTrue:[
+gotChildSignalInterrupt := false.
+self handleChildSignalInterrupt
 ].
 "/ check for new input
 (gotIOInterrupt or:[useIOInterrupts not]) ifTrue:[
-	gotIOInterrupt := false.
+gotIOInterrupt := false.
-	self checkForInputWithTimeout:0.
+self checkForInputWithTimeout:0.
 ]
-"Modified: 21.12.1995 / 16:21:54 / stefan"
+"Modified: 12.4.1996 / 10:14:18 / stefan"
 !
 dispatchLoop
 "central dispatch loop; the scheduler process is always staying in
 this method, looping forever."
 ! !
 !ProcessorScheduler methodsFor:'os process handling'!
 childSignalInterrupt
+"child changed state - switch to scheduler process which will decide
+what to do now."
+gotChildSignalInterrupt := true.
+interruptedProcess := activeProcess.
+self threadSwitch:scheduler
+"Modified: 12.4.1996 / 10:12:18 / stefan"
+!
+handleChildSignalInterrupt
 "child changed state - execute child termination blocks.
 If child is no longer alive, remove action block."
 |osProcessStatus blocking wasBlocked|
 ].
 ] valueNowOrOnUnwindDo:[
 wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
 ]
-"Created: 22.12.1995 / 14:16:26 / stefan"
 "Modified: 5.1.1996 / 16:56:11 / stefan"
 "Modified: 28.2.1996 / 21:36:31 / cg"
+"Created: 12.4.1996 / 10:08:21 / stefan"
 !
 monitorPid:pid action:aBlock
 "add a 1-arg-block that is called when the operating system child process
 with pid pid changes state.
 |nPrios "{ Class: SmallInteger }"
 p|
 KnownProcesses isNil ifTrue:[
-	KnownProcesses := WeakArray new:10.
+KnownProcesses := WeakArray new:10.
-	KnownProcesses watcher:self class.
+KnownProcesses watcher:self class.
-	KnownProcessIds := OrderedCollection new.
+KnownProcessIds := OrderedCollection new.
 ].
 "
 create a collection with process lists; accessed using the priority as key
 "
 nPrios := SchedulingPriority.
 quiescentProcessLists := Array new:nPrios.
 1 to:nPrios do:[:pri |
-	quiescentProcessLists at:pri put:(LinkedList new)
+quiescentProcessLists at:pri put:(LinkedList new)
 ].
 readFdArray := Array with:nil.
 readCheckArray := Array with:nil.
 readSemaphoreArray := Array with:nil.
 dispatching := false.
 exitWhenNoMoreUserProcesses := false. "/ mhmh - how about true ?
 useIOInterrupts := OperatingSystem supportsIOInterrupts.
 gotIOInterrupt := false.
 osChildExitActions := Dictionary new.
+gotChildSignalInterrupt := false.
 "
 handcraft the first (dispatcher-) process - this one will never
 block, but go into a select if there is nothing to do.
 Also, it has a prio of max+1 - thus, it comes first when looking
 "
 ObjectMemory ioInterruptHandler:self.
 ObjectMemory timerInterruptHandler:self.
 ObjectMemory childSignalInterruptHandler:self.
-"Modified: 22.12.1995 / 14:15:29 / stefan"
+"Modified: 12.4.1996 / 10:12:56 / stefan"
 !
 reinitialize
 "all previous processes (except those marked as restartable) are made dead
 - each object should reinstall its process(s) upon restart;
 hard wait for either input to arrive or a timeout to occur."
 |fd index sema action|
 fd := OperatingSystem
-	      selectOnAnyReadable:readFdArray
+selectOnAnyReadable:readFdArray
-			 writable:writeFdArray
+writable:writeFdArray
-			exception:nil
+exception:nil
-		      withTimeOut:millis.
+withTimeOut:millis.
 fd isNil ifTrue:[
-	(OperatingSystem lastErrorSymbol == #EBADF) ifTrue:[
+(OperatingSystem lastErrorSymbol == #EBADF) ifTrue:[
-	    "/ mhmh - one of the fd's given to me is corrupt.
+"/ mhmh - one of the fd's given to me is corrupt.
-	    "/ find out which one .... and remove it
+"/ find out which one .... and remove it
-	    self removeCorruptedFds
+OperatingSystem clearLastErrorNumber.
-	]
+self removeCorruptedFds
+]
 ] ifFalse:[
-	index := readFdArray indexOf:fd.
+index := readFdArray indexOf:fd.
-	index ~~ 0 ifTrue:[
+index ~~ 0 ifTrue:[
-	    sema := readSemaphoreArray at:index.
+sema := readSemaphoreArray at:index.
-	    sema notNil ifTrue:[
+sema notNil ifTrue:[
-		sema signalOnce.
+sema signalOnce.
-		^ true
+^ true
-	    ] ifFalse:[
+] ifFalse:[
-		action := readCheckArray at:index.
+action := readCheckArray at:index.
-		action notNil ifTrue:[
+action notNil ifTrue:[
-		    action value.
+action value.
-		     ^ true
+^ true
-		]
+]
-	    ]
+]
-	]
+]
 ].
 ^ false
+"Modified: 12.4.1996 / 09:31:22 / stefan"
 !
 ioInterrupt
 "data arrived while waiting - switch to scheduler process which will decide
 what to do now."
 writable:nil
 exception:nil
 withTimeOut:0.
 (rslt isNil and:[OperatingSystem lastErrorSymbol == #EBADF]) ifTrue:[
-('PROCESSOR: remove invalid read fileDescriptor: ' , fd printString) errorPrintNL.
+('PROCESSOR: removing invalid read fileDescriptor: ' , fd printString) errorPrintNL.
-readFdArray at:idx put:nil
+readFdArray at:idx put:nil.
+OperatingSystem clearLastErrorNumber
 ]
 ].
 writeFdArray keysAndValuesDo:[:idx :fd |
 |rslt|
 exception:nil
 withTimeOut:0.
 (rslt isNil and:[OperatingSystem lastErrorSymbol == #EBADF]) ifTrue:[
 ('PROCESSOR: removing invalid write fileDescriptor: ' , fd printString) errorPrintNL.
-writeFdArray at:idx put:nil
+writeFdArray at:idx put:nil.
+OperatingSystem clearLastErrorNumber
 ]
 ].
+"Modified: 12.4.1996 / 09:32:58 / stefan"
 !
 schedulerInterrupt
 "forced reschedule - switch to scheduler process which will decide
 what to do now."
 ! !
 !ProcessorScheduler class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/ProcessorScheduler.st,v 1.74 1996-04-02 22:04:46 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/ProcessorScheduler.st,v 1.75 1996-04-12 09:25:42 stefan Exp $'
 ! !
 ProcessorScheduler initialize!

changeset 1154	96bb8fce61cf
parent 1133	961f2b095c22
child 1166	f5affd8cb289