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 2004/11/14 23:32:42 UTC

cvs commit: logging-log4cxx/tests/src/net socketservertestcase.cpp

carnold     2004/11/14 14:32:42

  Modified:    include/log4cxx/helpers thread.h
               src      filewatchdog.cpp socketappender.cpp thread.cpp
                        xmlsocketappender.cpp
               tests/src vectorappender.cpp
               tests/src/net socketservertestcase.cpp
  Log:
  LOGCXX-36: Migrate to APR threads - switch to apr_sleep
  
  Revision  Changes    Path
  1.19      +0 -5      logging-log4cxx/include/log4cxx/helpers/thread.h
  
  Index: thread.h
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/thread.h,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- thread.h	14 Nov 2004 22:09:33 -0000	1.18
  +++ thread.h	14 Nov 2004 22:32:42 -0000	1.19
  @@ -94,11 +94,6 @@
   			*/
   			static unsigned long getCurrentThreadId();
   
  -			/** Causes the currently executing thread to sleep (temporarily
  -			cease execution) for the specified number of milliseconds.
  -			*/
  -			static void sleep(long millis);
  -
   			/** Causes this thread to begin execution;
   			calls the run method of this thread.
   			*/
  
  
  
  1.8       +3 -2      logging-log4cxx/src/filewatchdog.cpp
  
  Index: filewatchdog.cpp
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/src/filewatchdog.cpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- filewatchdog.cpp	22 Apr 2004 21:21:33 -0000	1.7
  +++ filewatchdog.cpp	14 Nov 2004 22:32:42 -0000	1.8
  @@ -18,6 +18,7 @@
   #include <log4cxx/helpers/loglog.h>
   #include <sys/stat.h>
   #include <errno.h>
  +#include <apr-1/apr_time.h>
   
   using namespace log4cxx;
   using namespace log4cxx::helpers;
  @@ -66,8 +67,8 @@
   void FileWatchdog::run()
   {    
       while(!interrupted) 
  -	{
  -		Thread::sleep(delay);
  +	{
  +		apr_sleep(APR_INT64_C(1000) * delay);
   		checkAndConfigure();
       }
   }
  
  
  
  1.12      +2 -1      logging-log4cxx/src/socketappender.cpp
  
  Index: socketappender.cpp
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/src/socketappender.cpp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- socketappender.cpp	25 Oct 2004 04:44:03 -0000	1.11
  +++ socketappender.cpp	14 Nov 2004 22:32:42 -0000	1.12
  @@ -20,6 +20,7 @@
   #include <log4cxx/helpers/optionconverter.h>
   #include <log4cxx/helpers/stringhelper.h>
   #include <log4cxx/spi/loggingevent.h>
  +#include <apr-1/apr_time.h>
   
   using namespace log4cxx;
   using namespace log4cxx::helpers;
  @@ -228,7 +229,7 @@
   	{
   		try
   		{
  -			sleep(socketAppender->reconnectionDelay);
  +			apr_sleep(APR_INT64_C(1000) * socketAppender->reconnectionDelay);
   			LogLog::debug(_T("Attempting connection to ")
   				+socketAppender->address.getHostName());
   			socket = new Socket(socketAppender->address, socketAppender->port);
  
  
  
  1.20      +0 -9      logging-log4cxx/src/thread.cpp
  
  Index: thread.cpp
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/src/thread.cpp,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- thread.cpp	14 Nov 2004 22:09:34 -0000	1.19
  +++ thread.cpp	14 Nov 2004 22:32:42 -0000	1.20
  @@ -158,15 +158,6 @@
   	LOGLOG_DEBUG(_T("Thread ended."));
   }
   
  -void Thread::sleep(long millis)
  -{
  -#ifdef LOG4CXX_HAVE_MS_THREAD
  -	::Sleep(millis);
  -#else
  -	::usleep(1000 * millis);
  -#endif
  -}
  -
   void Thread::setPriority(int newPriority)
   {
   	switch(newPriority)
  
  
  
  1.10      +3 -2      logging-log4cxx/src/xmlsocketappender.cpp
  
  Index: xmlsocketappender.cpp
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/src/xmlsocketappender.cpp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- xmlsocketappender.cpp	22 Oct 2004 07:47:58 -0000	1.9
  +++ xmlsocketappender.cpp	14 Nov 2004 22:32:42 -0000	1.10
  @@ -21,7 +21,8 @@
   #include <log4cxx/helpers/stringhelper.h>
   #include <log4cxx/xml/xmllayout.h>
   #include <log4cxx/level.h>
  -#include <log4cxx/helpers/transform.h>
  +#include <log4cxx/helpers/transform.h>
  +#include <apr-1/apr_time.h>
   
   using namespace log4cxx;
   using namespace log4cxx::helpers;
  @@ -239,7 +240,7 @@
   	{
   		try
   		{
  -			sleep(socketAppender->reconnectionDelay);
  +			apr_sleep(APR_INT64_C(1000) * socketAppender->reconnectionDelay);
   			LogLog::debug(_T("Attempting connection to ")
   				+socketAppender->address.getHostName());
   			socket = new Socket(socketAppender->address, socketAppender->port);
  
  
  
  1.3       +2 -1      logging-log4cxx/tests/src/vectorappender.cpp
  
  Index: vectorappender.cpp
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/tests/src/vectorappender.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- vectorappender.cpp	22 Apr 2004 21:21:36 -0000	1.2
  +++ vectorappender.cpp	14 Nov 2004 22:32:42 -0000	1.3
  @@ -16,6 +16,7 @@
   
   #include "vectorappender.h"
   #include <log4cxx/helpers/thread.h>
  +#include <apr-1/apr_time.h>
   
   using namespace log4cxx;
   using namespace log4cxx::helpers;
  @@ -26,7 +27,7 @@
   {
   	try
   	{
  -		Thread::sleep(5);
  +		apr_sleep(5000);
   	}
   	catch (Exception&)
   	{
  
  
  
  1.7       +3 -2      logging-log4cxx/tests/src/net/socketservertestcase.cpp
  
  Index: socketservertestcase.cpp
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/tests/src/net/socketservertestcase.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- socketservertestcase.cpp	13 Nov 2004 23:02:15 -0000	1.6
  +++ socketservertestcase.cpp	14 Nov 2004 22:32:42 -0000	1.7
  @@ -37,7 +37,8 @@
   #include "../util/absolutedateandtimefilter.h"
   #include "../util/threadfilter.h"
   #include "../xml/xlevel.h"
  -#include "../util/filenamefilter.h"
  +#include "../util/filenamefilter.h"
  +#include <apr-1/apr_time.h>
   
   
   using namespace log4cxx;
  @@ -464,7 +465,7 @@
   
   	void delay(int secs)
   	{
  -		Thread::sleep(secs * 1000);
  +		apr_sleep(APR_USEC_PER_SEC * secs);
   	}
   };