Author: jsdelfino
Date: Thu Jan 4 08:56:45 2007
New Revision: 492637
URL: http://svn.apache.org/viewvc?view=rev&rev=492637
Log:
Fixed writing of thread id. LogWriter was always writing the id of the first
thread that initialized it.
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/LogWriter.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.h
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp?view=diff&rev=492637&r1=492636&r2=492637
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp
(original)
+++
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp
Thu Jan 4 08:56:45 2007
@@ -35,9 +35,9 @@
{
}
- void DefaultLogWriter::log(int level, const char* pid, const char*
msg)
+ void DefaultLogWriter::log(int level, const char* tid, const char*
msg)
{
- cout << pid << " ";
+ cout << tid << " ";
for (int i=0; i < level; i++)
{
cout << " ";
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h?view=diff&rev=492637&r1=492636&r2=492637
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h
(original)
+++
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h
Thu Jan 4 08:56:45 2007
@@ -42,7 +42,7 @@
* Will write to the console.
* See LogWriter#log.
*/
- virtual void log(int level, const char* pid, const char* msg);
+ virtual void log(int level, const char* tid, const char* msg);
};
} // End namespace util
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp?view=diff&rev=492637&r1=492636&r2=492637
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp
(original)
+++
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp
Thu Jan 4 08:56:45 2007
@@ -41,9 +41,9 @@
logFile.close();
}
- void FileLogWriter::log(int level, const char*pid, const char* msg)
+ void FileLogWriter::log(int level, const char*tid, const char* msg)
{
- logFile << pid << " ";
+ logFile << tid << " ";
for (int i=0; i < level; i++)
{
logFile << " ";
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.h
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.h?view=diff&rev=492637&r1=492636&r2=492637
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.h
(original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.h
Thu Jan 4 08:56:45 2007
@@ -47,7 +47,7 @@
* Will write to the console.
* See LogWriter#log.
*/
- virtual void log(int level, const char* pid, const char* msg);
+ virtual void log(int level, const char* tid, const char* msg);
private:
std::ofstream logFile;
};
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/LogWriter.h
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/LogWriter.h?view=diff&rev=492637&r1=492636&r2=492637
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/LogWriter.h
(original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/LogWriter.h Thu
Jan 4 08:56:45 2007
@@ -41,10 +41,10 @@
/**
* Log a message.
* @param level The level of logging for this message.
- * @param pid The current process id.
+ * @param tid The current thread id.
* @param msg The message to log.
*/
- virtual void log(int level, const char* pid, const char* msg)
= 0;
+ virtual void log(int level, const char* tid, const char* msg)
= 0;
};
} // End namespace util
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.cpp?view=diff&rev=492637&r1=492636&r2=492637
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.cpp
(original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.cpp Thu
Jan 4 08:56:45 2007
@@ -44,20 +44,12 @@
{
LogWriter* Logger::logWriter = getLogWriter();
- char* Logger::pid = NULL;
-
LogWriter* Logger::getLogWriter()
{
if (logWriter == 0)
{
setLogWriter(0);
- pid = new char[21];
-#if defined(WIN32) || defined (_WINDOWS)
- sprintf(pid, "%lu:%lu", (unsigned long)_getpid(),
(unsigned long)GetCurrentThreadId());
-#else
- sprintf(pid, "%lu:%lu", (unsigned long)getpid(), (unsigned
long)pthread_self());
-#endif
}
return logWriter;
}
@@ -106,9 +98,20 @@
{
if (level <= loggingLevel)
{
- logWriter->log(level, pid, msg);
+ char tid[21];
+ formatThreadID(tid);
+ logWriter->log(level, tid, msg);
}
}
+
+ void Logger::formatThreadID(char* tid)
+ {
+#if defined(WIN32) || defined (_WINDOWS)
+ sprintf(tid, "%lu:%lu", (unsigned long)_getpid(), (unsigned
long)GetCurrentThreadId());
+#else
+ sprintf(tid, "%lu:%lu", (unsigned long)getpid(), (unsigned
long)pthread_self());
+#endif
+ }
void Logger::logArgs(int level, const char* msg, ...)
{
@@ -116,6 +119,8 @@
{
va_list variableArguments;
va_start(variableArguments, msg);
+ char tid[21];
+ formatThreadID(tid);
char messageBuffer[256];
int size = vsnprintf(messageBuffer, 255, msg,
variableArguments);
#if defined(WIN32) || defined (_WINDOWS)
@@ -125,7 +130,7 @@
char* bigMessageBuffer = new char[size+1];
vsnprintf(bigMessageBuffer, size, msg,
variableArguments);
bigMessageBuffer[size] = '\0';
- logWriter->log(level, pid, bigMessageBuffer);
+ logWriter->log(level, tid, bigMessageBuffer);
delete bigMessageBuffer;
}
#else
@@ -134,14 +139,14 @@
char* bigMessageBuffer = new char[size+1];
vsnprintf(bigMessageBuffer, size, msg,
variableArguments);
bigMessageBuffer[size] = '\0';
- logWriter->log(level, pid, bigMessageBuffer);
+ logWriter->log(level, tid, bigMessageBuffer);
delete bigMessageBuffer;
}
#endif
else
{
messageBuffer[255] = '\0';
- logWriter->log(level, pid, messageBuffer);
+ logWriter->log(level, tid, messageBuffer);
}
va_end(variableArguments);
}
@@ -153,6 +158,8 @@
{
va_list variableArguments;
va_start(variableArguments, msg);
+ char tid[21];
+ formatThreadID(tid);
char messageBuffer[256];
int size = vsnprintf(messageBuffer, 255, msg,
variableArguments);
#if defined(WIN32) || defined (_WINDOWS)
@@ -162,7 +169,7 @@
char* bigMessageBuffer = new char[size+1];
vsnprintf(bigMessageBuffer, size, msg,
variableArguments);
bigMessageBuffer[size] = '\0';
- logWriter->log(0, pid, bigMessageBuffer);
+ logWriter->log(0, tid, bigMessageBuffer);
delete bigMessageBuffer;
}
#else
@@ -171,14 +178,14 @@
char* bigMessageBuffer = new char[size+1];
vsnprintf(bigMessageBuffer, size, msg,
variableArguments);
bigMessageBuffer[size] = '\0';
- logWriter->log(0, pid, bigMessageBuffer);
+ logWriter->log(0, tid, bigMessageBuffer);
delete bigMessageBuffer;
}
#endif
else
{
messageBuffer[255] = '\0';
- logWriter->log(0, pid, messageBuffer);
+ logWriter->log(0, tid, messageBuffer);
}
va_end(variableArguments);
}
@@ -189,6 +196,8 @@
{
va_list variableArguments;
va_start(variableArguments, msg);
+ char tid[21];
+ formatThreadID(tid);
char messageBuffer[256];
int size = vsnprintf(messageBuffer, 255, msg,
variableArguments);
#if defined(WIN32) || defined (_WINDOWS)
@@ -198,7 +207,7 @@
char* bigMessageBuffer = new char[size+1];
vsnprintf(bigMessageBuffer, size, msg,
variableArguments);
bigMessageBuffer[size] = '\0';
- logWriter->log(1, pid, bigMessageBuffer);
+ logWriter->log(1, tid, bigMessageBuffer);
delete bigMessageBuffer;
}
#else
@@ -207,14 +216,14 @@
char* bigMessageBuffer = new char[size+1];
vsnprintf(bigMessageBuffer, size, msg,
variableArguments);
bigMessageBuffer[size] = '\0';
- logWriter->log(1, pid, bigMessageBuffer);
+ logWriter->log(1, tid, bigMessageBuffer);
delete bigMessageBuffer;
}
#endif
else
{
messageBuffer[255] = '\0';
- logWriter->log(1, pid, messageBuffer);
+ logWriter->log(1, tid, messageBuffer);
}
va_end(variableArguments);
}
@@ -225,6 +234,8 @@
{
va_list variableArguments;
va_start(variableArguments, msg);
+ char tid[21];
+ formatThreadID(tid);
char messageBuffer[256];
int size = vsnprintf(messageBuffer, 255, msg,
variableArguments);
#if defined(WIN32) || defined (_WINDOWS)
@@ -234,7 +245,7 @@
char* bigMessageBuffer = new char[size+1];
vsnprintf(bigMessageBuffer, size, msg,
variableArguments);
bigMessageBuffer[size] = '\0';
- logWriter->log(2, pid, bigMessageBuffer);
+ logWriter->log(2, tid, bigMessageBuffer);
delete bigMessageBuffer;
}
#else
@@ -243,14 +254,14 @@
char* bigMessageBuffer = new char[size+1];
vsnprintf(bigMessageBuffer, size, msg,
variableArguments);
bigMessageBuffer[size] = '\0';
- logWriter->log(2, pid, bigMessageBuffer);
+ logWriter->log(2, tid, bigMessageBuffer);
delete bigMessageBuffer;
}
#endif
else
{
messageBuffer[255] = '\0';
- logWriter->log(2, pid, messageBuffer);
+ logWriter->log(2, tid, messageBuffer);
}
va_end(variableArguments);
}
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.h
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.h?view=diff&rev=492637&r1=492636&r2=492637
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.h
(original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.h Thu
Jan 4 08:56:45 2007
@@ -81,11 +81,6 @@
static LogWriter* logWriter;
/**
- * The current process ID
- */
- static char* pid;
-
- /**
* Get the current log writer.
* @return The current log writer.
*/
@@ -96,6 +91,11 @@
*/
static int setLogging();
+ /**
+ * Print the current thread id into the given char buffer.
+ */
+ static void formatThreadID(char* tid);
+
/**
* Message buffer
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
