2004-05-17 Frank Ch. Eigler <fche@redhat.com>

[pf3gnuchains/gcc-fork.git] / libjava / posix.cc

diff --git a/libjava/posix.cc b/libjava/posix.cc
index 66443d2..73c0f5f 100644 (file)
--- a/libjava/posix.cc
+++ b/libjava/posix.cc
@@ -12,39 +12,57 @@ details.  */
 
 #include "posix.h"
 
+#include <stdlib.h>
 #include <errno.h>
 #include <signal.h>
+#include <stdio.h>
 
 #include <jvm.h>
 #include <java/lang/Thread.h>
 #include <java/io/InterruptedIOException.h>
+#include <java/util/Properties.h>
 
 #if defined (ECOS)
 extern "C" unsigned long long _clock (void);
 #endif
 
+#if defined(HAVE_PROC_SELF_EXE)
+static char exec_name[20];
+  // initialized in _Jv_platform_initialize()
+#endif
+
+const char *_Jv_ThisExecutable (void)
+{
+#if defined(DISABLE_MAIN_ARGS)
+  return "[Embedded App]";
+#elif defined(HAVE_PROC_SELF_EXE)
+  return exec_name;
+    // initialized in _Jv_platform_initialize()
+#else
+  return _Jv_GetSafeArg (0);
+#endif
+}
+
 // gettimeofday implementation.
-void
-_Jv_platform_gettimeofday (struct timeval *tv)
+jlong
+_Jv_platform_gettimeofday ()
 {
 #if defined (HAVE_GETTIMEOFDAY)
-  gettimeofday (tv, NULL);
+  timeval tv;
+  gettimeofday (&tv, NULL);
+  return (tv.tv_sec * 1000LL) + (tv.tv_usec / 1000LL);
 #elif defined (HAVE_TIME)
-  tv->tv_sec = time (NULL);
-  tv->tv_usec = 0;
+  return time (NULL) * 1000LL;
 #elif defined (HAVE_FTIME)
   struct timeb t;
   ftime (&t);
-  tv->tv_sec = t.time;
-  tv->tv_usec = t.millitm * 1000;
+  return (t.time * 1000LL) + t.millitm;
 #elif defined (ECOS)
   // FIXME.
-  tv->tv_sec = _clock () / 1000;
-  tv->tv_usec = 0;
+  return _clock();
 #else
   // In the absence of any function, time remains forever fixed.
-  tv->tv_sec = 23;
-  tv->tv_usec = 0;
+  return 23000;
 #endif
 }
 
@@ -62,6 +80,40 @@ _Jv_platform_initialize (void)
 #else
   signal (SIGPIPE, SIG_IGN);
 #endif
+
+#if defined (HAVE_PROC_SELF_EXE)
+  // Compute our executable name
+  sprintf (exec_name, "/proc/%d/exe", getpid ());
+#endif
+}
+
+// Set platform-specific System properties.
+void
+_Jv_platform_initProperties (java::util::Properties* newprops)
+{
+  // A convenience define.
+#define SET(Prop,Val) \
+  newprops->put(JvNewStringLatin1 (Prop), JvNewStringLatin1 (Val))
+
+  SET ("file.separator", "/");
+  SET ("path.separator", ":");
+  SET ("line.separator", "\n");
+  char *tmpdir = ::getenv("TMPDIR");
+  if (! tmpdir)
+    tmpdir = "/tmp";
+  SET ("java.io.tmpdir", tmpdir);
+}
+
+static inline void
+internal_gettimeofday (struct timeval *result)
+{
+#if defined (HAVE_GETTIMEOFDAY)
+  gettimeofday (result, NULL);
+#else
+  jlong val = _Jv_platform_gettimeofday ();
+  result->tv_sec = val / 1000;
+  result->tv_usec = (val % 1000) * 1000;
+#endif /* HAVE_GETTIMEOFDAY */
 }
 
 // A wrapper for select() which ignores EINTR.
@@ -74,7 +126,7 @@ _Jv_select (int n, fd_set *readfds, fd_set  *writefds,
   struct timeval end, delay;
   if (timeout)
     {
-      _Jv_platform_gettimeofday (&end);
+      internal_gettimeofday (&end);
       end.tv_usec += timeout->tv_usec;
       if (end.tv_usec >= 1000000)
        {
@@ -104,7 +156,7 @@ _Jv_select (int n, fd_set *readfds, fd_set  *writefds,
       struct timeval after;
       if (timeout)
        {
-         _Jv_platform_gettimeofday (&after);
+         internal_gettimeofday (&after);
          // Now compute new timeout argument.
          delay.tv_usec = end.tv_usec - after.tv_usec;
          delay.tv_sec = end.tv_sec - after.tv_sec;