Changeset 26447 in vbox

Timestamp:

Feb 11, 2010 5:05:19 PM (15 years ago)

Author:

vboxsync

Message:

Webservice: add #ifdef'd broken COM event queue processing

File:

• trunk/src/VBox/Main/webservice/vboxweb.cpp (modified) (7 diffs)

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -60 +60 @@
 // include generated namespaces table
 #include "vboxwebsrv.nsmap"
+
+// If this is defined, then thread 1 ONLY performs COM event queue processing
+// (using RT_INDEFINITE_WAIT to wait for events), and the SOAP queue is processed
+// on a separate thread. This appears to be broken
+// as soon as more than one client fires SOAP events at the webservices.
+// If this is NOT defined, then COM events are only serviced after SOAP event
+// processing has completed, and both occur on thread 1.
+
+// #define TEMP_USE_BROKEN_XPCOM_EVENTQUEUE_PROCESSING
 
 /****************************************************************************
@@ -526 +535 @@
         g_pSoapQ = new SoapQ(&soap);
 
-        // start the SOAP processing thread
-
         for (uint64_t i = 1;
              ;
@@ -545 +552 @@
             WebLog("Request %llu on socket %d queued for processing (%d items on Q)\n", i, s, cItemsOnQ);
 
+#ifndef TEMP_USE_BROKEN_XPCOM_EVENTQUEUE_PROCESSING
             // process the COM event Q
             int vrc = com::EventQueue::getMainEventQueue()->processEventQueue(0);
+#endif
         }
     }
@@ -552 +561 @@
 }
 
+#ifdef TEMP_USE_BROKEN_XPCOM_EVENTQUEUE_PROCESSING
 /**
  * Thread function for the "queue pumper" thread started from main(). This implements
@@ -557 +567 @@
  * SOAP queue worker threads.
  */
-// int fntQPumper(RTTHREAD ThreadSelf, void *pvUser)
-// {
-//     // store a log prefix for this thread
-//     g_mapThreads[RTThreadSelf()] = "[ P ]";
-//
-//     doQueuesLoop();
-//
-//     return 0;
-// }
+int fntQPumper(RTTHREAD ThreadSelf, void *pvUser)
+{
+    // store a log prefix for this thread
+    g_mapThreads[RTThreadSelf()] = "[ P ]";
+
+    doQueuesLoop();
+
+    return 0;
+}
+#endif
 
 /**
@@ -720 +731 @@
     g_pSessionsLockHandle = new util::RWLockHandle(util::LOCKCLASS_OBJECTSTATE);
 
+#ifdef TEMP_USE_BROKEN_XPCOM_EVENTQUEUE_PROCESSING
     // SOAP queue pumper thread
-//     RTTHREAD  tQPumper;
-//     if (RTThreadCreate(&tQPumper,
-//                        fntQPumper,
-//                        NULL,        // pvUser
-//                        0,           // cbStack (default)
-//                        RTTHREADTYPE_MAIN_WORKER,
-//                        0,           // flags
-//                        "SoapQPumper"))
-//     {
-//         RTStrmPrintf(g_pStdErr, "[!] Cannot start SOAP queue pumper thread\n");
-//         exit(1);
-//     }
+    RTTHREAD  tQPumper;
+    if (RTThreadCreate(&tQPumper,
+                       fntQPumper,
+                       NULL,        // pvUser
+                       0,           // cbStack (default)
+                       RTTHREADTYPE_MAIN_WORKER,
+                       0,           // flags
+                       "SoapQPumper"))
+    {
+        RTStrmPrintf(g_pStdErr, "[!] Cannot start SOAP queue pumper thread\n");
+        exit(1);
+    }
+#endif
 
     // watchdog thread
@@ -752 +765 @@
     }
 
+#ifdef TEMP_USE_BROKEN_XPCOM_EVENTQUEUE_PROCESSING
+    com::EventQueue *pQ = com::EventQueue::getMainEventQueue();
+    while (1)
+    {
+        // we have to process main event queue
+        WebLog("Pumping COM event queue\n");
+        int vrc = pQ->processEventQueue(RT_INDEFINITE_WAIT);
+        if (FAILED(vrc))
+            com::GluePrintRCMessage(vrc);
+    }
+#else
     doQueuesLoop();
-
-//     while (1)
-//     {
-//         // we have to process main event queue
-//         WebLog("Pumping COM event queue\n");
-//         int vrc = com::EventQueue::getMainEventQueue()->processEventQueue(RT_INDEFINITE_WAIT);
-//     }
+#endif
 
     com::Shutdown();