You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/11/18 05:06:17 UTC
svn commit: r476436 - in
/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util:
DefaultLogWriter.cpp DefaultLogWriter.h FileLogWriter.cpp FileLogWriter.h
LogWriter.h Logger.cpp Logger.h Logging.h
Author: jsdelfino
Date: Fri Nov 17 20:06:17 2006
New Revision: 476436
URL: http://svn.apache.org/viewvc?view=rev&rev=476436
Log:
Fixed logentry to handle the exit of a method correctly, and added the current process id to the trace.
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
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logging.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=476436&r1=476435&r2=476436
==============================================================================
--- 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 Fri Nov 17 20:06:17 2006
@@ -31,8 +31,9 @@
{
}
- void DefaultLogWriter::log(int level, const char* msg)
+ void DefaultLogWriter::log(int level, const char* pid, const char* msg)
{
+ cout << pid << " ";
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=476436&r1=476435&r2=476436
==============================================================================
--- 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 Fri Nov 17 20:06:17 2006
@@ -40,7 +40,7 @@
* Will write to the console.
* See LogWriter#log.
*/
- virtual void log(int level, const char* msg);
+ virtual void log(int level, const char* pid, const char* msg);
};
} // End namespace sca
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=476436&r1=476435&r2=476436
==============================================================================
--- 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 Fri Nov 17 20:06:17 2006
@@ -37,8 +37,9 @@
logFile.close();
}
- void FileLogWriter::log(int level, const char* msg)
+ void FileLogWriter::log(int level, const char*pid, const char* msg)
{
+ logFile << pid << " ";
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=476436&r1=476435&r2=476436
==============================================================================
--- 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 Fri Nov 17 20:06:17 2006
@@ -45,7 +45,7 @@
* Will write to the console.
* See LogWriter#log.
*/
- virtual void log(int level, const char* msg);
+ virtual void log(int level, const char* pid, const char* msg);
private:
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=476436&r1=476435&r2=476436
==============================================================================
--- 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 Fri Nov 17 20:06:17 2006
@@ -39,9 +39,10 @@
/**
* Log a message.
* @param level The level of logging for this message.
+ * @param pid The current process id.
* @param msg The message to log.
*/
- virtual void log(int level, const char* msg) = 0;
+ virtual void log(int level, const char* pid, const char* msg) = 0;
};
} // End namespace sca
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=476436&r1=476435&r2=476436
==============================================================================
--- 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 Fri Nov 17 20:06:17 2006
@@ -33,12 +33,17 @@
namespace sca
{
LogWriter* Logger::logWriter = getLogWriter();
+
+ char* Logger::pid = NULL;
LogWriter* Logger::getLogWriter()
{
if (logWriter == 0)
{
setLogWriter(0);
+
+ pid = new char[10];
+ sprintf(pid, "%d", getpid());
}
return logWriter;
}
@@ -87,7 +92,7 @@
{
if (level <= loggingLevel)
{
- logWriter->log(level, msg);
+ logWriter->log(level, pid, msg);
}
}
@@ -99,7 +104,7 @@
va_start(variableArguments, msg);
char messageBuffer[1024];
vsprintf(messageBuffer, msg, variableArguments);
- logWriter->log(level, messageBuffer);
+ logWriter->log(level, pid, messageBuffer);
va_end(variableArguments);
}
}
@@ -112,7 +117,7 @@
va_start(variableArguments, msg);
char messageBuffer[1024];
vsprintf(messageBuffer, msg, variableArguments);
- logWriter->log(0, messageBuffer);
+ logWriter->log(0, pid, messageBuffer);
va_end(variableArguments);
}
}
@@ -124,7 +129,7 @@
va_start(variableArguments, msg);
char messageBuffer[1024];
vsprintf(messageBuffer, msg, variableArguments);
- logWriter->log(1, messageBuffer);
+ logWriter->log(1, pid, messageBuffer);
va_end(variableArguments);
}
}
@@ -136,7 +141,7 @@
va_start(variableArguments, msg);
char messageBuffer[1024];
vsprintf(messageBuffer, msg, variableArguments);
- logWriter->log(2, messageBuffer);
+ logWriter->log(2, pid, 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=476436&r1=476435&r2=476436
==============================================================================
--- 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 Fri Nov 17 20:06:17 2006
@@ -76,6 +76,11 @@
* The current log writer.
*/
static LogWriter* logWriter;
+
+ /**
+ * The current process ID
+ */
+ static char* pid;
/**
* Get the current log writer.
@@ -91,21 +96,23 @@
class LogEntry
{
- };
-
- class EnabledLogEntry : public LogEntry
- {
public:
- EnabledLogEntry(const char* func)
+ LogEntry(const char* func)
: funcName(func)
{
- Logger::logArgs(2, ">> %s", funcName);
+ if (tuscany::sca::Logger::loggingLevel >= 2)
+ {
+ Logger::logArgs(2, ">> %s", funcName);
+ }
}
- ~EnabledLogEntry()
+ ~LogEntry()
{
- tuscany::sca::Logger::logArgs(2, "<< %s", funcName);
+ if (tuscany::sca::Logger::loggingLevel >= 2)
+ {
+ tuscany::sca::Logger::logArgs(2, "<< %s", funcName);
+ }
}
private:
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logging.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logging.h?view=diff&rev=476436&r1=476435&r2=476436
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logging.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logging.h Fri Nov 17 20:06:17 2006
@@ -26,10 +26,10 @@
#if defined(WIN32) || defined (_WINDOWS)
#define logentry() \
-const LogEntry& __LOGENTRY__ = tuscany::sca::Logger::loggingLevel >= 2 ? tuscany::sca::EnabledLogEntry(__FUNCTION__) : tuscany::sca::LogEntry()
+const tuscany::sca::LogEntry __LOGENTRY__(__FUNCTION__)
#else
#define logentry() \
-const LogEntry& __LOGENTRY__ = tuscany::sca::Logger::loggingLevel >= 2 ? tuscany::sca::EnabledLogEntry(__PRETTY_FUNCTION__) : tuscany::sca::LogEntry()
+const tuscany::sca::LogEntry __LOGENTRY__(__PRETTY_FUNCTION__)
#endif
#define loginfo \
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org