Changeset 30503 in vbox

Timestamp:

Jun 29, 2010 1:44:57 PM (15 years ago)

Author:

vboxsync

Message:

webservice: introduce global lock for converting method parameters

Location:

trunk/src/VBox/Main/webservice

Files:

• vboxweb.cpp (modified) (1 diff)
• vboxweb.h (modified) (1 diff)
• websrv-cpp.xsl (modified) (3 diffs)

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

@@ -131 +131 @@
 typedef std::map<RTTHREAD, com::Utf8Str> ThreadsMap;
 ThreadsMap          g_mapThreads;
+
+// this mutex is held while methodmaps.cpp converts parameters
+util::WriteLockHandle  *g_pParamsLockHandle;
 
 /****************************************************************************

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

@@ -52 +52 @@
 extern util::WriteLockHandle  *g_pAuthLibLockHandle;
 extern util::WriteLockHandle  *g_pSessionsLockHandle;
+extern util::WriteLockHandle  *g_pParamsLockHandle;
 
 /****************************************************************************

trunk/src/VBox/Main/webservice/websrv-cpp.xsl

@@ -455 +455 @@
 <xsl:template name="emitPrologue">
   <xsl:text>    WEBDEBUG((g_pcszEntering, __FUNCTION__));
+
+    util::AutoWriteLock paramsLock(*g_pParamsLockHandle  COMMA_LOCKVAL_SRC_POS);
 
     do {</xsl:text>
@@ -752 +754 @@
   </xsl:variable>
 
+  <xsl:call-template name="emitNewlineIndent8" />
+  <xsl:text>paramsLock.release();</xsl:text>
   <xsl:call-template name="emitNewlineIndent8" />
   <xsl:value-of select="concat('WEBDEBUG((g_pcszCallingComMethod, &quot;', $comMethodName, '&quot;));')" />
@@ -822 +826 @@
   <xsl:call-template name="emitNewlineIndent8" />
   <xsl:text>WEBDEBUG((g_pcszDoneCallingComMethod));</xsl:text>
+  <xsl:call-template name="emitNewlineIndent8" />
+  <xsl:text>paramsLock.acquire();</xsl:text>
   <xsl:call-template name="emitNewline" />
 </xsl:template>