From 5b7342a3ac28c57f40b6a146b7494281876a7025 Mon Sep 17 00:00:00 2001 From: schmidt Date: Fri, 16 Jul 1999 19:21:28 +0000 Subject: *** empty log message *** --- ChangeLog-99b | 61 ++++++++++++++++++++++++++++++++++++++++------ ace/Log_Record.cpp | 52 ++++++++++++++++++++++++--------------- ace/config-win32-borland.h | 16 ++++++++++++ 3 files changed, 101 insertions(+), 28 deletions(-) diff --git a/ChangeLog-99b b/ChangeLog-99b index 53d785aaea6..969211e1f00 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,56 @@ +Fri Jul 16 13:55:34 1999 Douglas C. Schmidt + + * ace/config-win32-borland.h: Updated this file to enable some + necessary macros. Thanks to Christopher Kohlhoff + for reporting this. + + * tests/DLL_Test.cpp, + tests/run_test.bat: Updated these to handle the appropriate + directory where the Borland tests are built. Thanks to + Christopher Kohlhoff for reporting this. + + * netsvcs/lib/Logging_Strategy.cpp (init): When the application + program is started, none of the log output is sent to the + Client_Logging_Service. Further investigation shows that the + ACE_Log_Msg::open() method is responsible for connecting to the + client logger if the ACE_Log_Msg::LOGGER flag is set. However, + the connections never attempted because the ACE_Log_Msg::open() + method is called before the Logging_Strategy flags have been + parsed. This problem was fixed by rearranging the point at + which the ACE_LOG_MSG->open() method was called. Thanks to + Jerry De Master for contributing this. + + * netsvcs/lib/Client_Logging_Handler.cpp (send), + netsvcs/lib/Log_Message_Receiver.cpp (log_output): + All log message output in ACE is done through one of the + ACE_Log_Record::print() methods. Each of the overloaded methods + has a argument as the second argument. However, all + uses of the ACE_Log_Record::print() method in + Log_Message_Receiver.cpp and Client_Logging_Handler.cpp pass + zero for the flags argument. To fix this, simply pass + ACE_Log_Msg::instance()->flags() instead of 0. Thanks to Jerry + De Master for contributing this. + + * ace/Log_Record.cpp (format_msg): Added code for the new + ACE_Log_Record::format_msg() method that adds the date/time + stamp to the ACE_Log_Msg::VERBOSE_LITE output. Thanks to Jerry + De Master for contributing this. + + * netsvcs/lib/Logging_Strategy.cpp (init): Make sure the + ACE_Log_Msg::VERBOSE_LITE flag is OR'd into the clr_flags() + call. Thanks to Jerry De Master for + reporting this. + + * netsvcs/lib/Logging_Strategy.cpp (tokenize): Make sure that + the ACE_Log_Msg::VERBOSE_LITE flag is correctly parsed. Thanks + to Jerry De Master for reporting this. + + * ace/Memory_Pool.h: Added a way to set the segment_size in + ACE_Shared_Memory_Pool_Options and ACE_Shared_Memory_Pool. + Thanks to Serge Kolgan for this fix. [This + feature was actually added a couple of beta releases ago, but + somehow the ChangeLog entry got lost.] + Fri Jul 16 09:20:42 1999 Arturo Montes * ace/OS.i: Patch the dl* family to keep ACE @@ -14,14 +67,6 @@ Fri Jul 16 11:50:24 1999 Nanbor Wang * tests/Basic_Types_Test.cpp (main): Reverted my previous change. It was not a safe assumption. -Fri Jul 16 11:50:24 1999 Douglas C. Schmidt - - * ace/Memory_Pool.h: Added a way to set the segment_size in - ACE_Shared_Memory_Pool_Options and ACE_Shared_Memory_Pool. - Thanks to Serge Kolgan for this fix. [This - feature was actually added a couple of beta releases ago, but - somehow the ChangeLog entry got lost.] - Fri Jul 16 02:28:10 1999 Nanbor Wang * ace/Log_Msg.cpp (log): Changed (*va_arg (argp,PTF))(), which diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp index d67e79ea231..ff577e89600 100644 --- a/ace/Log_Record.cpp +++ b/ace/Log_Record.cpp @@ -120,7 +120,14 @@ ACE_Log_Record::format_msg (const ASYS_TCHAR *host_name, u_long verbose_flag, ASYS_TCHAR *verbose_msg) { - if (ACE_BIT_ENABLED (verbose_flag, ACE_Log_Msg::VERBOSE)) + /* 0123456789012345678901234 */ + /* Oct 18 14:25:36.000 1989 */ + ASYS_TCHAR timestamp[26]; // Only used by VERBOSE and VERBOSE_LITE. + + if (ACE_BIT_ENABLED (verbose_flag, + ACE_Log_Msg::VERBOSE) + || ACE_BIT_ENABLED (verbose_flag, + ACE_Log_Msg::VERBOSE_LITE)) { time_t now = this->time_stamp_.sec (); ASYS_TCHAR ctp[26]; // 26 is a magic number... @@ -134,38 +141,43 @@ ACE_Log_Record::format_msg (const ASYS_TCHAR *host_name, ctp[19] = '\0'; // NUL-terminate after the time. ctp[24] = '\0'; // NUL-terminate after the date. + ACE_OS::sprintf (timestamp, + ASYS_TEXT ("%s.%03d %s"), + ctp + 4, + this->time_stamp_.usec () / 1000, + ctp + 20); + } + + if (ACE_BIT_ENABLED (verbose_flag, + ACE_Log_Msg::VERBOSE)) + { # if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) const ASYS_TCHAR *lhost_name = (const ASYS_TCHAR *) ((host_name == 0) - ? ((char *) ASYS_TEXT ("")) : ((char *) host_name)); + ? ((char *) ASYS_TEXT ("")) + : ((char *) host_name)); # else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ const ASYS_TCHAR *lhost_name = ((host_name == 0) - ? ASYS_TEXT ("") : host_name); + ? ASYS_TEXT ("") + : host_name); # endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ - ACE_OS::sprintf (verbose_msg, - ASYS_TEXT ("%s.%03lu %s@%s@%ld@%s@%s"), - ctp + 4, - this->time_stamp_.usec () / 1000lu, - ctp + 20, + ASYS_TEXT ("%s@%s@%d@%s@%s"), + timestamp, lhost_name, this->pid_, ACE_Log_Record::priority_name (ACE_Log_Priority (this->type_)), this->msg_data_); } else if (ACE_BIT_ENABLED (verbose_flag, ACE_Log_Msg::VERBOSE_LITE)) - { - ACE_OS::sprintf (verbose_msg, - ASYS_TEXT ("%s@%s"), - ACE_Log_Record::priority_name (ACE_Log_Priority (this->type_)), - this->msg_data_); - } + ACE_OS::sprintf (verbose_msg, + ASYS_TEXT ("%s@%s@%s"), + timestamp, + ACE_Log_Record::priority_name (ACE_Log_Priority (this->type_)), + this->msg_data_); else - { - ACE_OS::sprintf (verbose_msg, - ASYS_TEXT ("%s"), - this->msg_data_); - } - + ACE_OS::sprintf (verbose_msg, + ASYS_TEXT ("%s"), + this->msg_data_); return 0; } diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h index e4ab0c8daea..da4f60494a2 100644 --- a/ace/config-win32-borland.h +++ b/ace/config-win32-borland.h @@ -97,6 +97,16 @@ # endif /* defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) */ # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 +# if defined (ACE_NEW_THROWS_EXCEPTIONS) +# undef ACE_NEW_THROWS_EXCEPTIONS +# endif /* defined (ACE_NEW_THROWS_EXCEPTIONS) */ +# define ACE_NEW_THROWS_EXCEPTIONS 1 + +# if defined (ACE_HAS_ANSI_CASTS) +# undef ACE_HAS_ANSI_CASTS +# endif /* defined (ACE_HAS_ANSI_CASTS) */ +# define ACE_HAS_ANSI_CASTS 1 + # endif /* (__BORLANDC__ >= 0x0530) */ /* @@ -148,6 +158,12 @@ # undef ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR # endif /* defined (ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR) */ + /* include only forward declaration of iostreams */ +# if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) +# undef ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION +# endif /* defined (ACE_HAS_STDCPP_STL_INCLUDES) */ +# define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION 1 + /* need to ensure these are included before */ # include # include -- cgit v1.2.1