hg/stx-libbasic: comparison UnixOperatingSystem.st

equal deleted inserted replaced

-:8c839dd755f4
+:a6bb05f48a1d
 #ifdef HAS_OPENDIR
 if (__isExternalAddressLike(dirPointer)) {
 	closedir( (DIR *)(__FILEVal(dirPointer)) );
 }
 #endif
-%}
+%}.
+self primitiveFailed
 !
 nextLinkInfoFrom:aDirectoryStream dirPointer:dirPointer
 "return a FileStatusInfo entry for the next entry, when reading from a directory.
 Under UNIX, the returned fileStatuInfo ONLY contains the name of the file,
 many, many internal calls."
 %{  /* NOCONTEXT */
 RETURN ( __mkSmallInteger(errno) );
-%}
+%}.
+^ 0
 "
 OperatingSystem currentErrorNumber
 "
 !
 RETURN ( __MKUINT(pid) );
 %}.
 "/
 "/ not supported by OS
 "/
 ^ UnsupportedOperationSignal raise
 "
 |id|
 sync
 "sync all the filesystems"
 %{
 sync();
+RETURN (self);
 %}.
+^ self primitiveFailed
 !
 syncFileSystem:handle
 "sync the filesystem where the file represented by handle resides"
 "fallback is to do a global sync"
 self sync.
 "
-	'/etc/passwd' asFilename readStream syncFileSystem
+'/etc/passwd' asFilename readStream syncFileSystem
 "
 !
 truncateFile:aPathName to:newSize
 "change a files size return true on success, false on failure.
 caseSensitiveFilenames
 "return true, if the OS has caseSensitive file naming.
 On MSDOS, this will return false;
 on a real OS, we return true."
+"/ actually, this is wrong and may depend on the mounted volume;
+"/ so we need a query for a particular directory (and/or volume).
 ^ true
 "Modified: / 5.6.1998 / 18:35:18 / cg"
 !
 clock resolution value."
 |seconds micros error|
 %{
+#ifdef __SCHTEAM__
+{
+	long nanos = System.nanoTime();
+	return context._RETURN( STInteger._new(nanos / 1000) );
+}
+/* NOTREACHED */
+#else
 unsigned long _secs, _micros;
-#if defined(_POSIX_MONOTONIC_CLOCK) && defined(CLOCK_MONOTONIC) && !defined(NO_CLOCK_GETTIME)
+# if defined(_POSIX_MONOTONIC_CLOCK) && defined(CLOCK_MONOTONIC) && !defined(NO_CLOCK_GETTIME)
 struct timespec ts;
 static int has_clock_gettime = 1;
 if (has_clock_gettime) {
 	if (clock_gettime(CLOCK_MONOTONIC, &ts) != -1) {
 	     * fall through to alternative implementation
 	     */
 	    has_clock_gettime = 0;
 	}
 }
-#endif
+# endif
-#if defined(HAS_GETTIMEOFDAY)
+# if defined(HAS_GETTIMEOFDAY)
 struct timeval tb;
 gettimeofday(&tb, NULL /* &tzb */);
 if (tb.tv_usec >= (1000000)) {
 	error = @symbol(bad);
 	goto err;
 }
 _secs = tb.tv_sec;
 _micros  = tb.tv_usec;
-#endif
+# endif
 out:
-#if __POINTER_SIZE__ == 8
+# if __POINTER_SIZE__ == 8
 {
 	unsigned INT rslt;
 	rslt = (unsigned INT)_secs * 1000000 + _micros;
 	RETURN (__MKUINT(rslt));
 }
-#else
+# else
-# ifdef HAS_LONGLONG
+#  ifdef HAS_LONGLONG
 {
 	unsigned long long rslt;
 	rslt = (unsigned long long)_secs * 1000000 + _micros;
 	RETURN (__MKLARGEINT64(1, (unsigned INT)(rslt & 0xFFFFFFFF), (unsigned INT)(rslt >> 32)));
 }
-# else
+#  else
 seconds = __MKUINT(_secs);
 micros = __MKUINT(_micros);
-# endif /* long long */
+#  endif /* long long */
-#endif /* __POINTER_SIZE__ == 8 */
+# endif /* __POINTER_SIZE__ == 8 */
 err:;
+#endif /* not SCHTEAM */
 %}.
 seconds notNil ifTrue:[
 	^ (seconds * 1000000) + micros
 ].
 Don't use this method in application code since it is an internal (private)
 interface. For compatibility with ST-80, use Time millisecondClockValue.
 "
 %{  /* NOCONTEXT */
+#ifdef __SCHTEAM__
+{
+	long millis = System.currentTimeMillis();
+	return context._RETURN( STInteger._new(millis) );
+}
+/* NOTREACHED */
+#else
 unsigned long t = 0;
-#if defined(_POSIX_MONOTONIC_CLOCK) && defined(CLOCK_MONOTONIC) && !defined(NO_CLOCK_GETTIME)
+# if defined(_POSIX_MONOTONIC_CLOCK) && defined(CLOCK_MONOTONIC) && !defined(NO_CLOCK_GETTIME)
 static has_clock_gettime = 1;
 struct timespec ts;
 if (has_clock_gettime) {
 	if (clock_gettime(CLOCK_MONOTONIC, &ts) != -1) {
 	     * fall through to alternative implementation
 	     */
 	    has_clock_gettime = 0;
 	}
 }
-#endif /*  _POSIX_MONOTONIC_CLOCK */
+# endif /*  _POSIX_MONOTONIC_CLOCK */
-#if defined(_SC_CLK_TCK)
+# if defined(_SC_CLK_TCK)
 /*
 * We prefer times here, since it is monotonic and immune to clock changes
 * but: it has less precision!
 */
-# include <sys/times.h>
+#  include <sys/times.h>
 static int millisecondsPerTick;
 clock_t ticks;
 struct tms tb;
 if (ticks == -1)
 	goto err;
 t = ticks * millisecondsPerTick;
-#else /* !times */
+# else /* !times */
 /* assume HAS_GETTIMEOFDAY
 * - will result in a linkage error if not fixed.
 */
 struct timeval tb;
 gettimeofday(&tb, NULL);
 t = tb.tv_sec*1000 + tb.tv_usec/1000;
-#endif
+# endif
 out:
 RETURN ( __mkSmallInteger(t & 0x1FFFFFFF) );
 err:;
+#endif /* not SCHTEAM */
 %}.
 self primitiveFailed
 "
 |seconds millis|
 %{
+#ifdef __SCHTEAM__
+{
+	long millisSince1970 = java.lang.System.currentTimeMillis();
+	return context._RETURN( STInteger._new(millisSince1970));
+}
+/* NOTREACHED */
+#else
 unsigned long _secs, _millis;
+# if !defined(HAS_GETTIMEOFDAY)
-#if !defined(HAS_GETTIMEOFDAY)
+#  if defined(HAS_FTIME)
-# if defined(HAS_FTIME)
 {
 	struct timeb timebuffer;
 	ftime(&timebuffer);
 	_secs = timebuffer.time;
 	_millis = timebuffer.millitm;
 }
-#   define HAVE_TIME
+#    define HAVE_TIME
-# endif /* HAS_FTIME */
+#  endif /* HAS_FTIME */
-#endif /* no HAS_GETTIMEOFDAY */
+# endif /* no HAS_GETTIMEOFDAY */
-#ifndef HAVE_TIME
+# ifndef HAVE_TIME
 /*
 * use HAS_GETTIMEOFDAY even if HAS_GETTIMEOFDAY is undefined here.
 * Will result in a linkage error if not fixed and neither ftime() nor time() is used.
 */
 	gettimeofday(&tb, NULL /* &tzb */);
 	_secs = tb.tv_sec;
 	_millis = tb.tv_usec / 1000;
 }
-#endif
+# endif
-#if __POINTER_SIZE__ == 8
+# if __POINTER_SIZE__ == 8
 {
 	unsigned INT rslt;
 	rslt = (unsigned INT)_secs * 1000 + _millis;
 	RETURN (__MKUINT(rslt));
 }
-#else
+# else
-# ifdef HAS_LONGLONG
+#  ifdef HAS_LONGLONG
 {
 	unsigned long long rslt;
 	rslt = (unsigned long long)_secs * 1000 + _millis;
 	RETURN (__MKLARGEINT64(1, (unsigned INT)(rslt & 0xFFFFFFFF), (unsigned INT)(rslt >> 32)));
 }
-# else
+#  else
 seconds = __MKUINT(_secs);
 millis = __MKUINT(_millis);
-# endif /* long long */
+#  endif /* long long */
-#endif /* __POINTER_SIZE__ == 8 */
+# endif /* __POINTER_SIZE__ == 8 */
+#endif /* SCHTEAM */
 %}.
 seconds notNil ifTrue:[
 	^ (seconds * 1000) + millis
 ].
 self primitiveFailed.
 ! !
 !UnixOperatingSystem class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.436 2015-04-21 19:41:36 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.437 2015-04-24 08:17:57 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.436 2015-04-21 19:41:36 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.437 2015-04-24 08:17:57 cg Exp $'
 ! !
 UnixOperatingSystem initialize!
 UnixOperatingSystem::ELFConstants initialize!

changeset 18278	a6bb05f48a1d
parent 18256	70138be99d04
child 18285	7aab8c3dab19
child 18314	903fcedc61fe