[mapguide-commits] r4308 - trunk/MgDev/Server/src/Common/Base

[svn_mapguide at osgeo.org]

Author: brucedechant
Date: 2009-10-19 18:26:35 -0400 (Mon, 19 Oct 2009)
New Revision: 4308

Modified:
   trunk/MgDev/Server/src/Common/Base/ServiceOperation.cpp
   trunk/MgDev/Server/src/Common/Base/ServiceOperation.h
Log:
Fix for trac ticket 1110 - Stability improvements
http://trac.osgeo.org/mapguide/ticket/1110

Notes:
- Update mutex usage


Modified: trunk/MgDev/Server/src/Common/Base/ServiceOperation.cpp
===================================================================
--- trunk/MgDev/Server/src/Common/Base/ServiceOperation.cpp	2009-10-19 17:40:26 UTC (rev 4307)
+++ trunk/MgDev/Server/src/Common/Base/ServiceOperation.cpp	2009-10-19 22:26:35 UTC (rev 4308)
@@ -153,7 +153,6 @@
 void MgServiceOperation::Initialize(MgStreamData* data,
     const MgOperationPacket& packet)
 {
-    ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("  (%t) MgServiceOperation::Init()\n" )));
     ACE_ASSERT(NULL != data);
 
@@ -211,7 +210,6 @@
 ///
 bool MgServiceOperation::HandleException(MgException* except)
 {
-    ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
     ACE_ASSERT(!m_opCompleted);
 
     MG_TRY()
@@ -273,7 +271,6 @@
 
 void MgServiceOperation::EndExecution()
 {
-    ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("  (%t) MgServiceOperation::EndExecution()\n" )));
     ACE_ASSERT(m_argsRead && !m_opCompleted && m_stream != NULL && NULL != m_currConnection);
 
@@ -283,6 +280,7 @@
     ACE_ASSERT(NULL != serverStreamData);
     Ptr<MgClientHandler> clientHandler = serverStreamData->GetClientHandler();
     ACE_ASSERT(NULL != clientHandler.p);
+    ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, clientHandler.p->m_mutex));
 
     MgService* service = GetService();
     assert(NULL != service);
@@ -317,7 +315,6 @@
 
 void MgServiceOperation::EndExecution(bool value)
 {
-    ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("  (%t) MgServiceOperation::EndExecution()\n" )));
     ACE_ASSERT(m_argsRead && !m_opCompleted && m_stream != NULL && NULL != m_currConnection);
 
@@ -327,6 +324,7 @@
     ACE_ASSERT(NULL != serverStreamData);
     Ptr<MgClientHandler> clientHandler = serverStreamData->GetClientHandler();
     ACE_ASSERT(NULL != clientHandler.p);
+    ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, clientHandler.p->m_mutex));
 
     MgService* service = GetService();
     assert(NULL != service);
@@ -363,7 +361,6 @@
 
 void MgServiceOperation::EndExecution(INT32 value)
 {
-    ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("  (%t) MgServiceOperation::EndExecution()\n" )));
     ACE_ASSERT(m_argsRead && !m_opCompleted && m_stream != NULL && NULL != m_currConnection);
 
@@ -373,6 +370,7 @@
     ACE_ASSERT(NULL != serverStreamData);
     Ptr<MgClientHandler> clientHandler = serverStreamData->GetClientHandler();
     ACE_ASSERT(NULL != clientHandler.p);
+    ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, clientHandler.p->m_mutex));
 
     MgService* service = GetService();
     assert(NULL != service);
@@ -409,7 +407,6 @@
 
 void MgServiceOperation::EndExecution(INT64 value)
 {
-    ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("  (%t) MgServiceOperation::EndExecution()\n" )));
     ACE_ASSERT(m_argsRead && !m_opCompleted && m_stream != NULL && NULL != m_currConnection);
 
@@ -419,6 +416,7 @@
     ACE_ASSERT(NULL != serverStreamData);
     Ptr<MgClientHandler> clientHandler = serverStreamData->GetClientHandler();
     ACE_ASSERT(NULL != clientHandler.p);
+    ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, clientHandler.p->m_mutex));
 
     MgService* service = GetService();
     assert(NULL != service);
@@ -455,7 +453,6 @@
 
 void MgServiceOperation::EndExecution(STRING value)
 {
-    ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("  (%t) MgServiceOperation::EndExecution()\n" )));
     ACE_ASSERT(m_argsRead && !m_opCompleted && m_stream != NULL && NULL != m_currConnection);
 
@@ -465,6 +462,7 @@
     ACE_ASSERT(NULL != serverStreamData);
     Ptr<MgClientHandler> clientHandler = serverStreamData->GetClientHandler();
     ACE_ASSERT(NULL != clientHandler.p);
+    ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, clientHandler.p->m_mutex));
 
     MgService* service = GetService();
     assert(NULL != service);
@@ -501,7 +499,6 @@
 
 void MgServiceOperation::EndExecution(MgSerializable* obj)
 {
-    ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("  (%t) MgServiceOperation::EndExecution()\n" )));
     // ACE_ASSERT(NULL != obj);
     ACE_ASSERT(m_argsRead && !m_opCompleted && m_stream != NULL && NULL != m_currConnection);
@@ -512,6 +509,7 @@
     ACE_ASSERT(NULL != serverStreamData);
     Ptr<MgClientHandler> clientHandler = serverStreamData->GetClientHandler();
     ACE_ASSERT(NULL != clientHandler.p);
+    ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, clientHandler.p->m_mutex));
 
     MgService* service = GetService();
     assert(NULL != service);
@@ -548,7 +546,6 @@
 
 void MgServiceOperation::EndExecution(MgStringCollection* stringCollection)
 {
-    ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("  (%t) MgServiceOperation::EndExecution()\n" )));
     // ACE_ASSERT(NULL != stringCollection);
     ACE_ASSERT(m_argsRead && !m_opCompleted && m_stream != NULL && NULL != m_currConnection);
@@ -559,6 +556,7 @@
     ACE_ASSERT(NULL != serverStreamData);
     Ptr<MgClientHandler> clientHandler = serverStreamData->GetClientHandler();
     ACE_ASSERT(NULL != clientHandler.p);
+    ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, clientHandler.p->m_mutex));
 
     MgService* service = GetService();
     assert(NULL != service);
@@ -595,7 +593,6 @@
 
 void MgServiceOperation::EndExecution(MgException* except)
 {
-    ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("  (%t) MgServiceOperation::EndExecution()\n" )));
     ACE_ASSERT(NULL != except && m_argsRead && !m_opCompleted && m_stream != NULL);
 
@@ -605,6 +602,7 @@
     ACE_ASSERT(NULL != serverStreamData);
     Ptr<MgClientHandler> clientHandler = serverStreamData->GetClientHandler();
     ACE_ASSERT(NULL != clientHandler.p);
+    ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, clientHandler.p->m_mutex));
 
     if (NULL != m_currConnection)
     {

Modified: trunk/MgDev/Server/src/Common/Base/ServiceOperation.h
===================================================================
--- trunk/MgDev/Server/src/Common/Base/ServiceOperation.h	2009-10-19 17:40:26 UTC (rev 4307)
+++ trunk/MgDev/Server/src/Common/Base/ServiceOperation.h	2009-10-19 22:26:35 UTC (rev 4308)
@@ -89,7 +89,6 @@
 private:
 
     bool m_opCompleted;
-    ACE_Recursive_Thread_Mutex m_mutex;
 };
 
 /// Inline Methods