Merge pull request #1352 from p12tic/cleanup-callbacks

Cleanup internal callback APIs

src/lib/arch/IArchMultithread.h

@@ -19,6 +19,7 @@
 #pragma once
 
 #include "common/IInterface.h"
+#include <functional>
 
 /*!
 \class ArchCondImpl
@@ -71,7 +72,7 @@ barrier.  Each architecture must implement this interface.
 class IArchMultithread : public IInterface {
 public:
     //! Type of thread entry point
-    typedef void* (*ThreadFunc)(void*);
+    typedef void (*ThreadFunc)(void*);
     //! Type of thread identifier
     typedef unsigned int ThreadID;
     //! Types of signals
@@ -160,7 +161,7 @@ class IArchMultithread : public IInterface {
     Creates and starts a new thread, using \c func as the entry point
     and passing it \c userData.  The thread is an opaque data type.
     */
-    virtual ArchThread    newThread(ThreadFunc func, void* userData) = 0;
+    virtual ArchThread newThread(const std::function<void()>& func) = 0;
 
     //! Get a reference to the calling thread
     /*!
@@ -235,15 +236,6 @@ class IArchMultithread : public IInterface {
     */
     virtual bool        isExitedThread(ArchThread thread) = 0;
 
-    //! Returns the exit code of a thread
-    /*!
-    Waits indefinitely for \c thread to exit (if it hasn't yet) then
-    returns the thread's exit code.
-
-    (Cancellation point)
-    */
-    virtual void*        getResultOfThread(ArchThread thread) = 0;
-
     //! Returns an ID for a thread
     /*!
     Returns some ID number for \c thread.  This is for logging purposes.

src/lib/arch/unix/ArchMultithreadPosix.cpp

@@ -59,24 +59,19 @@ class ArchThreadImpl {
     int                    m_refCount;
     IArchMultithread::ThreadID        m_id;
     pthread_t            m_thread;
-    IArchMultithread::ThreadFunc    m_func;
-    void*                m_userData;
+    std::function<void()> func_;;
     bool                m_cancel;
     bool                m_cancelling;
     bool                m_exited;
-    void*                m_result;
     void*                m_networkData;
 };
 
 ArchThreadImpl::ArchThreadImpl() :
     m_refCount(1),
     m_id(0),
-    m_func(NULL),
-    m_userData(NULL),
     m_cancel(false),
     m_cancelling(false),
     m_exited(false),
-    m_result(NULL),
     m_networkData(NULL)
 {
     // do nothing
@@ -319,11 +314,8 @@ ArchMultithreadPosix::unlockMutex(ArchMutex mutex)
     }
 }
 
-ArchThread
-ArchMultithreadPosix::newThread(ThreadFunc func, void* data)
+ArchThread ArchMultithreadPosix::newThread(const std::function<void()>& func)
 {
-    assert(func != NULL);
-
     // initialize signal handler.  we do this here instead of the
     // constructor so we can avoid daemonizing (using fork())
     // when there are multiple threads.  clients can safely
@@ -341,8 +333,7 @@ ArchMultithreadPosix::newThread(ThreadFunc func, void* data)
 
     // create thread impl for new thread
     ArchThreadImpl* thread = new ArchThreadImpl;
-    thread->m_func          = func;
-    thread->m_userData      = data;
+    thread->func_ = func;
 
     // create the thread.  pthread_create() on RedHat 7.2 smp fails
     // if passed a NULL attr so use a default attr.
@@ -389,7 +380,7 @@ ArchMultithreadPosix::closeThread(ArchThread thread)
     // decrement ref count and clean up thread if no more references
     if (--thread->m_refCount == 0) {
         // detach from thread (unless it's the main thread)
-        if (thread->m_func != NULL) {
+        if (thread->func_) {
             pthread_detach(thread->m_thread);
         }
 
@@ -526,13 +517,6 @@ ArchMultithreadPosix::isExitedThread(ArchThread thread)
     return thread->m_exited;
 }
 
-void*
-ArchMultithreadPosix::getResultOfThread(ArchThread thread)
-{
-    std::lock_guard<std::mutex> lock(m_threadMutex);
-    return thread->m_result;
-}
-
 IArchMultithread::ThreadID
 ArchMultithreadPosix::getIDOfThread(ArchThread thread)
 {
@@ -699,10 +683,8 @@ ArchMultithreadPosix::doThreadFunc(ArchThread thread)
         std::lock_guard<std::mutex> lock(m_threadMutex);
     }
 
-    void* result = NULL;
     try {
-        // go
-        result = (*thread->m_func)(thread->m_userData);
+        thread->func_();
     }
 
     catch (XThreadCancel&) {
@@ -721,7 +703,6 @@ ArchMultithreadPosix::doThreadFunc(ArchThread thread)
     // thread has exited
     {
         std::lock_guard<std::mutex> lock(m_threadMutex);
-        thread->m_result = result;
         thread->m_exited = true;
     }
 

src/lib/arch/unix/ArchMultithreadPosix.h

@@ -67,7 +67,7 @@ class ArchMultithreadPosix : public IArchMultithread {
     virtual void        closeMutex(ArchMutex);
     virtual void        lockMutex(ArchMutex);
     virtual void        unlockMutex(ArchMutex);
-    virtual ArchThread    newThread(ThreadFunc, void*);
+    virtual ArchThread newThread(const std::function<void()>& func);
     virtual ArchThread    newCurrentThread();
     virtual ArchThread    copyThread(ArchThread);
     virtual void        closeThread(ArchThread);
@@ -77,7 +77,6 @@ class ArchMultithreadPosix : public IArchMultithread {
     virtual bool        wait(ArchThread, double timeout);
     virtual bool        isSameThread(ArchThread, ArchThread);
     virtual bool        isExitedThread(ArchThread);
-    virtual void*        getResultOfThread(ArchThread);
     virtual ThreadID    getIDOfThread(ArchThread);
     virtual void        setSignalHandler(ESignal, SignalFunc, void*);
     virtual void        raiseSignal(ESignal);

src/lib/arch/win32/ArchMultithreadWindows.cpp

@@ -49,23 +49,18 @@ class ArchThreadImpl {
     int                    m_refCount;
     HANDLE                m_thread;
     DWORD                m_id;
-    IArchMultithread::ThreadFunc    m_func;
-    void*                m_userData;
+    std::function<void()> func_;
     HANDLE                m_cancel;
     bool                m_cancelling;
     HANDLE                m_exit;
-    void*                m_result;
     void*                m_networkData;
 };
 
 ArchThreadImpl::ArchThreadImpl() :
     m_refCount(1),
     m_thread(NULL),
     m_id(0),
-    m_func(NULL),
-    m_userData(NULL),
     m_cancelling(false),
-    m_result(NULL),
     m_networkData(NULL)
 {
     m_exit   = CreateEvent(NULL, TRUE, FALSE, NULL);
@@ -292,15 +287,13 @@ ArchMultithreadWindows::unlockMutex(ArchMutex mutex)
     LeaveCriticalSection(&mutex->m_mutex);
 }
 
-ArchThread
-ArchMultithreadWindows::newThread(ThreadFunc func, void* data)
+ArchThread ArchMultithreadWindows::newThread(const std::function<void()>& func)
 {
     lockMutex(m_threadMutex);
 
     // create thread impl for new thread
     ArchThreadImpl* thread = new ArchThreadImpl;
-    thread->m_func          = func;
-    thread->m_userData      = data;
+    thread->func_ = func;
 
     // create thread
     unsigned int id = 0;
@@ -523,15 +516,6 @@ ArchMultithreadWindows::isExitedThread(ArchThread thread)
     return (WaitForSingleObject(thread->m_exit, 0) == WAIT_OBJECT_0);
 }
 
-void*
-ArchMultithreadWindows::getResultOfThread(ArchThread thread)
-{
-    lockMutex(m_threadMutex);
-    void* result = thread->m_result;
-    unlockMutex(m_threadMutex);
-    return result;
-}
-
 IArchMultithread::ThreadID
 ArchMultithreadWindows::getIDOfThread(ArchThread thread)
 {
@@ -678,10 +662,8 @@ ArchMultithreadWindows::doThreadFunc(ArchThread thread)
     lockMutex(m_threadMutex);
     unlockMutex(m_threadMutex);
 
-    void* result = NULL;
     try {
-        // go
-        result = (*thread->m_func)(thread->m_userData);
+        thread->func_();
     }
 
     catch (XThreadCancel&) {
@@ -695,9 +677,6 @@ ArchMultithreadWindows::doThreadFunc(ArchThread thread)
     }
 
     // thread has exited
-    lockMutex(m_threadMutex);
-    thread->m_result = result;
-    unlockMutex(m_threadMutex);
     SetEvent(thread->m_exit);
 
     // done with thread

src/lib/arch/win32/ArchMultithreadWindows.h

@@ -73,7 +73,7 @@ class ArchMultithreadWindows : public IArchMultithread {
     virtual void        closeMutex(ArchMutex);
     virtual void        lockMutex(ArchMutex);
     virtual void        unlockMutex(ArchMutex);
-    virtual ArchThread    newThread(ThreadFunc, void*);
+    virtual ArchThread newThread(const std::function<void()>& func);
     virtual ArchThread    newCurrentThread();
     virtual ArchThread    copyThread(ArchThread);
     virtual void        closeThread(ArchThread);
@@ -83,7 +83,6 @@ class ArchMultithreadWindows : public IArchMultithread {
     virtual bool        wait(ArchThread, double timeout);
     virtual bool        isSameThread(ArchThread, ArchThread);
     virtual bool        isExitedThread(ArchThread);
-    virtual void*        getResultOfThread(ArchThread);
     virtual ThreadID    getIDOfThread(ArchThread);
     virtual void        setSignalHandler(ESignal, SignalFunc, void*);
     virtual void        raiseSignal(ESignal);

src/lib/arch/win32/ArchTaskBarWindows.cpp

@@ -88,7 +88,7 @@ ArchTaskBarWindows::init()
     // create a window on the current desktop with the current
     // thread then the current thread won't be able to switch
     // desktops if it needs to.
-    m_thread      = ARCH->newThread(&ArchTaskBarWindows::threadEntry, this);
+    m_thread = ARCH->newThread([this]() { threadMainLoop(); });
 
     // wait for child thread
     while (!m_ready) {
@@ -501,13 +501,6 @@ ArchTaskBarWindows::threadMainLoop()
     UnregisterClass(className, instanceWin32());
 }
 
-void*
-ArchTaskBarWindows::threadEntry(void* self)
-{
-    static_cast<ArchTaskBarWindows*>(self)->threadMainLoop();
-    return NULL;
-}
-
 HINSTANCE ArchTaskBarWindows::instanceWin32()
 {
     return ArchMiscWindows::instanceWin32();

src/lib/arch/win32/ArchTaskBarWindows.h

@@ -84,7 +84,6 @@ class ArchTaskBarWindows : public IArchTaskBar {
     static LRESULT CALLBACK
                         staticWndProc(HWND, UINT, WPARAM, LPARAM);
     void                threadMainLoop();
-    static void*        threadEntry(void*);
 
     HINSTANCE            instanceWin32();
 

src/lib/barrier/App.cpp

@@ -34,7 +34,6 @@
 
 #if SYSAPI_WIN32
 #include "base/IEventQueue.h"
-#include "base/TMethodJob.h"
 #endif
 
 #include <iostream>
@@ -229,8 +228,7 @@ App::handleIpcMessage(const Event& e, void*)
     }
 }
 
-void
-App::runEventsLoop(void*)
+void App::run_events_loop()
 {
     m_events->loop();
 

src/lib/barrier/App.h

@@ -108,7 +108,7 @@ class App : public IApp {
 protected:
     void                initIpcClient();
     void                cleanupIpcClient();
-    void                runEventsLoop(void*);
+    void run_events_loop();
 
     IArchTaskBarReceiver* m_taskBarReceiver;
     bool m_suspended;

src/lib/barrier/ClientApp.cpp

@@ -37,7 +37,6 @@
 #include "base/TMethodEventJob.h"
 #include "base/log_outputters.h"
 #include "base/EventQueue.h"
-#include "base/TMethodJob.h"
 #include "base/Log.h"
 #include "common/Version.h"
 
@@ -465,10 +464,7 @@ ClientApp::mainLoop()
 
 #if defined(MAC_OS_X_VERSION_10_7)
 
-    Thread thread(
-        new TMethodJob<ClientApp>(
-            this, &ClientApp::runEventsLoop,
-            NULL));
+    Thread thread([this](){ run_events_loop(); });
 
     // wait until carbon loop is ready
     OSXScreen* screen = dynamic_cast<OSXScreen*>(

src/lib/barrier/ClientApp.h

@@ -24,7 +24,6 @@ namespace barrier { class Screen; }
 class Event;
 class Client;
 class NetworkAddress;
-class Thread;
 class ClientArgs;
 
 class ClientApp : public App {

src/lib/barrier/ServerApp.cpp

@@ -34,7 +34,6 @@
 #include "base/EventQueue.h"
 #include "base/log_outputters.h"
 #include "base/FunctionEventJob.h"
-#include "base/TMethodJob.h"
 #include "base/IEventQueue.h"
 #include "base/Log.h"
 #include "base/TMethodEventJob.h"
@@ -797,10 +796,7 @@ ServerApp::mainLoop()
 
 #if defined(MAC_OS_X_VERSION_10_7)
 
-    Thread thread(
-        new TMethodJob<ServerApp>(
-            this, &ServerApp::runEventsLoop,
-            NULL));
+    Thread thread([this](){ run_events_loop(); });
 
     // wait until carbon loop is ready
     OSXScreen* screen = dynamic_cast<OSXScreen*>(

src/lib/barrier/StreamChunker.cpp

@@ -42,14 +42,13 @@ bool StreamChunker::s_interruptFile = false;
 Mutex* StreamChunker::s_interruptMutex = NULL;
 
 void
-StreamChunker::sendFile(
-                char* filename,
+StreamChunker::sendFile(const char* filename,
                 IEventQueue* events,
                 void* eventTarget)
 {
     s_isChunkingFile = true;
 
-    std::fstream file(static_cast<char*>(filename), std::ios::in | std::ios::binary);
+    std::fstream file(filename, std::ios::in | std::ios::binary);
 
     if (!file.is_open()) {
         throw runtime_error("failed to open file");

src/lib/barrier/StreamChunker.h

@@ -25,10 +25,7 @@ class Mutex;
 
 class StreamChunker {
 public:
-    static void            sendFile(
-                            char* filename,
-                            IEventQueue* events,
-                            void* eventTarget);
+    static void sendFile(const char* filename, IEventQueue* events, void* eventTarget);
     static void            sendClipboard(
                             String& data,
                             size_t size,

src/lib/barrier/win32/DaemonApp.cpp

@@ -28,7 +28,6 @@
 #include "net/SocketMultiplexer.h"
 #include "arch/XArch.h"
 #include "base/Log.h"
-#include "base/TMethodJob.h"
 #include "base/TMethodEventJob.h"
 #include "base/EventQueue.h"
 #include "base/log_outputters.h"