hg/stx-libbasic: comparison AbstractOperatingSystem.st

equal deleted inserted replaced

-:b26c61158551
+:2b04ee017e72
 !AbstractOperatingSystem class methodsFor:'executing OS commands-private'!
 shuffleAllFrom:anInStream to:anOutStream lineWise:lineWise lockWith:aLock
 lineWise ifFalse:[
-^ anInStream copyToEndInto:anOutStream.
+	^ anInStream copyToEndInto:anOutStream.
 ].
 [anInStream isOpen and:[anInStream atEnd not]] whileTrue:[
-aLock critical:[
+	aLock critical:[
-self
+	    self
-shuffleFrom:anInStream
+		shuffleFrom:anInStream
-to:anOutStream
+		to:anOutStream
-lineWise:lineWise
+		lineWise:lineWise
-]
+	]
 ]
 !
 shuffleFrom:anInStream to:anOutStream lineWise:lineWise
 "copy data from anInStream to anOutStream.
 closeStreams|
 terminateLock := Semaphore forMutualExclusion.
 ((externalInStream := anInStream) notNil
 and:[externalInStream isExternalStream not]) ifTrue:[
-pIn := NonPositionableExternalStream makePipe.
+	pIn := NonPositionableExternalStream makePipe.
-inStreamToClose := externalInStream := pIn at:1.
+	inStreamToClose := externalInStream := pIn at:1.
-shuffledInStream := pIn at:2.
+	shuffledInStream := pIn at:2.
-anInStream isBinary ifTrue:[
+	anInStream isBinary ifTrue:[
-shuffledInStream binary
+	    shuffledInStream binary
-].
+	].
-lineWise ifFalse:[
+	lineWise ifFalse:[
-shuffledInStream blocking:false.
+	    shuffledInStream blocking:false.
-].
+	].
-"/ start a reader process, shuffling data from the given
+	"/ start a reader process, shuffling data from the given
-"/ inStream to the pipe (which is connected to the commands input)
+	"/ inStream to the pipe (which is connected to the commands input)
-inputShufflerProcess :=
+	inputShufflerProcess :=
-[
+	    [
-[
+		[
-[anInStream atEnd] whileFalse:[
+		    [anInStream atEnd] whileFalse:[
-self shuffleFrom:anInStream to:shuffledInStream lineWise:lineWise.
+			self shuffleFrom:anInStream to:shuffledInStream lineWise:lineWise.
-shuffledInStream flush
+			shuffledInStream flush
-]
+		    ]
-] ensure:[
+		] ensure:[
-shuffledInStream close
+		    shuffledInStream close
-]
+		]
-] newProcess
+	    ] newProcess
-name:'cmd input shuffler';
+		name:'cmd input shuffler';
 "/                beSystemProcess;
-resume.
+		resume.
 ].
 ((externalOutStream := anOutStream) notNil
 and:[externalOutStream isExternalStream not]) ifTrue:[
-pOut := NonPositionableExternalStream makePipe.
+	pOut := NonPositionableExternalStream makePipe.
-shuffledOutStream := (pOut at:1).
+	shuffledOutStream := (pOut at:1).
-anOutStream isBinary ifTrue:[
+	anOutStream isBinary ifTrue:[
-shuffledOutStream binary
+	    shuffledOutStream binary
-].
+	].
-outStreamToClose := externalOutStream := pOut at:2.
+	outStreamToClose := externalOutStream := pOut at:2.
-outputShufflerProcess :=
+	outputShufflerProcess :=
-[
+	    [
-WriteError handle:[:ex |
+		WriteError handle:[:ex |
-"/ ignored
+		    "/ ignored
-] do:[
+		] do:[
-self shuffleAllFrom:shuffledOutStream to:anOutStream lineWise:lineWise lockWith:terminateLock.
+		    self shuffleAllFrom:shuffledOutStream to:anOutStream lineWise:lineWise lockWith:terminateLock.
-].
+		].
-] newProcess
+	    ] newProcess
-priority:(Processor userSchedulingPriority "+ 1");
+		priority:(Processor userSchedulingPriority "+ 1");
-name:'cmd output shuffler';
+		name:'cmd output shuffler';
 "/                beSystemProcess;
-resume.
+		resume.
 ].
 (externalErrStream := anErrStream) notNil ifTrue:[
-anErrStream == anOutStream ifTrue:[
+	anErrStream == anOutStream ifTrue:[
-externalErrStream := externalOutStream
+	    externalErrStream := externalOutStream
-] ifFalse:[
+	] ifFalse:[
-anErrStream isExternalStream ifFalse:[
+	    anErrStream isExternalStream ifFalse:[
-pErr := NonPositionableExternalStream makePipe.
+		pErr := NonPositionableExternalStream makePipe.
-shuffledErrStream := (pErr at:1).
+		shuffledErrStream := (pErr at:1).
-anErrStream isBinary ifTrue:[
+		anErrStream isBinary ifTrue:[
-shuffledErrStream binary
+		    shuffledErrStream binary
-].
+		].
-errStreamToClose := externalErrStream := pErr at:2.
+		errStreamToClose := externalErrStream := pErr at:2.
-errorShufflerProcess :=
+		errorShufflerProcess :=
-[
+		    [
-self shuffleAllFrom:shuffledErrStream to:anErrStream lineWise:lineWise lockWith:terminateLock.
+			self shuffleAllFrom:shuffledErrStream to:anErrStream lineWise:lineWise lockWith:terminateLock.
-] newProcess
+		    ] newProcess
-priority:(Processor userSchedulingPriority + 1);
+			priority:(Processor userSchedulingPriority + 1);
-name:'cmd err-output shuffler';
+			name:'cmd err-output shuffler';
 "/                        beSystemProcess;
-resume.
+			resume.
-]
+	    ]
-]
+	]
 ].
 ((externalAuxStream := anAuxStream) notNil
 and:[externalAuxStream isExternalStream not]) ifTrue:[
-pAux := NonPositionableExternalStream makePipe.
+	pAux := NonPositionableExternalStream makePipe.
-auxStreamToClose := externalAuxStream := pAux at:1.
+	auxStreamToClose := externalAuxStream := pAux at:1.
-shuffledAuxStream := pAux at:2.
+	shuffledAuxStream := pAux at:2.
-shuffledAuxStream blocking:false.
+	shuffledAuxStream blocking:false.
-anAuxStream isBinary ifTrue:[
+	anAuxStream isBinary ifTrue:[
-shuffledAuxStream binary
+	    shuffledAuxStream binary
-].
+	].
-"/ start a reader process, shuffling data from the given
+	"/ start a reader process, shuffling data from the given
-"/ auxStream to the pipe (which is connected to the commands aux)
+	"/ auxStream to the pipe (which is connected to the commands aux)
-auxShufflerProcess :=
+	auxShufflerProcess :=
-[
+	    [
-[
+		[
-[anAuxStream atEnd] whileFalse:[
+		    [anAuxStream atEnd] whileFalse:[
-self shuffleFrom:anAuxStream to:shuffledAuxStream lineWise:false.
+			self shuffleFrom:anAuxStream to:shuffledAuxStream lineWise:false.
-shuffledAuxStream flush
+			shuffledAuxStream flush
-]
+		    ]
-] ensure:[
+		] ensure:[
-shuffledAuxStream close
+		    shuffledAuxStream close
-]
+		]
-] newProcess
+	    ] newProcess
-name:'cmd aux shuffler';
+		name:'cmd aux shuffler';
 "/                beSystemProcess;
-resume.
+		resume.
 ].
 stopShufflers := [:shuffleRest |
-inputShufflerProcess notNil ifTrue:[
+	    inputShufflerProcess notNil ifTrue:[
-terminateLock critical:[inputShufflerProcess terminate].
+		terminateLock critical:[inputShufflerProcess terminate].
-inputShufflerProcess waitUntilTerminated
+		inputShufflerProcess waitUntilTerminated
-].
+	    ].
-auxShufflerProcess notNil ifTrue:[
+	    auxShufflerProcess notNil ifTrue:[
-terminateLock critical:[auxShufflerProcess terminate].
+		terminateLock critical:[auxShufflerProcess terminate].
-auxShufflerProcess waitUntilTerminated
+		auxShufflerProcess waitUntilTerminated
-].
+	    ].
-outputShufflerProcess notNil ifTrue:[
+	    outputShufflerProcess notNil ifTrue:[
-terminateLock critical:[outputShufflerProcess terminate].
+		terminateLock critical:[outputShufflerProcess terminate].
-outputShufflerProcess waitUntilTerminated.
+		outputShufflerProcess waitUntilTerminated.
-shuffleRest ifTrue:[ self shuffleRestFrom:shuffledOutStream to:anOutStream lineWise:lineWise ].
+		shuffleRest ifTrue:[ self shuffleRestFrom:shuffledOutStream to:anOutStream lineWise:lineWise ].
-shuffledOutStream close.
+		shuffledOutStream close.
-].
+	    ].
-errorShufflerProcess notNil ifTrue:[
+	    errorShufflerProcess notNil ifTrue:[
-terminateLock critical:[errorShufflerProcess terminate].
+		terminateLock critical:[errorShufflerProcess terminate].
-errorShufflerProcess waitUntilTerminated.
+		errorShufflerProcess waitUntilTerminated.
-shuffleRest ifTrue:[ self shuffleRestFrom:shuffledErrStream to:anErrStream lineWise:lineWise ].
+		shuffleRest ifTrue:[ self shuffleRestFrom:shuffledErrStream to:anErrStream lineWise:lineWise ].
-shuffledErrStream close.
+		shuffledErrStream close.
-].
+	    ].
-].
+	].
 closeStreams := [
-inStreamToClose notNil ifTrue:[
+	    inStreamToClose notNil ifTrue:[
-inStreamToClose close
+		inStreamToClose close
-].
+	    ].
-errStreamToClose notNil ifTrue:[
+	    errStreamToClose notNil ifTrue:[
-errStreamToClose close
+		errStreamToClose close
-].
+	    ].
-outStreamToClose notNil ifTrue:[
+	    outStreamToClose notNil ifTrue:[
-outStreamToClose close
+		outStreamToClose close
-].
+	    ].
-auxStreamToClose notNil ifTrue:[
+	    auxStreamToClose notNil ifTrue:[
-auxStreamToClose close
+		auxStreamToClose close
-].
+	    ].
-nullStream notNil ifTrue:[
+	    nullStream notNil ifTrue:[
-nullStream close
+		nullStream close
-].
+	    ].
-].
+	].
 sema := Semaphore new name:'OS command wait'.
 [
-externalInStream isNil ifTrue:[
+	externalInStream isNil ifTrue:[
-externalInStream := nullStream := Filename nullDevice readWriteStream.
+	    externalInStream := nullStream := Filename nullDevice readWriteStream.
-].
+	].
-externalOutStream isNil ifTrue:[
+	externalOutStream isNil ifTrue:[
-nullStream isNil ifTrue:[nullStream := Filename nullDevice writeStream].
+	    nullStream isNil ifTrue:[nullStream := Filename nullDevice writeStream].
-externalOutStream := nullStream.
+	    externalOutStream := nullStream.
-].
+	].
-externalErrStream isNil ifTrue:[
+	externalErrStream isNil ifTrue:[
-externalErrStream := externalOutStream
+	    externalErrStream := externalOutStream
-].
+	].
-pid := Processor
+	pid := Processor
-monitor:[
+		    monitor:[
-self
+			self
-startProcess:aCommandStringOrArray
+			    startProcess:aCommandStringOrArray
-inputFrom:externalInStream
+			    inputFrom:externalInStream
-outputTo:externalOutStream
+			    outputTo:externalOutStream
-errorTo:externalErrStream
+			    errorTo:externalErrStream
-auxFrom:externalAuxStream
+			    auxFrom:externalAuxStream
-environment:environmentDictionary
+			    environment:environmentDictionary
-inDirectory:dirOrNil
+			    inDirectory:dirOrNil
-]
+		    ]
-action:[:status |
+		    action:[:status |
-status stillAlive ifFalse:[
+			status stillAlive ifFalse:[
-exitStatus := status.
+			    exitStatus := status.
-sema signal.
+			    sema signal.
-self closePid:pid
+			    self closePid:pid
-]
+			]
-].
+		    ].
-pid isNil ifTrue:[
+	pid isNil ifTrue:[
-exitStatus := self osProcessStatusClass processCreationFailure
+	    exitStatus := self osProcessStatusClass processCreationFailure
-] ifFalse:[
+	] ifFalse:[
-sema wait.
+	    sema wait.
-].
+	].
 ] ifCurtailed:[
-closeStreams value.
+	closeStreams value.
-pid notNil ifTrue:[
+	pid notNil ifTrue:[
-"/ terminate the os-command (and all of its forked commands)
+	    "/ terminate the os-command (and all of its forked commands)
-self terminateProcessGroup:pid.
+	    self terminateProcessGroup:pid.
-self terminateProcess:pid.
+	    self terminateProcess:pid.
-self closePid:pid.
+	    self closePid:pid.
-].
+	].
-stopShufflers value:false.
+	stopShufflers value:false.
 ].
 closeStreams value.
 stopShufflers value:true.
 (exitStatus isNil or:[exitStatus success]) ifFalse:[
-^ aBlock value:exitStatus
+	^ aBlock value:exitStatus
 ].
 ^ true
 "
-|outStream errStream|
+	|outStream errStream|
-outStream := '' writeStream.
+	outStream := '' writeStream.
-OperatingSystem executeCommand:'ls -l'
+	OperatingSystem executeCommand:'ls -l'
-inputFrom:'abc' readStream
+			inputFrom:'abc' readStream
-outputTo:outStream
+			outputTo:outStream
-errorTo:nil
+			errorTo:nil
-inDirectory:nil
+			inDirectory:nil
-lineWise:true
+			lineWise:true
-onError:[:exitStatus | ^ false].
+			onError:[:exitStatus | ^ false].
-outStream contents
+	outStream contents
 "
 "
-|outStream errStream|
+	|outStream errStream|
-outStream := #[] writeStream.
+	outStream := #[] writeStream.
-OperatingSystem executeCommand:'cat'
+	OperatingSystem executeCommand:'cat'
-inputFrom:(ByteArray new:5000000) readStream
+			inputFrom:(ByteArray new:5000000) readStream
-outputTo:outStream
+			outputTo:outStream
-errorTo:nil
+			errorTo:nil
-inDirectory:nil
+			inDirectory:nil
-lineWise:false
+			lineWise:false
-onError:[:exitStatus | ^ false].
+			onError:[:exitStatus | ^ false].
-outStream size
+	outStream size
 "
 "
-|outStream errStream|
+	|outStream errStream|
-outStream := '' writeStream.
+	outStream := '' writeStream.
-OperatingSystem executeCommand:'gpg -s --batch --no-tty --passphrase-fd 0 /tmp/passwd'
+	OperatingSystem executeCommand:'gpg -s --batch --no-tty --passphrase-fd 0 /tmp/passwd'
-inputFrom:'bla' readStream
+			inputFrom:'bla' readStream
-outputTo:outStream
+			outputTo:outStream
-errorTo:nil
+			errorTo:nil
-inDirectory:nil
+			inDirectory:nil
-lineWise:true
+			lineWise:true
-onError:[:exitStatus |  false].
+			onError:[:exitStatus |  false].
-outStream contents
+	outStream contents
 "
 "Modified: / 11-02-2007 / 20:54:39 / cg"
 !
 %{  /* NOCONTEXT */
 unsigned INT low, high;
 #ifdef __x86_64__
-# if defined(__GCC__)
+# if defined(__GCC__) || defined(__CLANG__) || defined(__MINGW64__)
 asm volatile("rdtsc" : "=a"(low), "=d"(high));
 RETURN ( __MKUINT(low + (high << 32)) );
 # endif
 #endif
 __emit__(0x0F,0x31);            /* RDTSC instruction */
 _asm { mov low,eax };
 _asm { mov high,edx };
 _asm { pop edx };
 # else
-#  if defined(__MINGW_H) || defined(__GNUC__)
+#  if defined(__MINGW_H) || defined(__MINGW32__) || defined(__GNUC__)
 asm volatile("rdtsc" : "=a"(low), "=d"(high));
 #  else
 goto unsupported;
 #  endif
 # endif
 be finished."
 |result fdArray|
 self supportsSelect ifFalse:[
-"/ mhmh - what should we do then ?
+	"/ mhmh - what should we do then ?
-"/ For now, return true as if data was present,
+	"/ For now, return true as if data was present,
-"/ and let the thread fall into the write.
+	"/ and let the thread fall into the write.
-"/ It will then (hopefully) be desceduled there and
+	"/ It will then (hopefully) be desceduled there and
-"/ effectively polling for output.
+	"/ effectively polling for output.
-^ true
+	^ true
 ].
 result := self
-selectOnAnyReadable:nil writable:(fdArray := Array with:fd) exception:fdArray
+		selectOnAnyReadable:nil writable:(fdArray := Array with:fd) exception:fdArray
-readableInto:nil writableInto:nil exceptionInto:nil
+		readableInto:nil writableInto:nil exceptionInto:nil
-withTimeOut:0.
+		withTimeOut:0.
 "on select error, a read will immediately return, so answer true"
 ^ result > 0.
 ! !

branch	jv
changeset 19353	2b04ee017e72
parent 19225	9e8abf62f932
parent 19341	2ab29dd7ec1a
child 19431	3e697e4bcbf5