Changeset 11598 in vbox for trunk/src/libs

Timestamp:

Aug 23, 2008 11:39:13 PM (16 years ago)

Author:

vboxsync

Message:

NSPR: Change the pthread code to use IPRT for threads (TODO: ditto for OS/2). Call RTR3Init from nspr the initialization. (Both changes enclosed in VBOX_USE_IPRT_IN_NSPR.)

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (4 diffs)
• nsprpub/pr/src/misc/prinit.c (modified) (2 diffs)
• nsprpub/pr/src/pthreads/ptthread.c (modified) (15 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -78 +78 @@
 TEMPLATE_XPCOM_DEFS                = MOZILLA_CLIENT=1 NDEBUG=1 _IMPL_NS_COM \
                                      XPCOM_DLL_BASE=\"$(basename $(notdir $(LIB_XPCOM)))\" \
-                                     MOZ_DLL_SUFFIX=\"$(suffix $(LIB_XPCOM))\"
+                                     MOZ_DLL_SUFFIX=\"$(suffix $(LIB_XPCOM))\" \
+                                     IN_RING3
 ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
 TEMPLATE_XPCOM_DEFS                               += VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
@@ -667 +668 @@
         HAVE_STRERROR=1 \
         FORCE_PR_LOG
+VBox-xpcom-nspr_DEFS      += \
+        VBOX_USE_IPRT_IN_NSPR 
 VBox-xpcom-nspr_DEFS.darwin = \
         HAVE_BSD_FLOCK=1 \
@@ -1193 +1196 @@
 
 ifdef IPC_LOGGING
- TEMPLATE_XPCOMIPC_DEFS           += IN_RING3 IPC_LOGGING
+ TEMPLATE_XPCOMIPC_DEFS           += IPC_LOGGING
  TEMPLATE_XPCOMIPC_LIBS            = $(TEMPLATE_XPCOM_LIBS) $(LIB_RUNTIME)
 endif
@@ -1203 +1206 @@
 TEMPLATE_XPCOMIPCEXE_DEFS          = $(TEMPLATE_XPCOMEXE_DEFS) BUILD_DCONNECT="1"
 ifdef IPC_LOGGING
- TEMPLATE_XPCOMIPCEXE_DEFS        += IN_RING3 IPC_LOGGING
+ TEMPLATE_XPCOMIPCEXE_DEFS        += IPC_LOGGING
  TEMPLATE_XPCOMIPCEXE_LIBS         = $(TEMPLATE_XPCOMEXE_LIBS) $(LIB_RUNTIME)
 endif

trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prinit.c

@@ -39 +39 @@
 #include <ctype.h>
 #include <string.h>
+#ifdef VBOX_USE_IPRT_IN_NSPR
+# include <iprt/initterm.h>
+#endif 
 
 PRLogModuleInfo *_pr_clock_lm;
@@ -173 +176 @@
     if (_pr_initialized) return;
     _pr_initialized = PR_TRUE;
+#ifdef VBOX_USE_IPRT_IN_NSPR
+    RTR3Init(false /* fInitSUPLib */, 0 /* cbReserve */);
+#endif 
 #ifdef _PR_ZONE_ALLOCATOR
     _PR_InitZones();

trunk/src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptthread.c

@@ -53 +53 @@
 #include <signal.h>
 
+#ifdef VBOX_USE_IPRT_IN_NSPR
+# include <iprt/thread.h>
+# include <iprt/mem.h>
+# include <iprt/asm.h>
+# include <iprt/err.h>
+#endif /* VBOX_USE_IPRT_IN_NSPR */
+
 /*
  * Record whether or not we have the privilege to set the scheduling
@@ -258 +265 @@
 }  /* _pt_root */
 
+#ifdef VBOX_USE_IPRT_IN_NSPR
+static DECLCALLBACK(int) _pt_iprt_root(
+    RTTHREAD Thread, void *pvUser)
+{
+    PRThread *thred = (PRThread *)pvUser;
+    _pt_root(thred);
+    return VINF_SUCCESS;
+}
+#endif /* VBOX_USE_IPRT_IN_NSPR */
+
 static PRThread* pt_AttachThread(void)
 {
@@ -305 +322 @@
     int rv;
     PRThread *thred;
+#ifndef VBOX_USE_IPRT_IN_NSPR
     pthread_attr_t tattr;
+#else
+    static uint32_t volatile s_iThread = 0;
+    RTTHREADTYPE enmType;
+    RTTHREAD hThread;
+    uint32_t fFlags = 0;
+#endif
 
     if (!_pr_initialized) _PR_ImplicitInitialization();
@@ -314 +338 @@
         priority = PR_PRIORITY_LAST;
 
+#ifndef VBOX_USE_IPRT_IN_NSPR
     rv = _PT_PTHREAD_ATTR_INIT(&tattr);
     PR_ASSERT(0 == rv);
@@ -345 +370 @@
 #endif /* !defined(_PR_DCETHREADS) */
     }
-
+#else  /* VBOX_USE_IPRT_IN_NSPR */
+    /* calc priority */
+    switch (priority)
+    {
+        default:
+        case PR_PRIORITY_NORMAL:    enmType = RTTHREADTYPE_DEFAULT; break;
+        case PR_PRIORITY_LOW:       enmType = RTTHREADTYPE_MAIN_HEAVY_WORKER; break;
+        case PR_PRIORITY_HIGH:      enmType = RTTHREADTYPE_MAIN_WORKER; break;
+        case PR_PRIORITY_URGENT:    enmType = RTTHREADTYPE_IO; break;
+    }
+#endif /* VBOX_USE_IPRT_IN_NSPR */
+
+#ifndef VBOX_USE_IPRT_IN_NSPR
     /*
      * DCE threads can't set detach state before creating the thread.
@@ -356 +393 @@
     PR_ASSERT(0 == rv);
 #endif /* !defined(_PR_DCETHREADS) */
+#else
+    if (state == PR_JOINABLE_THREAD)
+        fFlags |= RTTHREADFLAGS_WAITABLE;
+#endif /* !VBOX_USE_IPRT_IN_NSPR */
 
     if (0 == stackSize) stackSize = (64 * 1024);  /* default == 64K */
@@ -361 +402 @@
     if (stackSize < _MD_MINIMUM_STACK_SIZE) stackSize = _MD_MINIMUM_STACK_SIZE;
 #endif
+#ifndef VBOX_USE_IPRT_IN_NSPR
     /*
      * Linux doesn't have pthread_attr_setstacksize.
@@ -368 +410 @@
     PR_ASSERT(0 == rv);
 #endif
+#endif /* !VBOX_USE_IPRT_IN_NSPR */
 
     thred = PR_NEWZAP(PRThread);
@@ -388 +431 @@
                 scope = PR_GLOBAL_THREAD;
                         
+#ifndef VBOX_USE_IPRT_IN_NSPR
         if (PR_GLOBAL_BOUND_THREAD == scope) {
 #if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
@@ -404 +448 @@
 #endif
                 }
+#endif /* !VBOX_USE_IPRT_IN_NSPR */
         if (PR_GLOBAL_THREAD == scope)
             thred->state |= PT_THREAD_GLOBAL;
@@ -443 +488 @@
          * pthread_create() may be doing to its argument.
          */
+#ifndef VBOX_USE_IPRT_IN_NSPR
         rv = _PT_PTHREAD_CREATE(&id, tattr, _pt_root, thred);
 
@@ -472 +518 @@
         }
 #endif
+#else  /* VBOX_USE_IPRT_IN_NSPR */
+                rv = RTThreadCreateF(&hThread, _pt_iprt_root, thred, stackSize, enmType, fFlags, "nspr-%u", ASMAtomicIncU32(&s_iThread));
+                if (RT_SUCCESS(rv)) {
+                        id = (pthread_t)RTThreadGetNative(hThread);
+            rv = 0;
+        } 
+#endif /* VBOX_USE_IPRT_IN_NSPR */
 
         if (0 != rv)
@@ -515 +568 @@
 
 done:
+#ifndef VBOX_USE_IPRT_IN_NSPR
     rv = _PT_PTHREAD_ATTR_DESTROY(&tattr);
     PR_ASSERT(0 == rv);
+#endif
 
     return thred;
@@ -578 +633 @@
     else
     {
+#ifndef VBOX_USE_IPRT_IN_NSPR
         pthread_t id = thred->id;
         rv = pthread_join(id, &result);
@@ -607 +663 @@
             PR_SetError(prerror, rv);
         }
+#else  /* VBOX_USE_IPRT_IN_NSPR */
+        rv = VERR_INVALID_HANDLE;
+        RTTHREAD hThread = RTThreadFromNative((RTNATIVETHREAD)thred->id);
+        if (hThread != NIL_RTTHREAD)
+        {
+            int rcThread = 0;
+            rv = RTThreadWait(hThread, RT_INDEFINITE_WAIT, &rcThread);
+            PR_ASSERT(RT_SUCCESS(rv) && rcThread == VINF_SUCCESS);
+            if (RT_SUCCESS(rv))
+            {
+                rv = 0;
+                _pt_thread_death(thred);
+            }
+            else
+                PR_SetError(rv == VERR_THREAD_NOT_WAITABLE 
+                            ? PR_INVALID_ARGUMENT_ERROR 
+                            : PR_UNKNOWN_ERROR, 
+                            rv);
+        }
+#endif /* VBOX_USE_IPRT_IN_NSPR */
     }
     return (0 == rv) ? PR_SUCCESS : PR_FAILURE;