cargilld 2003/12/17 11:58:05
Modified: c/src/xercesc/internal IGXMLScanner.cpp
c/src/xercesc/util/Platforms/OpenServer
OpenServerPlatformUtils.cpp
c/src/xercesc/util/Platforms/OS400 OS400PlatformUtils.cpp
c/src/xercesc/util/Platforms/Solaris
SolarisPlatformUtils.cpp
c/src/xercesc/util/Platforms/Tru64 Tru64PlatformUtils.cpp
c/src/xercesc/util/Platforms/UnixWare
UnixWarePlatformUtils.cpp
Log:
Platform update for memory management so that the static memory manager (one
used to call Initialize) is only for static data.
Revision Changes Path
1.50 +2 -2 xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp
Index: IGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- IGXMLScanner.cpp 17 Dec 2003 05:16:59 -0000 1.49
+++ IGXMLScanner.cpp 17 Dec 2003 19:58:05 -0000 1.50
@@ -268,7 +268,7 @@
fDocHandler->endDocument();
//cargill debug:
- fGrammarResolver->getXSModel();
+ //fGrammarResolver->getXSModel();
// Reset the reader manager to close all files, sockets, etc...
fReaderMgr.reset();
1.12 +8 -4
xml-xerces/c/src/xercesc/util/Platforms/OpenServer/OpenServerPlatformUtils.cpp
Index: OpenServerPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/OpenServer/OpenServerPlatformUtils.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- OpenServerPlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.11
+++ OpenServerPlatformUtils.cpp 17 Dec 2003 19:58:05 -0000 1.12
@@ -56,6 +56,10 @@
/*
* $Log$
+ * Revision 1.12 2003/12/17 19:58:05 cargilld
+ * Platform update for memory management so that the static memory manager (one
+ * used to call Initialize) is only for static data.
+ *
* Revision 1.11 2003/12/17 15:16:10 cargilld
* Platform update for memory management so that the static memory manager (one
* used to call Initialize) is only for static data.
@@ -491,7 +495,7 @@
RecursiveMutex() {
if (pthread_mutex_init(&mutex, NULL))
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
- XMLExcepts::Mutex_CouldNotCreate,
fgMemoryManager);
+ XMLExcepts::Mutex_CouldNotCreate,
XMLPlatformUtils::fgMemoryManager);
recursionCount = 0;
tid = 0;
};
@@ -499,7 +503,7 @@
~RecursiveMutex() {
if (pthread_mutex_destroy(&mutex))
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
- XMLExcepts::Mutex_CouldNotDestroy,
fgMemoryManager);
+ XMLExcepts::Mutex_CouldNotDestroy,
XMLPlatformUtils::fgMemoryManager);
};
void lock() {
@@ -510,7 +514,7 @@
}
if (pthread_mutex_lock(&mutex) != 0)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
- XMLExcepts::Mutex_CouldNotLock,
fgMemoryManager);
+ XMLExcepts::Mutex_CouldNotLock,
XMLPlatformUtils::fgMemoryManager);
tid = pthread_self();
recursionCount = 1;
};
@@ -521,7 +525,7 @@
if (pthread_mutex_unlock(&mutex) != 0)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
- XMLExcepts::Mutex_CouldNotUnlock,
fgMemoryManager);
+ XMLExcepts::Mutex_CouldNotUnlock,
XMLPlatformUtils::fgMemoryManager);
tid = 0;
};
};
1.15 +5 -5
xml-xerces/c/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.cpp
Index: OS400PlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- OS400PlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.14
+++ OS400PlatformUtils.cpp 17 Dec 2003 19:58:05 -0000 1.15
@@ -601,7 +601,7 @@
RecursiveMutex() {
if (pthread_mutex_init(&mutex, NULL))
- ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotCreate, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotCreate, XMLPlatformUtils::fgMemoryManager);
recursionCount = 0;
tid.reservedHiId = 0;
tid.reservedLoId = 0;
@@ -610,7 +610,7 @@
~RecursiveMutex() {
if (pthread_mutex_destroy(&mutex))
- ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotDestroy, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotDestroy, XMLPlatformUtils::fgMemoryManager);
};
void lock() {
@@ -620,7 +620,7 @@
return;
}
if (pthread_mutex_lock(&mutex) != 0)
- ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotLock, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotLock, XMLPlatformUtils::fgMemoryManager);
tid = pthread_self();
recursionCount = 1;
};
@@ -631,7 +631,7 @@
return;
if (pthread_mutex_unlock(&mutex) != 0)
- ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotUnlock, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotUnlock, XMLPlatformUtils::fgMemoryManager);
tid.reservedHandle= 0;
tid.reservedHiId = 0;
tid.reservedLoId = 0;
1.21 +5 -5
xml-xerces/c/src/xercesc/util/Platforms/Solaris/SolarisPlatformUtils.cpp
Index: SolarisPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/Solaris/SolarisPlatformUtils.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- SolarisPlatformUtils.cpp 17 Dec 2003 18:35:17 -0000 1.20
+++ SolarisPlatformUtils.cpp 17 Dec 2003 19:58:05 -0000 1.21
@@ -472,14 +472,14 @@
RecursiveMutex() {
if (pthread_mutex_init(&mutex, NULL))
- ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotCreate, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotCreate, XMLPlatformUtils::fgMemoryManager);
recursionCount = 0;
tid = 0;
};
~RecursiveMutex() {
if (pthread_mutex_destroy(&mutex))
- ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotDestroy, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotDestroy, XMLPlatformUtils::fgMemoryManager);
};
void lock() {
@@ -489,7 +489,7 @@
return;
}
if (pthread_mutex_lock(&mutex) != 0)
- ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotLock, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotLock, XMLPlatformUtils::fgMemoryManager);
tid = pthread_self();
recursionCount = 1;
};
@@ -500,7 +500,7 @@
return;
if (pthread_mutex_unlock(&mutex) != 0)
- ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotUnlock, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotUnlock, XMLPlatformUtils::fgMemoryManager);
tid = 0;
};
};
1.14 +5 -5
xml-xerces/c/src/xercesc/util/Platforms/Tru64/Tru64PlatformUtils.cpp
Index: Tru64PlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/Tru64/Tru64PlatformUtils.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Tru64PlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.13
+++ Tru64PlatformUtils.cpp 17 Dec 2003 19:58:05 -0000 1.14
@@ -463,7 +463,7 @@
RecursiveMutex()
{
if (pthread_mutex_init(&mutex, NULL))
- ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotCreate, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotCreate, XMLPlatformUtils::fgMemoryManager);
recursionCount = 0;
tid = 0;
};
@@ -471,7 +471,7 @@
~RecursiveMutex()
{
if (pthread_mutex_destroy(&mutex))
- ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotDestroy, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotDestroy, XMLPlatformUtils::fgMemoryManager);
};
void lock()
@@ -482,7 +482,7 @@
return;
}
if (pthread_mutex_lock(&mutex) != 0)
- ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotLock,
fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotLock,
XMLPlatformUtils::fgMemoryManager);
tid = pthread_self();
recursionCount = 1;
};
@@ -494,7 +494,7 @@
return;
if (pthread_mutex_unlock(&mutex) != 0)
- ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotUnlock, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotUnlock, XMLPlatformUtils::fgMemoryManager);
tid = 0;
};
};
1.14 +8 -4
xml-xerces/c/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp
Index: UnixWarePlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- UnixWarePlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.13
+++ UnixWarePlatformUtils.cpp 17 Dec 2003 19:58:05 -0000 1.14
@@ -56,6 +56,10 @@
/*
* $Log$
+ * Revision 1.14 2003/12/17 19:58:05 cargilld
+ * Platform update for memory management so that the static memory manager (one
+ * used to call Initialize) is only for static data.
+ *
* Revision 1.13 2003/12/17 15:16:10 cargilld
* Platform update for memory management so that the static memory manager (one
* used to call Initialize) is only for static data.
@@ -535,14 +539,14 @@
RecursiveMutex() {
if (pthread_mutex_init(&mutex, NULL))
- ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotCreate, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotCreate, XMLPlatformUtils::fgMemoryManager);
recursionCount = 0;
tid = 0;
};
~RecursiveMutex() {
if (pthread_mutex_destroy(&mutex))
- ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotDestroy, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotDestroy, XMLPlatformUtils::fgMemoryManager);
};
void lock() {
@@ -552,7 +556,7 @@
return;
}
if (pthread_mutex_lock(&mutex) != 0)
- ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotLock, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotLock, XMLPlatformUtils::fgMemoryManager);
tid = pthread_self();
recursionCount = 1;
};
@@ -563,7 +567,7 @@
return;
if (pthread_mutex_unlock(&mutex) != 0)
- ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotUnlock, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotUnlock, XMLPlatformUtils::fgMemoryManager);
tid = 0;
};
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
