Changeset 537 in vbox for trunk/src/VBox/Runtime/r3/posix

Timestamp:

Feb 2, 2007 6:08:57 AM (18 years ago)

Author:

vboxsync

Message:

Make runtime build on FreeBSD.

Location:

trunk/src/VBox/Runtime/r3/posix

Files:

• path-posix.cpp (modified) (1 diff)
• process-posix.cpp (modified) (2 diffs)
• system-posix.cpp (modified) (2 diffs)
• thread-posix.cpp (modified) (1 diff)
• timer-posix.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/posix/path-posix.cpp

@@ -332 +332 @@
          */
 /** @todo use RTProcGetExecutableName() */
-#ifdef __LINUX__
+#if defined(__LINUX__) || defined(__FREEBSD__)
+# ifdef __LINUX__
         int cchLink = readlink("/proc/self/exe", &g_szrtProgramPath[0], sizeof(g_szrtProgramPath) - 1);
+# else
+        int cchLink = readlink("/proc/curproc/file", &g_szrtProgramPath[0], sizeof(g_szrtProgramPath) - 1);
+# endif         
         if (cchLink < 0 || cchLink == sizeof(g_szrtProgramPath) - 1)
         {

trunk/src/VBox/Runtime/r3/posix/process-posix.cpp

@@ -31 +31 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <signal.h>
 #if defined(__LINUX__) || defined(__OS2__)
 # define HAVE_POSIX_SPAWN 1
@@ -235 +236 @@
      * because I'm lazy I'm not creating OS specific code
      * files and code for this.
-    */
-#ifdef __LINUX__
+     */
+#if defined(__LINUX__) || defined(__FREEBSD__)
+# ifdef __LINUX__
     int cchLink = readlink("/proc/self/exe", pszExecName, cchExecName - 1);
+# else    
+    int cchLink = readlink("/proc/curproc/file", pszExecName, cchExecName - 1);
+# endif    
     if (cchLink > 0 && (size_t)cchLink <= cchExecName - 1)
     {

trunk/src/VBox/Runtime/r3/posix/system-posix.cpp

@@ -38 +38 @@
 RTR3DECL(unsigned) RTSystemProcessorGetCount(void)
 {
+    int cCpus; NOREF(cCpus);
+    
     /*
      * The sysconf way (linux and others).
      */
 #ifdef _SC_NPROCESSORS_ONLN
-    int cCpus = sysconf(_SC_NPROCESSORS_ONLN);
+    cCpus = sysconf(_SC_NPROCESSORS_ONLN);
     if (cCpus >= 1)
         return cCpus;
@@ -54 +56 @@
     aiMib[0] = CTL_HW;
     aiMib[1] = HW_NCPU;
-    int cCpus = -1;
+    cCpus = -1;
     size_t cb = sizeof(cCpus);
     int rc = sysctl(aiMib, ELEMENTS(aiMib), &cCpus, &cb, NULL, 0);

trunk/src/VBox/Runtime/r3/posix/thread-posix.cpp

@@ -200 +200 @@
     if (!cMillies)
     {
+        /* pthread_yield() isn't part of SuS, thus this fun. */
 #ifdef __DARWIN__
         pthread_yield_np();
+#elif defined(__FREEBSD__) /* void pthread_yield */
+        pthread_yield();
 #else
         if (!pthread_yield())

trunk/src/VBox/Runtime/r3/posix/timer-posix.cpp

@@ -38 +38 @@
 #include <sys/ioctl.h>
 #ifdef __LINUX__
-#include <linux/rtc.h>
+# include <linux/rtc.h>
 #endif
 #include <sys/time.h>
@@ -44 +44 @@
 #include <errno.h>
 #ifndef __OS2__
-#include <pthread.h>
+# include <pthread.h>
 #endif
 
@@ -224 +224 @@
      * Block SIGALRM from calling thread.
      */
+#if defined(__FREEBSD__) /* sighold is missing and I don't wish to break anything atm. */
+    sigset_t SigSet;
+    sigemptyset(&SigSet);
+    sigaddset(&SigSet, SIGALRM);
+    sigprocmask(SIG_BLOCK, &SigSet, NULL);
+#else     
     sighold(SIGALRM);
+#endif    
     static bool fDoneRTC;
     if (!fDoneRTC)