diff options
Diffstat (limited to 'ace/Log_Record.cpp')
| -rw-r--r-- | ace/Log_Record.cpp | 77 |
1 files changed, 36 insertions, 41 deletions
diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp index 86db48cba68..b29d09e8993 100644 --- a/ace/Log_Record.cpp +++ b/ace/Log_Record.cpp @@ -30,26 +30,26 @@ const ACE_TCHAR *ACE_Log_Record::priority_names_[] = ACE_LIB_TEXT ("LM_CRITICAL"), ACE_LIB_TEXT ("LM_ALERT"), ACE_LIB_TEXT ("LM_EMERGENCY"), - ACE_LIB_TEXT ("LM_UNK(04000)"), - ACE_LIB_TEXT ("LM_UNK(010000)"), - ACE_LIB_TEXT ("LM_UNK(020000)"), - ACE_LIB_TEXT ("LM_UNK(040000)"), - ACE_LIB_TEXT ("LM_UNK(0100000)"), - ACE_LIB_TEXT ("LM_UNK(0200000)"), - ACE_LIB_TEXT ("LM_UNK(0400000)"), - ACE_LIB_TEXT ("LM_UNK(01000000)"), - ACE_LIB_TEXT ("LM_UNK(02000000)"), - ACE_LIB_TEXT ("LM_UNK(04000000)"), - ACE_LIB_TEXT ("LM_UNK(010000000)"), - ACE_LIB_TEXT ("LM_UNK(020000000)"), - ACE_LIB_TEXT ("LM_UNK(040000000)"), - ACE_LIB_TEXT ("LM_UNK(0100000000)"), - ACE_LIB_TEXT ("LM_UNK(0200000000)"), - ACE_LIB_TEXT ("LM_UNK(0400000000)"), - ACE_LIB_TEXT ("LM_UNK(01000000000)"), - ACE_LIB_TEXT ("LM_UNK(02000000000)"), - ACE_LIB_TEXT ("LM_UNK(04000000000)"), - ACE_LIB_TEXT ("LM_UNK(010000000000)"), + ACE_LIB_TEXT ("LM_UNK(04000)") + ACE_LIB_TEXT ("LM_UNK(010000)") + ACE_LIB_TEXT ("LM_UNK(020000)") + ACE_LIB_TEXT ("LM_UNK(040000)") + ACE_LIB_TEXT ("LM_UNK(0100000)") + ACE_LIB_TEXT ("LM_UNK(0200000)") + ACE_LIB_TEXT ("LM_UNK(0400000)") + ACE_LIB_TEXT ("LM_UNK(01000000)") + ACE_LIB_TEXT ("LM_UNK(02000000)") + ACE_LIB_TEXT ("LM_UNK(04000000)") + ACE_LIB_TEXT ("LM_UNK(010000000)") + ACE_LIB_TEXT ("LM_UNK(020000000)") + ACE_LIB_TEXT ("LM_UNK(040000000)") + ACE_LIB_TEXT ("LM_UNK(0100000000)") + ACE_LIB_TEXT ("LM_UNK(0200000000)") + ACE_LIB_TEXT ("LM_UNK(0400000000)") + ACE_LIB_TEXT ("LM_UNK(01000000000)") + ACE_LIB_TEXT ("LM_UNK(02000000000)") + ACE_LIB_TEXT ("LM_UNK(04000000000)") + ACE_LIB_TEXT ("LM_UNK(010000000000)") ACE_LIB_TEXT ("LM_UNK(020000000000)") }; @@ -75,7 +75,7 @@ ACE_Log_Record::priority (void) const // Get the priority of the <Log_Record> <type_>. This is computed // as the base 2 logarithm of <type_> (which must be a power of 2, // as defined by the enums in <ACE_Log_Priority>). - return ACE::log2 ((u_long) this->type_); + return ACE::log2 (this->type_); } void @@ -85,7 +85,7 @@ ACE_Log_Record::priority (u_long p) // Set the priority of the <Log_Record> <type_> (which must be a // power of 2, as defined by the enums in <ACE_Log_Priority>). - this->type_ = (ACE_UINT32) p; + this->type_ = p; } void @@ -95,9 +95,9 @@ ACE_Log_Record::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("length_ = %d\n"), this->length_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntype_ = %u\n"), this->type_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntime_stamp_ = (%d, %d)\n"), this->secs_, this->usecs_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\npid_ = %u\n"), this->pid_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntype_ = %d\n"), this->type_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntime_stamp_ = (%d, %d)\n"), this->time_stamp_.sec (), this->time_stamp_.usec ())); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\npid_ = %d\n"), this->pid_)); ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmsg_data_ = %s\n"), this->msg_data_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -106,9 +106,7 @@ void ACE_Log_Record::msg_data (const ACE_TCHAR *data) { // ACE_TRACE ("ACE_Log_Record::msg_data"); - ACE_OS::strncpy (this->msg_data_, - data, - ACE_Log_Record::MAXLOGMSGLEN); + ACE_OS::strncpy (this->msg_data_, data, ACE_Log_Record::MAXLOGMSGLEN); this->round_up (); } @@ -116,10 +114,9 @@ ACE_Log_Record::ACE_Log_Record (ACE_Log_Priority lp, long ts_sec, long p) : length_ (0), - type_ (ACE_UINT32 (lp)), - secs_ (ts_sec), - usecs_ (0), - pid_ (ACE_UINT32 (p)) + type_ (long (lp)), + time_stamp_ (ts_sec), + pid_ (p) { // ACE_TRACE ("ACE_Log_Record::ACE_Log_Record"); } @@ -128,10 +125,9 @@ ACE_Log_Record::ACE_Log_Record (ACE_Log_Priority lp, const ACE_Time_Value &ts, long p) : length_ (0), - type_ (ACE_UINT32 (lp)), - secs_ ((ACE_UINT32) ts.sec ()), - usecs_ ((ACE_UINT32) ts.usec ()), - pid_ (ACE_UINT32 (p)) + type_ (long (lp)), + time_stamp_ (ts), + pid_ (p) { // ACE_TRACE ("ACE_Log_Record::ACE_Log_Record"); } @@ -152,8 +148,7 @@ ACE_Log_Record::round_up (void) ACE_Log_Record::ACE_Log_Record (void) : length_ (0), type_ (0), - secs_ (0), - usecs_ (0), + time_stamp_ (0L), pid_ (0) { // ACE_TRACE ("ACE_Log_Record::ACE_Log_Record"); @@ -173,7 +168,7 @@ ACE_Log_Record::format_msg (const ACE_TCHAR *host_name, || ACE_BIT_ENABLED (verbose_flag, ACE_Log_Msg::VERBOSE_LITE)) { - time_t now = this->secs_; + time_t now = this->time_stamp_.sec (); ACE_TCHAR ctp[26]; // 26 is a magic number... if (ACE_OS::ctime_r (&now, ctp, sizeof ctp) == 0) @@ -188,7 +183,7 @@ ACE_Log_Record::format_msg (const ACE_TCHAR *host_name, ACE_OS::sprintf (timestamp, ACE_LIB_TEXT ("%s.%03ld %s"), ctp + 4, - ((long) this->usecs_) / 1000, + this->time_stamp_.usec () / 1000, ctp + 20); } @@ -205,7 +200,7 @@ ACE_Log_Record::format_msg (const ACE_TCHAR *host_name, : host_name); # endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ ACE_OS::sprintf (verbose_msg, - ACE_LIB_TEXT ("%s@%s@%u@%s@%s"), + ACE_LIB_TEXT ("%s@%s@%ld@%s@%s"), timestamp, lhost_name, this->pid_, |