[mapguide-commits] r8451 - in trunk/MgDev/Desktop/MgDesktop: Log Services Services/Feature Services/Resource System
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Nov 16 23:39:36 PST 2014
Author: jng
Date: 2014-11-16 23:39:36 -0800 (Sun, 16 Nov 2014)
New Revision: 8451
Modified:
trunk/MgDev/Desktop/MgDesktop/Log/LogManager.cpp
trunk/MgDev/Desktop/MgDesktop/Log/LogManager.h
trunk/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionPool.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureServiceCache.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureServiceCache.h
trunk/MgDev/Desktop/MgDesktop/Services/Feature/TransformCache.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Feature/TransformCache.h
trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourceContentCache.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourceContentCache.h
trunk/MgDev/Desktop/MgDesktop/Services/Resource/UnmanagedDataManager.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Resource/UnmanagedDataManager.h
trunk/MgDev/Desktop/MgDesktop/Services/TileService.cpp
trunk/MgDev/Desktop/MgDesktop/Services/TileService.h
trunk/MgDev/Desktop/MgDesktop/System/Mutex.h
Log:
mg-desktop: Fix a compiler warning and rename some private members.
Modified: trunk/MgDev/Desktop/MgDesktop/Log/LogManager.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Log/LogManager.cpp 2014-11-17 07:00:06 UTC (rev 8450)
+++ trunk/MgDev/Desktop/MgDesktop/Log/LogManager.cpp 2014-11-17 07:39:36 UTC (rev 8451)
@@ -231,7 +231,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
MgConfiguration* pConfiguration = MgConfiguration::GetInstance();
@@ -354,7 +354,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
// Disable existing log in use if there is one
DisableLog(mltAccess);
@@ -368,7 +368,7 @@
bool MgdLogManager::IsAccessLogEnabled()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
return m_bAccessLogEnabled;
}
@@ -377,7 +377,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
m_bAccessLogEnabled = bEnabled;
if(m_bAccessLogEnabled)
@@ -395,14 +395,14 @@
STRING MgdLogManager::GetAccessLogFileName()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, STRING(L"")));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, STRING(L"")));
return (STRING)m_AccessLogFileName.c_str();
}
void MgdLogManager::SetAccessLogFileName(CREFSTRING filename)
{
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
DisableLog(mltAccess);
m_AccessLogFileName = ValidateLogFileName(filename);
@@ -411,7 +411,7 @@
STRING MgdLogManager::GetAccessLogParameters()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, STRING(L"")));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, STRING(L"")));
return (STRING)m_AccessLogParameters.c_str();
}
@@ -420,7 +420,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
if (0 != parameters.compare(m_AccessLogParameters))
{
@@ -437,7 +437,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
// Disable the log which closes the log for us
DisableLog(mltAccess);
@@ -460,7 +460,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
// Disable the log which closes the log for us
DisableLog(mltAccess);
@@ -483,7 +483,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
// Disable the log which closes the log for us
DisableLog(mltAccess);
@@ -506,7 +506,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
// Disable the log which closes the log for us
DisableLog(mltAccess);
@@ -525,7 +525,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
// Disable existing log in use if there is one
DisableLog(mltAdmin);
@@ -539,7 +539,7 @@
bool MgdLogManager::IsAdminLogEnabled()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
return m_bAdminLogEnabled;
}
@@ -548,7 +548,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
m_bAdminLogEnabled = bEnabled;
if(m_bAdminLogEnabled)
@@ -566,14 +566,14 @@
STRING MgdLogManager::GetAdminLogFileName()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, STRING(L"")));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, STRING(L"")));
return (STRING)m_AdminLogFileName.c_str();
}
void MgdLogManager::SetAdminLogFileName(CREFSTRING filename)
{
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
DisableLog(mltAdmin);
m_AdminLogFileName = ValidateLogFileName(filename);
@@ -582,7 +582,7 @@
STRING MgdLogManager::GetAdminLogParameters()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, STRING(L"")));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, STRING(L"")));
return (STRING)m_AdminLogParameters.c_str();
}
@@ -591,7 +591,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
if (0 != parameters.compare(m_AdminLogParameters))
{
@@ -608,7 +608,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
// Disable the log which closes the log for us
DisableLog(mltAdmin);
@@ -631,7 +631,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
// Disable the log which closes the log for us
DisableLog(mltAdmin);
@@ -654,7 +654,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
// Disable the log which closes the log for us
DisableLog(mltAdmin);
@@ -677,7 +677,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
// Disable the log which closes the log for us
DisableLog(mltAdmin);
@@ -696,7 +696,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
// Disable existing log in use if there is one
DisableLog(mltAuthentication);
@@ -710,7 +710,7 @@
bool MgdLogManager::IsAuthenticationLogEnabled()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
return m_bAuthenticationLogEnabled;
}
@@ -719,7 +719,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
m_bAuthenticationLogEnabled = bEnabled;
if(m_bAuthenticationLogEnabled)
@@ -737,14 +737,14 @@
STRING MgdLogManager::GetAuthenticationLogFileName()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, STRING(L"")));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, STRING(L"")));
return (STRING)m_AuthenticationLogFileName.c_str();
}
void MgdLogManager::SetAuthenticationLogFileName(CREFSTRING filename)
{
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
DisableLog(mltAuthentication);
m_AuthenticationLogFileName = ValidateLogFileName(filename);
@@ -753,7 +753,7 @@
STRING MgdLogManager::GetAuthenticationLogParameters()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, STRING(L"")));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, STRING(L"")));
return (STRING)m_AuthenticationLogParameters.c_str();
}
@@ -762,7 +762,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
if (0 != parameters.compare(m_AuthenticationLogParameters))
{
@@ -779,7 +779,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
// Disable the log which closes the log for us
DisableLog(mltAuthentication);
@@ -802,7 +802,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
// Disable the log which closes the log for us
DisableLog(mltAuthentication);
@@ -825,7 +825,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
// Disable the log which closes the log for us
DisableLog(mltAuthentication);
@@ -848,7 +848,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
// Disable the log which closes the log for us
DisableLog(mltAuthentication);
@@ -868,7 +868,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
// Disable existing log in use if there is one
DisableLog(mltError);
@@ -882,7 +882,7 @@
bool MgdLogManager::IsErrorLogEnabled()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
return m_bErrorLogEnabled;
}
@@ -891,7 +891,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
m_bErrorLogEnabled = bEnabled;
if(m_bErrorLogEnabled)
@@ -909,14 +909,14 @@
STRING MgdLogManager::GetErrorLogFileName()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, STRING(L"")));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, STRING(L"")));
return (STRING)m_ErrorLogFileName.c_str();
}
void MgdLogManager::SetErrorLogFileName(CREFSTRING filename)
{
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
DisableLog(mltError);
m_ErrorLogFileName = ValidateLogFileName(filename);
@@ -925,7 +925,7 @@
STRING MgdLogManager::GetErrorLogParameters()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, STRING(L"")));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, STRING(L"")));
return (STRING)m_ErrorLogParameters.c_str();
}
@@ -934,7 +934,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
if (0 != parameters.compare(m_ErrorLogParameters))
{
@@ -951,7 +951,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
// Disable the log which closes the log for us
DisableLog(mltError);
@@ -974,7 +974,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
// Disable the log which closes the log for us
DisableLog(mltError);
@@ -997,7 +997,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
// Disable the log which closes the log for us
DisableLog(mltError);
@@ -1020,7 +1020,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
// Disable the log which closes the log for us
DisableLog(mltError);
@@ -1039,7 +1039,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
// Disable existing log in use if there is one
DisableLog(mltError);
@@ -1053,7 +1053,7 @@
bool MgdLogManager::IsPerformanceLogEnabled()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
return m_bPerformanceLogEnabled;
}
@@ -1062,7 +1062,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
m_bPerformanceLogEnabled = bEnabled;
if(m_bPerformanceLogEnabled)
@@ -1080,14 +1080,14 @@
STRING MgdLogManager::GetPerformanceLogFileName()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, STRING(L"")));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, STRING(L"")));
return (STRING)m_PerformanceLogFileName.c_str();
}
void MgdLogManager::SetPerformanceLogFileName(CREFSTRING filename)
{
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
DisableLog(mltPerformance);
m_PerformanceLogFileName = ValidateLogFileName(filename);
@@ -1096,7 +1096,7 @@
STRING MgdLogManager::GetPerformanceLogParameters()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, STRING(L"")));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, STRING(L"")));
return (STRING)m_PerformanceLogParameters.c_str();
}
@@ -1105,7 +1105,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
if (0 != parameters.compare(m_PerformanceLogParameters))
{
@@ -1122,7 +1122,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
// Disable the log which closes the log for us
DisableLog(mltPerformance);
@@ -1145,7 +1145,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
// Disable the log which closes the log for us
DisableLog(mltPerformance);
@@ -1168,7 +1168,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
// Disable the log which closes the log for us
DisableLog(mltPerformance);
@@ -1191,7 +1191,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
// Disable the log which closes the log for us
DisableLog(mltPerformance);
@@ -1210,7 +1210,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
// Disable existing log in use if there is one
DisableLog(mltSession);
@@ -1224,7 +1224,7 @@
bool MgdLogManager::IsSessionLogEnabled()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
return m_bSessionLogEnabled;
}
@@ -1233,7 +1233,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
m_bSessionLogEnabled = bEnabled;
if(m_bSessionLogEnabled)
@@ -1251,14 +1251,14 @@
STRING MgdLogManager::GetSessionLogFileName()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, STRING(L"")));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, STRING(L"")));
return (STRING)m_SessionLogFileName.c_str();
}
void MgdLogManager::SetSessionLogFileName(CREFSTRING filename)
{
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
DisableLog(mltSession);
m_SessionLogFileName = ValidateLogFileName(filename);
@@ -1267,7 +1267,7 @@
STRING MgdLogManager::GetSessionLogParameters()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, STRING(L"")));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, STRING(L"")));
return (STRING)m_SessionLogParameters.c_str();
}
@@ -1276,7 +1276,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
if (0 != parameters.compare(m_SessionLogParameters))
{
@@ -1293,7 +1293,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
// Disable the log which closes the log for us
DisableLog(mltSession);
@@ -1316,7 +1316,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
// Disable the log which closes the log for us
DisableLog(mltSession);
@@ -1339,7 +1339,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
// Disable the log which closes the log for us
DisableLog(mltSession);
@@ -1362,7 +1362,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
// Disable the log which closes the log for us
DisableLog(mltSession);
@@ -1381,7 +1381,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
// Disable existing log in use if there is one
DisableLog(mltTrace);
@@ -1395,7 +1395,7 @@
bool MgdLogManager::IsTraceLogEnabled()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
return m_bTraceLogEnabled;
}
@@ -1404,7 +1404,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
m_bTraceLogEnabled = bEnabled;
if(m_bTraceLogEnabled)
@@ -1422,14 +1422,14 @@
STRING MgdLogManager::GetTraceLogFileName()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, STRING(L"")));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, STRING(L"")));
return (STRING)m_TraceLogFileName.c_str();
}
void MgdLogManager::SetTraceLogFileName(CREFSTRING filename)
{
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
DisableLog(mltTrace);
m_TraceLogFileName = ValidateLogFileName(filename);
@@ -1438,7 +1438,7 @@
STRING MgdLogManager::GetTraceLogParameters()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, STRING(L"")));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, STRING(L"")));
return(STRING) m_TraceLogParameters.c_str();
}
@@ -1447,7 +1447,7 @@
{
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
if (0 != parameters.compare(m_TraceLogParameters))
{
@@ -1460,7 +1460,7 @@
INT8 MgdLogManager::GetDetailLevelForService(INT16 serviceNum)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, 0));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, 0));
return m_logsDetail[serviceNum];
}
@@ -1471,7 +1471,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
// Disable the log which closes the log for us
DisableLog(mltTrace);
@@ -1494,7 +1494,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
// Disable the log which closes the log for us
DisableLog(mltTrace);
@@ -1517,7 +1517,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
// Disable the log which closes the log for us
DisableLog(mltTrace);
@@ -1540,7 +1540,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
// Disable the log which closes the log for us
DisableLog(mltTrace);
@@ -1561,7 +1561,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
enum MgLogType logType = mltSystem; // Assign to log type not associated with a file
@@ -1587,14 +1587,14 @@
void MgdLogManager::LogToSysLog(ACE_Log_Msg* pAce, char* application)
{
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
pAce->open(ACE_TEXT_CHAR_TO_TCHAR(application), ACE_Log_Msg::SYSLOG, ACE_TEXT_CHAR_TO_TCHAR(application));
}
void MgdLogManager::LogToOStream(ACE_Log_Msg* pAce, ACE_OSTREAM_TYPE* output)
{
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
m_outputStream = output;
pAce->msg_ostream(m_outputStream);
@@ -1604,7 +1604,7 @@
void MgdLogManager::LogToStderr(ACE_Log_Msg* pAce)
{
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
pAce->clr_flags(ACE_Log_Msg::OSTREAM | ACE_Log_Msg::LOGGER | ACE_Log_Msg::SYSLOG);
pAce->set_flags(ACE_Log_Msg::STDERR);
@@ -2076,7 +2076,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
enum MgLogType logType = mltSystem;
bool bInUse = IsLogFileInUse(oldFileName, logType);
@@ -2119,7 +2119,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
enum MgLogType logType = mltSystem;
bool bInUse = IsLogFileInUse(fileName, logType);
@@ -2205,7 +2205,7 @@
void MgdLogManager::WriteLogMessage(enum MgLogType logType, CREFSTRING message, ACE_Log_Priority logPriority)
{
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
ACE_Log_Msg* pAce = ACE_Log_Msg::instance();
@@ -2413,7 +2413,7 @@
bool MgdLogManager::RemoveLogFile(CREFSTRING filename)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
// Does the file exist? If so remove it.
int nResult = ACE_OS::unlink(MG_WCHAR_TO_TCHAR(filename));
@@ -2437,7 +2437,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
STRING filename = L"";
@@ -2505,7 +2505,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
pReadFile = ACE_OS::fopen(MG_WCHAR_TO_TCHAR(filename), ACE_TEXT("rb"));
@@ -2545,7 +2545,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
pReadFile = ACE_OS::fopen(MG_WCHAR_TO_TCHAR(filename), ACE_TEXT("rb"));
@@ -2604,7 +2604,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
if (numEntries < 0)
{
@@ -2719,7 +2719,7 @@
MgByteReader* MgdLogManager::GetLogContents(enum MgLogType logType, MgDateTime* fromDate, MgDateTime* toDate)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
if (fromDate == NULL || toDate == NULL)
{
@@ -2936,7 +2936,7 @@
MgStringCollection* MgdLogManager::DeterminePotentialFileNames(enum MgLogType logType, MgDateTime* fromDate, MgDateTime* toDate)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
Ptr<MgStringCollection> filenames;
@@ -3447,7 +3447,7 @@
void MgdLogManager::ArchiveLog(enum MgLogType logType)
{
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
STRING logFileName = L"";
std::ofstream* pLogStream = NULL;
@@ -3565,7 +3565,7 @@
//
void MgdLogManager::ValidateLogHeaders(enum MgLogType logType)
{
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
switch(logType)
{
@@ -3639,7 +3639,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
// Compare the log file parameters list with the current logging parameters
STRING logFileParameters = ReadParametersFromLogFile(mltAccess);
@@ -3660,7 +3660,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
// Compare the log file parameters list with the current logging parameters
STRING logFileParameters = ReadParametersFromLogFile(mltAdmin);
@@ -3681,7 +3681,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
// Compare the log file parameters list with the current logging parameters
STRING logFileParameters = ReadParametersFromLogFile(mltAuthentication);
@@ -3702,7 +3702,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
// Compare the log file parameters list with the current logging parameters
STRING logFileParameters = ReadParametersFromLogFile(mltError);
@@ -3723,7 +3723,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
// Compare the log file parameters list with the current logging parameters
STRING logFileParameters = ReadParametersFromLogFile(mltPerformance);
@@ -3744,7 +3744,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
// Compare the log file parameters list with the current logging parameters
STRING logFileParameters = ReadParametersFromLogFile(mltSession);
@@ -3765,7 +3765,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
// Compare the log file parameters list with the current logging parameters
STRING logFileParameters = ReadParametersFromLogFile(mltTrace);
@@ -3786,7 +3786,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
Ptr<MgByteReader> bytes;
bytes = GetLogHeader(logType);
@@ -3865,7 +3865,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
Ptr<MgByteReader> bytes;
bytes = GetLogHeader(logFilename);
@@ -3910,7 +3910,7 @@
MG_LOGMANAGER_TRY()
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
STRING currentLogName = L"";
@@ -4015,14 +4015,14 @@
void MgdLogManager::SetLogDelimiter(CREFSTRING delimiter)
{
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
m_delimiter = delimiter;
}
STRING MgdLogManager::GetLogDelimiter()
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, STRING(L"")));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, STRING(L"")));
return m_delimiter;
}
@@ -4041,7 +4041,7 @@
{
bool bCurrentLog = true;
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
// Get the frequency specifier from the filename, and the filetimestamp from the cache
STRING rawFilename;
@@ -4150,7 +4150,7 @@
{
bool bResult = false;
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
logType = mltSystem; // Assign to log type not associated with a file
@@ -4204,7 +4204,7 @@
{
bool bResult = false;
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
switch(logType)
{
@@ -4238,7 +4238,7 @@
void MgdLogManager::DisableLog(enum MgLogType logType)
{
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
switch(logType)
{
@@ -4298,7 +4298,7 @@
void MgdLogManager::EnableLog(enum MgLogType logType)
{
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
switch(logType)
{
@@ -4367,7 +4367,7 @@
void MgdLogManager::SetLogHasHeader(enum MgLogType logType, bool bHeader)
{
- ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
switch(logType)
{
@@ -4401,7 +4401,7 @@
{
bool bResult = false;
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, false));
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, false));
switch(logType)
{
Modified: trunk/MgDev/Desktop/MgDesktop/Log/LogManager.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Log/LogManager.h 2014-11-17 07:00:06 UTC (rev 8450)
+++ trunk/MgDev/Desktop/MgDesktop/Log/LogManager.h 2014-11-17 07:39:36 UTC (rev 8451)
@@ -563,7 +563,7 @@
STRING m_TraceLogFileName;
STRING m_TraceLogParameters;
- ACE_Recursive_Thread_Mutex m_MgdMutex;
+ ACE_Recursive_Thread_Mutex m_mutex;
ACE_Thread_Manager m_threadManager;
MgdLogThread* m_pLogThread;
INT64 m_writeCount;
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionPool.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionPool.cpp 2014-11-17 07:00:06 UTC (rev 8450)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/FdoConnectionPool.cpp 2014-11-17 07:39:36 UTC (rev 8451)
@@ -31,7 +31,7 @@
ConnPool freePool;
//ConnPool busyPool;
- MgdMutex MgdMutex;
+ MgdMutex m_mutex;
};
//The One instance of the connection pool
@@ -46,7 +46,7 @@
CHECK_FEATURE_SOURCE_ARGUMENT(featureSourceId, L"MgdFdoConnectionPool::GetConnection");
- ScopedLock scc(g_pool.MgdMutex);
+ ScopedLock scc(g_pool.m_mutex);
STRING fsIdStr = featureSourceId->ToString();
ConnPool::iterator it = g_pool.freePool.find(fsIdStr);
@@ -112,7 +112,7 @@
{
MG_FEATURE_SERVICE_TRY()
- ScopedLock scc(g_pool.MgdMutex);
+ ScopedLock scc(g_pool.m_mutex);
STRING providerName = conn->GetProviderName();
FdoPtr<FdoIConnection> fdoConn = conn->m_fdoConn; //conn->GetConnection();
@@ -220,7 +220,7 @@
{
MG_FEATURE_SERVICE_TRY()
- ScopedLock scc(g_pool.MgdMutex);
+ ScopedLock scc(g_pool.m_mutex);
for (ConnPool::iterator it = g_pool.freePool.begin(); it != g_pool.freePool.end(); ++it)
{
@@ -250,7 +250,7 @@
if (MgResourceType::FeatureSource != resId->GetResourceType())
return;
- ScopedLock scc(g_pool.MgdMutex);
+ ScopedLock scc(g_pool.m_mutex);
MG_FEATURE_SERVICE_TRY()
@@ -288,7 +288,7 @@
MG_FEATURE_SERVICE_TRY()
- ScopedLock scc(g_pool.MgdMutex);
+ ScopedLock scc(g_pool.m_mutex);
STRING fsIdStr = resId->ToString();
INT32 purged = 0;
@@ -330,7 +330,7 @@
if (haystack.length() < needle.length())
return false;
- for (INT32 i = 0; i < needle.length(); i++)
+ for (STRING::size_type i = 0; i < needle.length(); i++)
{
if (needle[i] != haystack[i])
return false;
@@ -340,7 +340,7 @@
void MgdFdoConnectionPool::GetCacheInfo(std::vector<PoolCacheEntry*>& entries)
{
- ScopedLock scc(g_pool.MgdMutex);
+ ScopedLock scc(g_pool.m_mutex);
for (ConnPool::iterator it = g_pool.freePool.begin(); it != g_pool.freePool.end(); ++it)
{
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureServiceCache.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureServiceCache.cpp 2014-11-17 07:00:06 UTC (rev 8450)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureServiceCache.cpp 2014-11-17 07:39:36 UTC (rev 8451)
@@ -32,7 +32,7 @@
void MgdFeatureServiceCache::Clear()
{
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
for (MgdFeatureServiceCacheEntries::iterator i = m_featureServiceCacheEntries.begin();
i != m_featureServiceCacheEntries.end(); ++i)
@@ -54,7 +54,7 @@
void MgdFeatureServiceCache::RemoveEntry(CREFSTRING resource)
{
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
MgdFeatureServiceCacheEntries::iterator i =
m_featureServiceCacheEntries.find(resource);
@@ -76,7 +76,7 @@
MgdFeatureServiceCacheEntry* MgdFeatureServiceCache::SetEntry(MgResourceIdentifier* resource)
{
- ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
Ptr<MgdFeatureServiceCacheEntry> entry;
@@ -111,7 +111,7 @@
__LINE__, __WFILE__, NULL, L"", NULL);
}
- ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
Ptr<MgdFeatureServiceCacheEntry> entry;
MgdFeatureServiceCacheEntries::iterator i =
@@ -128,7 +128,7 @@
void MgdFeatureServiceCache::SetFeatureSource(MgResourceIdentifier* resource, MgdFeatureSourceCacheItem* featureSource)
{
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
Ptr<MgdFeatureServiceCacheEntry> entry = SetEntry(resource);
@@ -137,7 +137,7 @@
MgdFeatureSourceCacheItem* MgdFeatureServiceCache::GetFeatureSourceInternal(MgResourceIdentifier* resource)
{
- ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
Ptr<MgdFeatureSourceCacheItem> data;
Ptr<MgdFeatureServiceCacheEntry> entry = GetEntry(resource);
@@ -151,7 +151,7 @@
}
void MgdFeatureServiceCache::SetSpatialContextInfo(MgResourceIdentifier* resource, MgdSpatialContextCacheItem* spatialContextInfo)
{
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
Ptr<MgdFeatureServiceCacheEntry> entry = SetEntry(resource);
@@ -160,7 +160,7 @@
MgdSpatialContextCacheItem* MgdFeatureServiceCache::GetSpatialContextInfoInternal(MgResourceIdentifier* resource)
{
- ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
Ptr<MgdSpatialContextCacheItem> data;
Ptr<MgdFeatureServiceCacheEntry> entry = GetEntry(resource);
@@ -175,7 +175,7 @@
void MgdFeatureServiceCache::SetSpatialContextReader(MgResourceIdentifier* resource, MgSpatialContextReader* spatialContextReader)
{
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
Ptr<MgdFeatureServiceCacheEntry> entry = SetEntry(resource);
@@ -184,7 +184,7 @@
MgSpatialContextReader* MgdFeatureServiceCache::GetSpatialContextReader(MgResourceIdentifier* resource)
{
- ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
Ptr<MgSpatialContextReader> data;
Ptr<MgdFeatureServiceCacheEntry> entry = GetEntry(resource);
@@ -211,7 +211,7 @@
void MgdFeatureServiceCache::SetSchemaNames(MgResourceIdentifier* resource, MgStringCollection* schemaNames)
{
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
Ptr<MgdFeatureServiceCacheEntry> entry = SetEntry(resource);
@@ -220,7 +220,7 @@
MgStringCollection* MgdFeatureServiceCache::GetSchemaNames(MgResourceIdentifier* resource)
{
- ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
Ptr<MgStringCollection> data;
Ptr<MgdFeatureServiceCacheEntry> entry = GetEntry(resource);
@@ -235,7 +235,7 @@
void MgdFeatureServiceCache::SetClassNames(MgResourceIdentifier* resource, CREFSTRING schemaName, MgStringCollection* classNames)
{
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
Ptr<MgdFeatureServiceCacheEntry> entry = SetEntry(resource);
@@ -244,7 +244,7 @@
MgStringCollection* MgdFeatureServiceCache::GetClassNames(MgResourceIdentifier* resource, CREFSTRING schemaName)
{
- ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
Ptr<MgStringCollection> data;
Ptr<MgdFeatureServiceCacheEntry> entry = GetEntry(resource);
@@ -259,7 +259,7 @@
void MgdFeatureServiceCache::SetSchemaXml(MgResourceIdentifier* resource, CREFSTRING schemaName, MgStringCollection* classNames, CREFSTRING schemaXml)
{
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
Ptr<MgdFeatureServiceCacheEntry> entry = SetEntry(resource);
@@ -268,7 +268,7 @@
STRING MgdFeatureServiceCache::GetSchemaXml(MgResourceIdentifier* resource, CREFSTRING schemaName, MgStringCollection* classNames)
{
- ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, L""));
+ ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, L""));
STRING data;
Ptr<MgdFeatureServiceCacheEntry> entry = GetEntry(resource);
@@ -283,7 +283,7 @@
void MgdFeatureServiceCache::SetSchemas(MgResourceIdentifier* resource, CREFSTRING schemaName, MgStringCollection* classNames, bool serialized, MgFeatureSchemaCollection* schemas)
{
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
Ptr<MgdFeatureServiceCacheEntry> entry = SetEntry(resource);
@@ -292,7 +292,7 @@
MgFeatureSchemaCollection* MgdFeatureServiceCache::GetSchemas(MgResourceIdentifier* resource, CREFSTRING schemaName, MgStringCollection* classNames, bool serialized)
{
- ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
Ptr<MgFeatureSchemaCollection> data;
Ptr<MgdFeatureServiceCacheEntry> entry = GetEntry(resource);
@@ -307,7 +307,7 @@
void MgdFeatureServiceCache::SetClassDefinition(MgResourceIdentifier* resource, CREFSTRING schemaName, CREFSTRING className, MgClassDefinition* classDef)
{
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
Ptr<MgdFeatureServiceCacheEntry> entry = SetEntry(resource);
@@ -316,7 +316,7 @@
MgClassDefinition* MgdFeatureServiceCache::GetClassDefinition(MgResourceIdentifier* resource, CREFSTRING schemaName, CREFSTRING className)
{
- ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
Ptr<MgClassDefinition> data;
Ptr<MgdFeatureServiceCacheEntry> entry = GetEntry(resource);
@@ -331,7 +331,7 @@
void MgdFeatureServiceCache::SetClassIdentityProperties(MgResourceIdentifier* resource, CREFSTRING schemaName, CREFSTRING className, MgPropertyDefinitionCollection* idProperties)
{
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
Ptr<MgdFeatureServiceCacheEntry> entry = SetEntry(resource);
@@ -340,7 +340,7 @@
MgPropertyDefinitionCollection* MgdFeatureServiceCache::GetClassIdentityProperties(MgResourceIdentifier* resource, CREFSTRING schemaName, CREFSTRING className)
{
- ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
Ptr<MgPropertyDefinitionCollection> data;
Ptr<MgdFeatureServiceCacheEntry> entry = GetEntry(resource);
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureServiceCache.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureServiceCache.h 2014-11-17 07:00:06 UTC (rev 8450)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureServiceCache.h 2014-11-17 07:39:36 UTC (rev 8451)
@@ -60,7 +60,7 @@
private:
/// Needed for thread-safety
- ACE_Recursive_Thread_Mutex m_MgdMutex;
+ ACE_Recursive_Thread_Mutex m_mutex;
typedef std::map<STRING, MgdFeatureServiceCacheEntry*> MgdFeatureServiceCacheEntries;
MgdFeatureServiceCacheEntries m_featureServiceCacheEntries;
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/TransformCache.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/TransformCache.cpp 2014-11-17 07:00:06 UTC (rev 8450)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/TransformCache.cpp 2014-11-17 07:39:36 UTC (rev 8451)
@@ -1,6 +1,6 @@
#include "TransformCache.h"
-ACE_Recursive_Thread_Mutex MgdTransformCache::sm_MgdMutex;
+ACE_Recursive_Thread_Mutex MgdTransformCache::sm_mutex;
MgdTransformCache::MgdTransformCache(MgdCSTrans* transform, MgCoordinateSystem* coordinateSystem)
@@ -59,7 +59,7 @@
MgFeatureService* svcFeature)
{
// prevent separate threads from simultaneously creating coordinate systems
- ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, sm_MgdMutex, NULL));
+ ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, sm_mutex, NULL));
MgdTransformCache* item = NULL;
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/TransformCache.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/TransformCache.h 2014-11-17 07:00:06 UTC (rev 8450)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/TransformCache.h 2014-11-17 07:39:36 UTC (rev 8451)
@@ -32,7 +32,7 @@
static void Clear(MgdTransformCacheMap& cacheMap);
private:
- static ACE_Recursive_Thread_Mutex sm_MgdMutex;
+ static ACE_Recursive_Thread_Mutex sm_mutex;
auto_ptr<MgdCSTrans> m_xform;
Ptr<MgCoordinateSystem> m_coordSys;
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourceContentCache.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourceContentCache.cpp 2014-11-17 07:00:06 UTC (rev 8450)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourceContentCache.cpp 2014-11-17 07:39:36 UTC (rev 8451)
@@ -29,7 +29,7 @@
CHECKARGUMENTNULL(resource, L"MgdResourceContentCache::PutContentEntry");
STRING resId = resource->ToString();
- ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, L""));
+ ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, L""));
MgdResourceContentCacheEntries::iterator i = m_resourceContentCacheEntries.find(resId);
STRING ret;
@@ -42,13 +42,13 @@
INT32 MgdResourceContentCache::GetCacheSize()
{
- ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, 0));
+ ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, 0));
return m_resourceContentCacheEntries.size();
}
void MgdResourceContentCache::Clear()
{
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
m_resourceContentCacheEntries.clear();
}
@@ -57,7 +57,7 @@
CHECKARGUMENTNULL(resource, L"MgdResourceContentCache::PutContentEntry");
STRING resId = resource->ToString();
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
MgdResourceContentCacheEntries::iterator i = m_resourceContentCacheEntries.find(resId);
if (m_resourceContentCacheEntries.end() != i)
@@ -76,6 +76,6 @@
STRING resId = resource->ToString();
//ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%t) MgdResourceContentCache::PutContentEntry - %W\n"), resId.c_str()));
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
m_resourceContentCacheEntries[resId] = content;
}
\ No newline at end of file
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourceContentCache.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourceContentCache.h 2014-11-17 07:00:06 UTC (rev 8450)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourceContentCache.h 2014-11-17 07:39:36 UTC (rev 8451)
@@ -25,7 +25,7 @@
private:
/// Needed for thread-safety
- ACE_Recursive_Thread_Mutex m_MgdMutex;
+ ACE_Recursive_Thread_Mutex m_mutex;
typedef std::map<STRING, STRING> MgdResourceContentCacheEntries;
MgdResourceContentCacheEntries m_resourceContentCacheEntries;
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Resource/UnmanagedDataManager.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Resource/UnmanagedDataManager.cpp 2014-11-17 07:00:06 UTC (rev 8450)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Resource/UnmanagedDataManager.cpp 2014-11-17 07:39:36 UTC (rev 8451)
@@ -384,7 +384,7 @@
MgConfiguration* configuration = MgConfiguration::GetInstance();
ACE_ASSERT(NULL != configuration);
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
m_unmanagedDataMappings = configuration->GetProperties(
MgdConfigProperties::UnmanagedDataMappingsSection);
@@ -392,7 +392,7 @@
void MgdUnmanagedDataManager::AddAliasMapping(CREFSTRING aliasName, CREFSTRING path)
{
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex));
+ ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
if (m_unmanagedDataMappings->Contains(aliasName))
{
@@ -413,7 +413,7 @@
///
MgPropertyCollection* MgdUnmanagedDataManager::GetUnmanagedDataMappings()
{
- ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_MgdMutex, NULL));
+ ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, NULL));
return SAFE_ADDREF(m_unmanagedDataMappings.p);
}
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Resource/UnmanagedDataManager.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Resource/UnmanagedDataManager.h 2014-11-17 07:00:06 UTC (rev 8450)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Resource/UnmanagedDataManager.h 2014-11-17 07:39:36 UTC (rev 8451)
@@ -81,7 +81,7 @@
static const STRING SquareBracketEnd;
static const wchar_t SquareBracketCharEnd;
- ACE_Recursive_Thread_Mutex m_MgdMutex;
+ ACE_Recursive_Thread_Mutex m_mutex;
Ptr<MgPropertyCollection> m_unmanagedDataMappings;
};
Modified: trunk/MgDev/Desktop/MgDesktop/Services/TileService.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/TileService.cpp 2014-11-17 07:00:06 UTC (rev 8450)
+++ trunk/MgDev/Desktop/MgDesktop/Services/TileService.cpp 2014-11-17 07:39:36 UTC (rev 8451)
@@ -1,7 +1,7 @@
#include "MgDesktop.h"
#include "TileService.h"
-ACE_Recursive_Thread_Mutex MgdTileService::sm_MgdMutex;
+ACE_Recursive_Thread_Mutex MgdTileService::sm_mutex;
bool MgdTileService::sm_initialized = false;
MgdTileService::MapCache MgdTileService::sm_mapCache;
bool MgdTileService::sm_renderOnly = false;
@@ -14,7 +14,7 @@
if (!sm_initialized)
{
// Perform Double-Checked Locking Optimization.
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, sm_MgdMutex));
+ ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, sm_mutex));
if (!sm_initialized)
{
@@ -63,7 +63,7 @@
///
bool MgdTileService::IsTileCacheEmpty() const
{
- ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, sm_MgdMutex, false));
+ ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, sm_mutex, false));
return sm_mapCache.empty();
}
@@ -181,7 +181,7 @@
// Lockfile test and creation is in same protected scope.
{
// Attempt to lock the tile file.
- ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, sm_MgdMutex, NULL));
+ ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, sm_mutex, NULL));
// Bail out if the tile file has been locked for so long.
if (DetectTileLockFile(lockPathname))
@@ -346,7 +346,7 @@
{
{
// Attemp to lock the tile file.
- ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, sm_MgdMutex, NULL));
+ ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, sm_mutex, NULL));
// Bail out if the tile file has been locked for so long.
if (DetectTileLockFile(lockPathname))
@@ -488,7 +488,7 @@
{
// Attemp to lock the tile file.
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, sm_MgdMutex));
+ ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, sm_mutex));
if (DetectTileLockFile(lockPathname))
{
@@ -662,7 +662,7 @@
///////////////////////////////////////////////////////////////////////////////
void MgdTileService::ClearMapCache(CREFSTRING mapDefinition)
{
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, sm_MgdMutex));
+ ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, sm_mutex));
MapCache::iterator iter = sm_mapCache.end();
if (mapDefinition.empty())
{
Modified: trunk/MgDev/Desktop/MgDesktop/Services/TileService.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/TileService.h 2014-11-17 07:00:06 UTC (rev 8450)
+++ trunk/MgDev/Desktop/MgDesktop/Services/TileService.h 2014-11-17 07:39:36 UTC (rev 8451)
@@ -72,7 +72,7 @@
typedef std::map<STRING, MgMemoryStreamHelper*> MapCache;
- static ACE_Recursive_Thread_Mutex sm_MgdMutex;
+ static ACE_Recursive_Thread_Mutex sm_mutex;
static bool sm_initialized;
static MapCache sm_mapCache;
static bool sm_renderOnly;
Modified: trunk/MgDev/Desktop/MgDesktop/System/Mutex.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/System/Mutex.h 2014-11-17 07:00:06 UTC (rev 8450)
+++ trunk/MgDev/Desktop/MgDesktop/System/Mutex.h 2014-11-17 07:39:36 UTC (rev 8451)
@@ -108,17 +108,17 @@
class ScopedLock
{
public:
- ScopedLock(MgdMutex& MgdMutex):m_MgdMutex(MgdMutex)
+ ScopedLock(MgdMutex& MgdMutex):m_mutex(MgdMutex)
{
- m_MgdMutex.Enter();
+ m_mutex.Enter();
}
~ScopedLock()
{
- m_MgdMutex.Leave();
+ m_mutex.Leave();
}
private:
ScopedLock();
- MgdMutex& m_MgdMutex;
+ MgdMutex& m_mutex;
};
#endif
\ No newline at end of file
More information about the mapguide-commits
mailing list