Changeset 5896 for branches/newapi

Timestamp:

12/02/07 02:11:45 (12 months ago)

Author:

erijo

Message:

Added functions for setting and getting the thread's log instance.

Location:

branches/newapi/licq/src/util

Files:

• log.cpp (modified) (2 diffs)
• log.h (modified) (1 diff)

branches/newapi/licq/src/util/log.cpp

@@ -19 +19 @@
 
 #include "licq/interface/logsink.h"
+#include "licq/thread/threadspecific.h"
 #include "util/log.h"
+#include "util/tr.h"
 
 #include <cassert>
@@ -25 +27 @@
 #include <time.h>
 
+static Licq::ThreadSpecific<LicqDaemon::Log> ThreadLogs;
+
 LicqDaemon::Log::Log(const std::string& owner, Licq::LogSink* sink)
   : myOwner(owner), mySink(sink)
 {
   assert(mySink != NULL);
+}
+
+void LicqDaemon::Log::setThreadLog(const Log* log)
+{
+  if (ThreadLogs.hasData())
+  {
+    ThreadLogs.getData()->fatal() <<
+        tr("LicqDaemon::Log::setThreadLog called more than once");
+    ::abort();
+  }
+  ThreadLogs.setData(log);
+}
+
+LicqDaemon::Log* LicqDaemon::Log::getThreadLog()
+{
+  assert(ThreadLogs.hasData());
+  return ThreadLogs.getData();
 }
 

branches/newapi/licq/src/util/log.h

@@ -44 +44 @@
   Log(const std::string& owner, Licq::LogSink* sink);
 
+  /**
+   * Makes @a log the default log for the calling thread. @a log will
+   * be automatically deleted when the thread exits. This method may
+   * only be called once per thread.
+   *
+   * @see getThreadLog()
+   */
+  static void setThreadLog(const Log* log);
+
+  /**
+   * @returns The default log for the calling thread. setThreadLog()
+   * must have been called by the calling thread before calling this
+   * method.
+   *
+   * @see setThreadLog()
+   */
+  static Log* getThreadLog();
+
   // From Licq::Log
   void log(Level level, const std::string& msg);