Author: carnold
Date: Tue Nov 13 17:27:00 2007
New Revision: 594736
URL: http://svn.apache.org/viewvc?rev=594736&view=rev
Log:
LOGCXX-75: missing #if APR_HAS_THREADS for cygwin
Modified:
logging/log4cxx/trunk/Makefile.am (props changed)
logging/log4cxx/trunk/autogen.sh (props changed)
logging/log4cxx/trunk/configure.in (props changed)
logging/log4cxx/trunk/find_apr.m4 (props changed)
logging/log4cxx/trunk/find_apu.m4 (props changed)
logging/log4cxx/trunk/src/main/cpp/class.cpp
logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp
logging/log4cxx/trunk/src/main/cpp/thread.cpp
logging/log4cxx/trunk/src/main/cpp/threadlocal.cpp
logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp
logging/log4cxx/trunk/src/test/cpp/helpers/charsetencodertestcase.cpp
logging/log4cxx/trunk/src/test/cpp/net/socketappendertestcase.cpp
logging/log4cxx/trunk/src/test/cpp/net/sockethubappendertestcase.cpp
logging/log4cxx/trunk/src/test/cpp/net/telnetappendertestcase.cpp
logging/log4cxx/trunk/src/test/cpp/net/xmlsocketappendertestcase.cpp
Propchange: logging/log4cxx/trunk/Makefile.am
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Nov 13 17:27:00 2007
@@ -1 +1 @@
-native
+LF
Propchange: logging/log4cxx/trunk/autogen.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Nov 13 17:27:00 2007
@@ -1 +1 @@
-native
+LF
Propchange: logging/log4cxx/trunk/configure.in
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Nov 13 17:27:00 2007
@@ -1 +1 @@
-native
+LF
Propchange: logging/log4cxx/trunk/find_apr.m4
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Nov 13 17:27:00 2007
@@ -1 +1 @@
-native
+LF
Propchange: logging/log4cxx/trunk/find_apu.m4
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Nov 13 17:27:00 2007
@@ -1 +1 @@
-native
+LF
Modified: logging/log4cxx/trunk/src/main/cpp/class.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/class.cpp?rev=594736&r1=594735&r2=594736&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/class.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/class.cpp Tue Nov 13 17:27:00 2007
@@ -144,7 +144,9 @@
}
void Class::registerClasses() {
+#if APR_HAS_THREADS
AsyncAppender::registerClass();
+#endif
ConsoleAppender::registerClass();
FileAppender::registerClass();
#ifdef LOG4CXX_HAVE_ODBC
@@ -161,12 +163,16 @@
// TODO:
// SMTPAppender::registerClass();
#endif
+#if APR_HAS_THREADS
SocketAppender::registerClass();
SocketHubAppender::registerClass();
+#endif
SyslogAppender::registerClass();
+#if APR_HAS_THREADS
TelnetAppender::registerClass();
XMLSocketAppender::registerClass();
- // DateLayout::registerClass();
+#endif
+// DateLayout::registerClass();
HTMLLayout::registerClass();
PatternLayout::registerClass();
SimpleLayout::registerClass();
Modified: logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp?rev=594736&r1=594735&r2=594736&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp Tue Nov 13 17:27:00
2007
@@ -55,6 +55,7 @@
using namespace log4cxx::rolling;
+#if APR_HAS_THREADS
class XMLWatchdog : public FileWatchdog
{
public:
@@ -72,6 +73,7 @@
LogManager::getLoggerRepository());
}
};
+#endif
IMPLEMENT_LOG4CXX_OBJECT(DOMConfigurator)
@@ -747,32 +749,48 @@
void DOMConfigurator::configureAndWatch(const std::string& filename)
{
+#if APR_HAS_THREADS
LOG4CXX_DECODE_CHAR(fn, filename);
configureAndWatch(fn, FileWatchdog::DEFAULT_DELAY);
+#else
+ configure(filename);
+#endif
}
#if LOG4CXX_HAS_WCHAR_T
void DOMConfigurator::configureAndWatch(const std::wstring& filename)
{
+#if APR_HAS_THREADS
LOG4CXX_DECODE_WCHAR(fn, filename);
configureAndWatch(fn, FileWatchdog::DEFAULT_DELAY);
+#else
+ configure(fn);
+#endif
}
#endif
void DOMConfigurator::configureAndWatch(const std::string& filename, long
delay)
{
+#if APR_HAS_THREADS
LOG4CXX_DECODE_CHAR(fn, filename);
XMLWatchdog * xdog = new XMLWatchdog(fn);
xdog->setDelay(delay);
xdog->start();
+#else
+ configure(filename);
+#endif
}
#if LOG4CXX_HAS_WCHAR_T
void DOMConfigurator::configureAndWatch(const std::wstring& filename, long
delay)
{
+#if APR_HAS_THREADS
LOG4CXX_DECODE_WCHAR(fn, filename);
XMLWatchdog * xdog = new XMLWatchdog(fn);
xdog->setDelay(delay);
xdog->start();
+#else
+ configure(filename);
+#endif
}
#endif
Modified: logging/log4cxx/trunk/src/main/cpp/thread.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/thread.cpp?rev=594736&r1=594735&r2=594736&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/thread.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/thread.cpp Tue Nov 13 17:27:00 2007
@@ -26,13 +26,12 @@
using namespace log4cxx::helpers;
using namespace log4cxx;
+#if APR_HAS_THREADS
Thread::Thread() : thread(NULL), alive(0), interruptedStatus(0) {
}
Thread::~Thread() {
-#if APR_HAS_THREADS
join();
-#endif
}
Thread::LaunchPackage::LaunchPackage(Thread* t, Runnable r, void* d) :
thread(t), runnable(r), data(d) {
@@ -90,7 +89,6 @@
apr_atomic_set32(alive, 0);
}
-
void* Thread::launcher(log4cxx_thread_t* thread, void* data) {
LaunchPackage* package = (LaunchPackage*) data;
ThreadLocal& tls = getThreadLocal();
@@ -158,12 +156,14 @@
void Thread::ending() {
apr_atomic_set32(&alive, 0);
}
-
+#endif
void Thread::sleep(int duration) {
+#if APR_HAS_THREADS
if(interrupted()) {
throw InterruptedException();
}
+#endif
if (duration > 0) {
apr_sleep(duration*1000);
}
Modified: logging/log4cxx/trunk/src/main/cpp/threadlocal.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/threadlocal.cpp?rev=594736&r1=594735&r2=594736&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/threadlocal.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/threadlocal.cpp Tue Nov 13 17:27:00 2007
@@ -22,6 +22,7 @@
using namespace log4cxx::helpers;
using namespace log4cxx;
+#if APR_HAS_THREADS
ThreadLocal::ThreadLocal() {
apr_pool_t** ppool = reinterpret_cast<apr_pool_t**>(&pool);
apr_status_t stat = apr_pool_create(ppool, 0);
@@ -54,4 +55,4 @@
}
return retval;
}
-
+#endif
Modified: logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp?rev=594736&r1=594735&r2=594736&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp Tue Nov 13
17:27:00 2007
@@ -97,7 +97,7 @@
typedef helpers::ObjectPtrT<BlockableVectorAppender>
BlockableVectorAppenderPtr;
-
+#if APR_HAS_THREADS
/**
* Tests of AsyncAppender.
*/
@@ -285,3 +285,4 @@
};
//CPPUNIT_TEST_SUITE_REGISTRATION(AsyncAppenderTestCase);
+#endif
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=594736&r1=594735&r2=594736&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/helpers/charsetencodertestcase.cpp
(original)
+++ logging/log4cxx/trunk/src/test/cpp/helpers/charsetencodertestcase.cpp Tue
Nov 13 17:27:00 2007
@@ -36,7 +36,9 @@
class CharsetEncoderTestCase : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE(CharsetEncoderTestCase);
+#if APR_HAS_THREADS
CPPUNIT_TEST(thread1);
+#endif
CPPUNIT_TEST(encode1);
CPPUNIT_TEST(encode2);
CPPUNIT_TEST(encode3);
@@ -172,6 +174,7 @@
CPPUNIT_ASSERT(iter == greeting.end());
}
+#if APR_HAS_THREADS
class ThreadPackage {
public:
ThreadPackage(CharsetEncoderPtr& enc, int repetitions) :
@@ -294,7 +297,7 @@
CPPUNIT_ASSERT_EQUAL((apr_uint32_t) THREAD_COUNT * THREAD_REPS,
package->getPass());
delete package;
}
-
+#endif
};
Modified: logging/log4cxx/trunk/src/test/cpp/net/socketappendertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/net/socketappendertestcase.cpp?rev=594736&r1=594735&r2=594736&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/net/socketappendertestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/net/socketappendertestcase.cpp Tue Nov
13 17:27:00 2007
@@ -23,6 +23,7 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
+#if APR_HAS_THREADS
/**
Unit tests of log4cxx::SocketAppender
*/
@@ -46,3 +47,4 @@
};
CPPUNIT_TEST_SUITE_REGISTRATION(SocketAppenderTestCase);
+#endif
\ No newline at end of file
Modified: logging/log4cxx/trunk/src/test/cpp/net/sockethubappendertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/net/sockethubappendertestcase.cpp?rev=594736&r1=594735&r2=594736&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/net/sockethubappendertestcase.cpp
(original)
+++ logging/log4cxx/trunk/src/test/cpp/net/sockethubappendertestcase.cpp Tue
Nov 13 17:27:00 2007
@@ -23,6 +23,7 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
+#if APR_HAS_THREADS
/**
Unit tests of log4cxx::SocketHubAppender
*/
@@ -46,3 +47,4 @@
};
CPPUNIT_TEST_SUITE_REGISTRATION(SocketHubAppenderTestCase);
+#endif
Modified: logging/log4cxx/trunk/src/test/cpp/net/telnetappendertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/net/telnetappendertestcase.cpp?rev=594736&r1=594735&r2=594736&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/net/telnetappendertestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/net/telnetappendertestcase.cpp Tue Nov
13 17:27:00 2007
@@ -23,6 +23,7 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
+#if APR_HAS_THREADS
/**
Unit tests of log4cxx::TelnetAppender
*/
@@ -46,3 +47,4 @@
};
CPPUNIT_TEST_SUITE_REGISTRATION(TelnetAppenderTestCase);
+#endif
\ No newline at end of file
Modified: logging/log4cxx/trunk/src/test/cpp/net/xmlsocketappendertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/net/xmlsocketappendertestcase.cpp?rev=594736&r1=594735&r2=594736&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/net/xmlsocketappendertestcase.cpp
(original)
+++ logging/log4cxx/trunk/src/test/cpp/net/xmlsocketappendertestcase.cpp Tue
Nov 13 17:27:00 2007
@@ -23,6 +23,7 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
+#if APR_HAS_THREADS
/**
Unit tests of log4cxx::net::XMLSocketAppender
*/
@@ -46,3 +47,4 @@
};
CPPUNIT_TEST_SUITE_REGISTRATION(XMLSocketAppenderTestCase);
+#endif
