Changeset 26450 in vbox for trunk/src/VBox/Main

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

57597

Message:

Webservice: enable separate SOAP queue thread; fix logging

File:

• trunk/src/VBox/Main/webservice/vboxweb.cpp (modified) (8 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
 
 /****************************************************************************
@@ -429 +420 @@
 
         WebLog("Processing connection from IP=%lu.%lu.%lu.%lu socket=%d (%d out of %d threads idle)\n",
-               m_u,
                (m_soap->ip >> 24) & 0xFF,
                (m_soap->ip >> 16) & 0xFF,
@@ -551 +541 @@
             size_t cItemsOnQ = g_pSoapQ->add(s);
             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
         }
     }
@@ -561 +546 @@
 }
 
-#ifdef TEMP_USE_BROKEN_XPCOM_EVENTQUEUE_PROCESSING
 /**
  * Thread function for the "queue pumper" thread started from main(). This implements
@@ -576 +560 @@
     return 0;
 }
-#endif
 
 /**
@@ -731 +714 @@
     g_pSessionsLockHandle = new util::RWLockHandle(util::LOCKCLASS_OBJECTSTATE);
 
-#ifdef TEMP_USE_BROKEN_XPCOM_EVENTQUEUE_PROCESSING
     // SOAP queue pumper thread
     RTTHREAD  tQPumper;
@@ -745 +727 @@
         exit(1);
     }
-#endif
 
     // watchdog thread
@@ -765 +746 @@
     }
 
-#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");
+        WEBDEBUG(("Pumping COM event queue\n"));
         int vrc = pQ->processEventQueue(RT_INDEFINITE_WAIT);
         if (FAILED(vrc))
             com::GluePrintRCMessage(vrc);
     }
-#else
-    doQueuesLoop();
-#endif
 
     com::Shutdown();