hg/stx-libbasic: comparison UnixOperatingSystem.st

equal deleted inserted replaced

-:6409bc73ce3c
+:7d735472f937
 !
 primIdOf:aPathName
 "the actual code to return the fileNumber (i.e. inode number) of a file."
-%{  /* UNLIMITEDSTACK(WIN32) */
+%{
 struct stat buf;
 int ret;
 unsigned INT ino;
 OBJ retVal;
 "could be implemented as:
 	(self infoOf:aPathName) accessed
 "
 |osSeconds i|
 %{
-#if !defined(WIN32) && !defined(__VMS__)
 struct stat buf;
 time_t mtime;
 int ret;
 if (__isString(aPathName)) {
 	    @global(LastErrorNumber) = __MKSMALLINT(errno);
 	    RETURN (nil);
 	}
 	osSeconds = __MKUINT(buf.st_atime);
 }
-#endif
 %}.
 osSeconds notNil ifTrue:[^ AbsoluteTime fromOSTime:(osSeconds * 1000)].
 i := self infoOf:aPathName.
 i notNil ifTrue:[^ i accessed].
 dt.it_value.tv_sec = 0;
 dt.it_value.tv_usec = 0;
 setitimer(ITIMER_REAL, &dt, 0);
 RETURN (true);
 #else
-# if defined(WIN32)
-extern void __win32ClearTimer();
-__win32ClearTimer();
-RETURN (true);
-# endif /* WIN32 */
-# if defined(__VMS__) && defined(USE_AST_TIMER)
-extern void __vmsClearTimer();
-__vmsClearTimer();
-RETURN (true);
-# endif /* __VMS__ */
 # if defined(USE_SLOW_ALARM)
 #  if defined(SIGALRM)
 alarm(0);
 RETURN (true);
 	    case SIGINT:
 #endif
 #ifdef SIGQUIT
 	    case SIGQUIT:
 #endif
-#  ifdef WIN32
+#if defined(SIGINT) || defined(SIGQUIT) || defined(SIGBREAK)
-#ifdef PROCESSDEBUGWIN32
-		printf("ConsoleSignal %d\n",sigNr);
-#endif
-		SetConsoleCtrlHandler((PHANDLER_ROUTINE)__signalUserInterruptWIN32,TRUE);
-		RETURN (self);
-#else
-# if defined(SIGINT) || defined(SIGQUIT) || defined(SIGBREAK)
 		handler = __signalUserInterrupt;
 		break;
-# endif
 #endif
 #ifdef SIGFPE
 	    case SIGFPE:
 		handler = __signalFpExceptionInterrupt;
 		break;
 	    case CHILD_SIGNAL:
 		handler = __signalChildInterrupt;
 		break;
 #endif
 #ifdef SIGALRM
-# ifndef WIN32
 	    case SIGALRM:
 		handler = __signalTimerInterrupt;
 		break;
-# endif
 #endif
 	    default:
 		handler = __signalInterrupt;
 		break;
 	    vec.sv_flags = SV_INTERRUPT;
 	    sigemptyset(&vec.sv_mask);
 	    vec.sv_handler = handler;
 	    sigvec(sigNr, &vec, NULL);
 # else
-#  ifdef WIN32
-#ifdef PROCESSDEBUGWIN32
-	    printf("signal %d can't change handler\n",sigNr);
-#endif
-#  else
 	    (void) signal(sigNr, handler);
-#  endif
 # endif
 #endif
 	}
 	/*
 	dt.it_value.tv_usec = (millis % 1000) * 1000;
 	setitimer(ITIMER_REAL, &dt, 0);
 	RETURN (true);
 }
 #else /* no ITIMER_REAL */
-# ifdef WIN32
-{
-	extern void __win32SetTimer();
-	__win32SetTimer(millis);
-	RETURN (true);
-}
-# endif /* WIN32 */
-# if defined(__VMS__) && defined(USE_AST_TIMER)
-{
-	extern void __vmsSetTimer();
-	__vmsSetTimer(millis);
-	RETURN (true);
-}
-# endif /* __VMS__ */
 # ifdef USE_SLOW_ALARM
 {
 	/*
 	 * last fallback - use alarm (which only gives 1 second resolution).
 	      UnixOperatingSystem>>getStatusOfProcess:aProcessId."
 self sendSignal:(self sigKILL) to:(processGroupId negated).
 "Created: / 10.6.1998 / 11:59:29 / cg"
-!
-primTerminateProcess:pid
-"terminate a WIN32 process.
-The TerminateProcess function is used to unconditionally cause
-a process to exit. Use it only in extreme circumstances. The state of
-global data maintained by dynamic-link libraries (DLLs)
-may be compromised if TerminateProcess is used."
-%{  /* UNLIMITEDSTACK (WIN95 only)*/
-#ifdef WIN32
-if (__isExternalAddress(pid) )
-{
-if (_HANDLEVal(pid) != 0)
-{
-#ifdef PROCESSDEBUGWIN32
-	 printf("Terminate ProcessHandle %x\n",_HANDLEVal(pid));
-#endif
-	 TerminateProcess(_HANDLEVal(pid),-1);
-	 CloseHandle(_HANDLEVal(pid));
-	 _HANDLEVal(pid) = 0;
-}
-}
-#endif
-%}
 !
 sendSignal:signalNumber to:processId
 "send a unix signal to some process (maybe myself).
 Returns false if any error occurred, true otherwise.
 #   define HAVE_TIME
 #  endif /* old SYSV stuff */
 # endif
 # ifndef HAVE_TIME
-#  ifdef WIN32
-t = GetTickCount();
-_seconds = t / 1000.
-_millis = t % 1000;
-#   define HAVE_TIME
-#  endif
-# endif
-# ifndef HAVE_TIME
 #  ifdef MSDOS_LIKE
 struct _timeb timebuffer;
 _ftime(&timebuffer);
 _seconds = timebuffer.time;
 ticks = times(&tb);
 t = (ticks * 1000) / HZ;
 #   define HAVE_TIME
 #  endif /* old SYSV stuff */
-# endif
-# ifndef HAVE_TIME
-#  ifdef WIN32
-t = GetTickCount();
-#   define HAVE_TIME
-#  endif
 # endif
 # ifndef HAVE_TIME
 #  ifdef MSDOS_LIKE
 struct _timeb timebuffer;
 "return true, if childProcessWait: blocks, if no children are ready.
 On those systems, we must be somewhat careful when looking out for
 a subprocesses status (to avoid blocking)."
 %{ /*NOCONTEXT*/
-#if defined(HAS_WAITPID) || defined(HAS_WAIT3) || defined(WIN32) || defined(__VMS__)
+#if defined(HAS_WAITPID) || defined(HAS_WAIT3)
 RETURN(false);
 #else
 RETURN(true);
 #endif
 %}
 %{
 #ifdef NOTDEF   /* does not work ... */
 /*
 * if available, try FIONREAD first, which is usually done faster.
 */
-# if defined(FIONREAD) && !defined(WIN32)
+# if defined(FIONREAD)
 {
 	int n;
 	if (__isSmallInteger(fd)) {
 	    if (ioctl(__intVal(fd), FIONREAD, &n) >= 0) {
 %{
 #ifdef NOTDEF   /* does not work ... */
 /*
 * if available, try FIONREAD first, which is usually done faster.
 */
-# if defined(FIONREAD) && !defined(WIN32)
+# if defined(FIONREAD)
 {
 	int n;
 	if (__isSmallInteger(fd)) {
 	    if (n = ioctl(__intVal(fd), FIONREAD)) {
 	if (t == 0) {
 	    /*
 	     * if there is no timeout time, we can stay here interruptable.
 	     */
 	    do {
-# ifdef WIN32
-		intf we;
-		if (numFds == 0) {
-		    HANDLE dummyHandle = (HANDLE)0;
-#  if 0 /* does not work under WIN95 - sigh */
-		    if (! GetQueueStatus(QS_ALLINPUT)) {
-			MsgWaitForMultipleObjects(0, &dummyHandle, FALSE, t, QS_ALLINPUT);
-		    }
-#  else
-		    if (we = __getWaitInputEvent()) {
-			we(t);
-		    }
-#  endif
-		    ret = 0;
-		} else {
-		    ret = select(0, &rset, &wset, &eset, &wt);
-		}
-# else /* a real OS */
 		ret = select(maxF+1, &rset, &wset, &eset, &wt);
-# endif /* to WIN or not to WIN */
 	    } while ((ret < 0) && (errno == EINTR));
 	} else {
 	    do {
-# ifdef WIN32
-		intf we;
-		if (numFds == 0) {
-		    HANDLE dummyHandle = (HANDLE)0;
-#  if 0 /* does not work under WIN95 - sigh */
-		    if (! GetQueueStatus(QS_ALLINPUT)) {
-			MsgWaitForMultipleObjects(0, &dummyHandle, FALSE, t, QS_ALLINPUT);
-		    }
-#  else
-		    if (we = __getWaitInputEvent()) {
-			we(t);
-		    }
-#  endif
-		    ret = 0;
-		} else {
-		    ret = select(0, &rset, &wset, &eset, &wt);
-		}
-# else /* a real OS */
 		ret = select(maxF+1, &rset, &wset, &eset, &wt);
-# endif * to WIN or not to WIN */
 		/*
 		 * for now: dont loop; if we did, we had to adjust the vt-timeval;
 		 * could otherwise stay in this loop forever ...
 		 * Premature return (before the time expired) must be handled by the caller.
 		 * A good solution is to update the wt-timeval and redo the select.
 ! !
 !UnixOperatingSystem class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.37 1998-08-20 00:48:28 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.38 1998-08-25 13:43:22 cg Exp $'
 ! !
 UnixOperatingSystem initialize!

changeset 3780	7d735472f937
parent 3773	54dd6a5fd72a
child 3793	aff27e755ffd