From 5181b5b5bd5eedfff0f7a1736ba7d3f68b4b5479 Mon Sep 17 00:00:00 2001 From: DINH Viet Hoa Date: Thu, 24 Jan 2013 23:33:41 -0800 Subject: cleanup --- src/core/basetypes/MCLog.cc | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src/core') diff --git a/src/core/basetypes/MCLog.cc b/src/core/basetypes/MCLog.cc index 51f6d46e..59cbc8ea 100644 --- a/src/core/basetypes/MCLog.cc +++ b/src/core/basetypes/MCLog.cc @@ -8,6 +8,13 @@ #include #include +static pid_t sPid = -1; + +__attribute__((constructor)) +static void initialize() { + sPid = getpid(); +} + static void logInternalv(FILE * file, const char * user, const char * filename, unsigned int line, int dumpStack, const char * format, va_list argp); @@ -48,14 +55,16 @@ static void logInternalv(FILE * file, fprintf(file, "%04u-%02u-%02u %02u:%02u:%02u.%03u ", tm_value.tm_year + 1900, tm_value.tm_mon + 1, tm_value.tm_mday, tm_value.tm_hour, tm_value.tm_min, tm_value.tm_sec, tv.tv_usec / 1000); if (pthread_main_np()) { - fprintf(file, "[%i:main] %s:%i: ", getpid(), filename, line); + fprintf(file, "[%i:main] %s:%i: ", sPid, filename, line); } else { + unsigned long threadValue; #ifdef _MACH_PORT_T - fprintf(file, "[%i:%x] %s:%i: ", getpid(), pthread_mach_thread_np(thread_id), filename, line); + threadValue = pthread_mach_thread_np(thread_id); #else - fprintf(file, "[%i:%p] %s:%i: ", getpid(), (void *) thread_id, filename, line); + threadValue = (unsigned long) thread_id; #endif + fprintf(file, "[%i:%lx] %s:%i: ", sPid, threadValue, filename, line); } vfprintf(file, format, argp); fprintf(file, "\n"); -- cgit v1.2.3