Changeset 5925 for branches/newapi

Timestamp:

12/03/07 07:51:06 (12 months ago)

Author:

erijo

Message:

Added class Licq::Thread::Current with method exit for operating on calling thread.

Location:

branches/newapi/licq

Files:

• licq/thread/thread.h (modified) (1 diff)
• src/thread/thread.cpp (modified) (4 diffs)

branches/newapi/licq/licq/thread/thread.h

@@ -73 +73 @@
   };
 
+  class Current
+  {
+  public:
+    /**
+     * Exits the calling thread.
+     *
+     * @param status The thread's exit status.
+     */
+    static void exit(int status) LICQ_NO_RETURN;
+  };
+
   class Entry
   {

branches/newapi/licq/src/thread/thread.cpp

@@ -32 +32 @@
 #include <signal.h>
 
+void Licq::Thread::Current::exit(int status)
+{
+  ::pthread_exit(reinterpret_cast<void*>(status));
+}
+
 void Licq::Thread::Entry::exit(int status)
 {
-  ::pthread_exit(new int(status));
+  Licq::Thread::Current::exit(status);
 }
 
@@ -131 +136 @@
   static void* threadStartRoutine(void* arg)
   {
+    // Unblock SIGTERM
+    sigset_t mask;
+    sigemptyset(&mask);
+    sigaddset(&mask, SIGTERM);
+    DBG(const int error =) ::pthread_sigmask(SIG_UNBLOCK, &mask, NULL);
+    assert(error == 0);
+
     Licq::Thread::Entry* entry = static_cast<Licq::Thread::Entry*>(arg);
     int ret = -1;
@@ -141 +153 @@
       // Empty
     }
-    return new int(ret);
+    return reinterpret_cast<void*>(ret);
   }
 
@@ -186 +198 @@
     {
       myState = StateJoined;
-      int* iret = static_cast<int*>(ret);
-      int status = *iret;
-      delete iret;
-      return status;
+      return reinterpret_cast<int>(ret);
     }
   }