You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2008/03/12 23:27:50 UTC
svn commit: r636542 - in /logging/log4cxx/trunk/src: main/cpp/
main/include/log4cxx/ main/include/log4cxx/helpers/
main/include/log4cxx/net/ test/cpp/helpers/
Author: carnold
Date: Wed Mar 12 15:27:43 2008
New Revision: 636542
URL: http://svn.apache.org/viewvc?rev=636542&view=rev
Log:
LOGCXX-242: Eliminate log4cxx_thread_t
Modified:
logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp
logging/log4cxx/trunk/src/main/cpp/filewatchdog.cpp
logging/log4cxx/trunk/src/main/cpp/socketappenderskeleton.cpp
logging/log4cxx/trunk/src/main/cpp/sockethubappender.cpp
logging/log4cxx/trunk/src/main/cpp/telnetappender.cpp
logging/log4cxx/trunk/src/main/cpp/threadcxx.cpp
logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/filewatchdog.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/thread.h
logging/log4cxx/trunk/src/main/include/log4cxx/net/socketappenderskeleton.h
logging/log4cxx/trunk/src/main/include/log4cxx/net/sockethubappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h
logging/log4cxx/trunk/src/test/cpp/helpers/charsetencodertestcase.cpp
Modified: logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp?rev=636542&r1=636541&r2=636542&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp Wed Mar 12 15:27:43 2008
@@ -313,7 +313,7 @@
#if APR_HAS_THREADS
-void* LOG4CXX_THREAD_FUNC AsyncAppender::dispatch(log4cxx_thread_t* thread, void* data) {
+void* LOG4CXX_THREAD_FUNC AsyncAppender::dispatch(apr_thread_t* thread, void* data) {
AsyncAppender* pThis = (AsyncAppender*) data;
bool isActive = true;
try {
Modified: logging/log4cxx/trunk/src/main/cpp/filewatchdog.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/filewatchdog.cpp?rev=636542&r1=636541&r2=636542&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/filewatchdog.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/filewatchdog.cpp Wed Mar 12 15:27:43 2008
@@ -67,7 +67,7 @@
}
}
-void* APR_THREAD_FUNC FileWatchdog::run(log4cxx_thread_t* /* thread */, void* data) {
+void* APR_THREAD_FUNC FileWatchdog::run(apr_thread_t* /* thread */, void* data) {
FileWatchdog* pThis = (FileWatchdog*) data;
unsigned int interrupted = apr_atomic_read32(&pThis->interrupted);
Modified: logging/log4cxx/trunk/src/main/cpp/socketappenderskeleton.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/socketappenderskeleton.cpp?rev=636542&r1=636541&r2=636542&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/socketappenderskeleton.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/socketappenderskeleton.cpp Wed Mar 12 15:27:43 2008
@@ -135,7 +135,7 @@
}
}
-void* LOG4CXX_THREAD_FUNC SocketAppenderSkeleton::monitor(log4cxx_thread_t* /* thread */, void* data) {
+void* LOG4CXX_THREAD_FUNC SocketAppenderSkeleton::monitor(apr_thread_t* /* thread */, void* data) {
SocketAppenderSkeleton* socketAppender = (SocketAppenderSkeleton*) data;
SocketPtr socket;
bool isClosed = socketAppender->closed;
Modified: logging/log4cxx/trunk/src/main/cpp/sockethubappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/sockethubappender.cpp?rev=636542&r1=636541&r2=636542&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/sockethubappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/sockethubappender.cpp Wed Mar 12 15:27:43 2008
@@ -164,7 +164,7 @@
thread.run(monitor, this);
}
-void* APR_THREAD_FUNC SocketHubAppender::monitor(log4cxx_thread_t* /* thread */, void* data) {
+void* APR_THREAD_FUNC SocketHubAppender::monitor(apr_thread_t* /* thread */, void* data) {
SocketHubAppender* pThis = (SocketHubAppender*) data;
ServerSocket* serverSocket = 0;
Modified: logging/log4cxx/trunk/src/main/cpp/telnetappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/telnetappender.cpp?rev=636542&r1=636541&r2=636542&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/telnetappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/telnetappender.cpp Wed Mar 12 15:27:43 2008
@@ -185,7 +185,7 @@
}
}
-void* APR_THREAD_FUNC TelnetAppender::acceptConnections(log4cxx_thread_t* /* thread */, void* data) {
+void* APR_THREAD_FUNC TelnetAppender::acceptConnections(apr_thread_t* /* thread */, void* data) {
TelnetAppender* pThis = (TelnetAppender*) data;
// main loop; is left when This->closed is != 0 after an accept()
Modified: logging/log4cxx/trunk/src/main/cpp/threadcxx.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/threadcxx.cpp?rev=636542&r1=636541&r2=636542&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/threadcxx.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/threadcxx.cpp Wed Mar 12 15:27:43 2008
@@ -72,9 +72,8 @@
// create LaunchPackage on the thread's memory pool
LaunchPackage* package = new(p) LaunchPackage(this, start, data);
- apr_thread_t** pthread = (apr_thread_t**) &thread;
- stat = apr_thread_create(pthread, attrs,
- (apr_thread_start_t) launcher, package, p.getAPRPool());
+ stat = apr_thread_create(&thread, attrs,
+ launcher, package, p.getAPRPool());
if (stat != APR_SUCCESS) {
throw ThreadException(stat);
}
@@ -93,14 +92,14 @@
}
#if APR_HAS_THREADS
-void* LOG4CXX_THREAD_FUNC Thread::launcher(log4cxx_thread_t* thread, void* data) {
+void* LOG4CXX_THREAD_FUNC Thread::launcher(apr_thread_t* thread, void* data) {
LaunchPackage* package = (LaunchPackage*) data;
ThreadLocal& tls = getThreadLocal();
tls.set(package->getThread());
LaunchStatus alive(&package->getThread()->alive);
void* retval = (package->getRunnable())(thread, package->getData());
- apr_thread_exit((apr_thread_t*) thread, 0);
- return retval;
+ apr_thread_exit(thread, 0);
+ return retval;
}
#endif
@@ -109,7 +108,7 @@
#if APR_HAS_THREADS
if (thread != NULL) {
apr_status_t startStat;
- apr_status_t stat = apr_thread_join(&startStat, (apr_thread_t*) thread);
+ apr_status_t stat = apr_thread_join(&startStat, thread);
thread = NULL;
if (stat != APR_SUCCESS) {
throw ThreadException(stat);
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h?rev=636542&r1=636541&r2=636542&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h Wed Mar 12 15:27:43 2008
@@ -277,7 +277,7 @@
/**
* Dispatch routine.
*/
- static void* LOG4CXX_THREAD_FUNC dispatch(helpers::log4cxx_thread_t* thread, void* data);
+ static void* LOG4CXX_THREAD_FUNC dispatch(apr_thread_t* thread, void* data);
}; // class AsyncAppender
LOG4CXX_PTR_DEF(AsyncAppender);
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/filewatchdog.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/filewatchdog.h?rev=636542&r1=636541&r2=636542&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/filewatchdog.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/filewatchdog.h Wed Mar 12 15:27:43 2008
@@ -71,7 +71,7 @@
void start();
private:
- static void* LOG4CXX_THREAD_FUNC run(log4cxx_thread_t* thread, void* data);
+ static void* LOG4CXX_THREAD_FUNC run(apr_thread_t* thread, void* data);
Pool pool;
Thread thread;
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/thread.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/thread.h?rev=636542&r1=636541&r2=636542&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/thread.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/thread.h Wed Mar 12 15:27:43 2008
@@ -29,6 +29,10 @@
#endif
#endif
+extern "C" {
+ typedef struct apr_thread_t apr_thread_t;
+}
+
namespace log4cxx
{
@@ -36,9 +40,8 @@
{
class Pool;
class ThreadLocal;
- typedef void log4cxx_thread_t;
- typedef void* (LOG4CXX_THREAD_FUNC *Runnable)(log4cxx_thread_t* thread, void* data);
+ typedef void* (LOG4CXX_THREAD_FUNC *Runnable)(apr_thread_t* thread, void* data);
/**
* This class implements an approximation of java.util.Thread.
*/
@@ -90,7 +93,7 @@
private:
Pool p;
- log4cxx_thread_t* thread;
+ apr_thread_t* thread;
volatile unsigned int alive;
volatile unsigned int interruptedStatus;
Thread(const Thread&);
@@ -168,7 +171,7 @@
* used to keep the reference to the corresponding Thread object and
* is responsible for maintaining Thread.alive.
*/
- static void* LOG4CXX_THREAD_FUNC launcher(log4cxx_thread_t* thread, void* data);
+ static void* LOG4CXX_THREAD_FUNC launcher(apr_thread_t* thread, void* data);
/**
* Get a key to the thread local storage used to hold the reference to
* the corresponding Thread object.
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/net/socketappenderskeleton.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/net/socketappenderskeleton.h?rev=636542&r1=636541&r2=636542&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/net/socketappenderskeleton.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/net/socketappenderskeleton.h Wed Mar 12 15:27:43 2008
@@ -167,7 +167,7 @@
*/
helpers::Thread thread;
- static void* LOG4CXX_THREAD_FUNC monitor(helpers::log4cxx_thread_t* thread, void* data);
+ static void* LOG4CXX_THREAD_FUNC monitor(apr_thread_t* thread, void* data);
SocketAppenderSkeleton(const SocketAppenderSkeleton&);
SocketAppenderSkeleton& operator=(const SocketAppenderSkeleton&);
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/net/sockethubappender.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/net/sockethubappender.h?rev=636542&r1=636541&r2=636542&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/net/sockethubappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/net/sockethubappender.h Wed Mar 12 15:27:43 2008
@@ -182,7 +182,7 @@
void startServer();
helpers::Thread thread;
- static void* LOG4CXX_THREAD_FUNC monitor(helpers::log4cxx_thread_t* thread, void* data);
+ static void* LOG4CXX_THREAD_FUNC monitor(apr_thread_t* thread, void* data);
}; // class SocketHubAppender
LOG4CXX_PTR_DEF(SocketHubAppender);
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h?rev=636542&r1=636541&r2=636542&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h Wed Mar 12 15:27:43 2008
@@ -142,7 +142,7 @@
helpers::ServerSocket* serverSocket;
helpers::Thread sh;
size_t activeConnections;
- static void* LOG4CXX_THREAD_FUNC acceptConnections(helpers::log4cxx_thread_t* thread, void* data);
+ static void* LOG4CXX_THREAD_FUNC acceptConnections(apr_thread_t* thread, void* data);
}; // class TelnetAppender
LOG4CXX_PTR_DEF(TelnetAppender);
Modified: logging/log4cxx/trunk/src/test/cpp/helpers/charsetencodertestcase.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/helpers/charsetencodertestcase.cpp?rev=636542&r1=636541&r2=636542&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/helpers/charsetencodertestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/helpers/charsetencodertestcase.cpp Wed Mar 12 15:27:43 2008
@@ -225,7 +225,7 @@
int repetitions;
};
- static void* LOG4CXX_THREAD_FUNC thread1Action(log4cxx_thread_t* thread, void* data) {
+ static void* LOG4CXX_THREAD_FUNC thread1Action(apr_thread_t* /* thread */, void* data) {
ThreadPackage* package = (ThreadPackage*) data;
#if LOG4CXX_LOGCHAR_IS_UTF8
const logchar greet[] = { 'H', 'e', 'l', 'l', 'o', ' ',