From 5749a18faea208ad19f39612c3c55166ca409fef Mon Sep 17 00:00:00 2001
From: Martin Lucina <martin@lucina.net>
Date: Tue, 13 Mar 2012 12:19:31 +0100
Subject: xs_utils cleanup 1/2 (minimize exported api)

Reduced xs_utils to the minimum functions required (xs_stopwatch_*)
xs_sleep, xs_thread_* are internal to unit tests and have been moved
to testutil.hpp, useless use of xs_sleep in perf/ has been removed.

Signed-off-by: Martin Lucina <martin@lucina.net>
---
 src/xs_utils.cpp | 96 --------------------------------------------------------
 src/xszmq.cpp    | 16 ++++++++--
 2 files changed, 14 insertions(+), 98 deletions(-)

(limited to 'src')

diff --git a/src/xs_utils.cpp b/src/xs_utils.cpp
index d10efbc..d2fe755 100644
--- a/src/xs_utils.cpp
+++ b/src/xs_utils.cpp
@@ -29,22 +29,6 @@
 #include "clock.hpp"
 #include "err.hpp"
 
-#if !defined XS_HAVE_WINDOWS
-#include <unistd.h>
-#include <pthread.h>
-#else
-#include "windows.hpp"
-#endif
-
-void xs_sleep (int seconds_)
-{
-#if defined XS_HAVE_WINDOWS
-    Sleep (seconds_ * 1000);
-#else
-    sleep (seconds_);
-#endif
-}
-
 void *xs_stopwatch_start ()
 {
     uint64_t *watch = (uint64_t*) malloc (sizeof (uint64_t));
@@ -61,83 +45,3 @@ unsigned long xs_stopwatch_stop (void *watch_)
     return (unsigned long) (end - start);
 }
 
-#if defined XS_HAVE_WINDOWS
-
-struct arg_t
-{
-    HANDLE handle;
-    void (*fn) (void *arg);
-    void *arg;
-};
-
-extern "C"
-{
-    static unsigned int __stdcall thread_routine (void *arg_)
-    {
-        arg_t *arg = (arg_t*) arg_;
-        arg->fn (arg->arg);
-        return 0;
-    }
-}
-
-void *xs_thread_create (void (*fn_) (void *arg_), void *arg_)
-{
-    arg_t *arg = (arg_t*) malloc (sizeof (arg_t));
-    alloc_assert (arg);
-    arg->fn = fn_;
-    arg->arg = arg_;
-    arg->handle = (HANDLE) _beginthreadex (NULL, 0,
-        &::thread_routine, (void*) arg, 0 , NULL);
-    win_assert (arg->handle != NULL);
-    return (void*) arg;
-}
-
-void xs_thread_join (void *thread_)
-{
-    arg_t *arg = (arg_t*) thread_;
-    DWORD rc = WaitForSingleObject (arg->handle, INFINITE);
-    win_assert (rc != WAIT_FAILED);
-    BOOL rc2 = CloseHandle (arg->handle);
-    win_assert (rc2 != 0);
-    free (arg);
-}
-
-#else
-
-struct arg_t
-{
-    pthread_t handle;
-    void (*fn) (void *arg);
-    void *arg;
-};
-
-extern "C"
-{
-    static void *thread_routine (void *arg_)
-    {
-        arg_t *arg = (arg_t*) arg_;
-        arg->fn (arg->arg);
-        return NULL;
-    }
-}
-
-void *xs_thread_create (void (*fn_) (void *arg_), void *arg_)
-{
-    arg_t *arg = (arg_t*) malloc (sizeof (arg_t));
-    alloc_assert (arg);
-    arg->fn = fn_;
-    arg->arg = arg_;
-    int rc = pthread_create (&arg->handle, NULL, thread_routine, (void*) arg);
-    posix_assert (rc);
-    return (void*) arg;
-}
-
-void xs_thread_join (void *thread_)
-{
-    arg_t *arg = (arg_t*) thread_;
-    int rc = pthread_join (arg->handle, NULL);
-    posix_assert (rc);
-    free (arg);
-}
-
-#endif
diff --git a/src/xszmq.cpp b/src/xszmq.cpp
index 350929d..b1f892a 100644
--- a/src/xszmq.cpp
+++ b/src/xszmq.cpp
@@ -25,10 +25,18 @@
 #include "../include/xs.h"
 #include "../include/xs_utils.h"
 
+#include "platform.hpp"
+
 #include <assert.h>
 #include <stdlib.h>
 #include <stdint.h>
 
+#if !defined XS_HAVE_WINDOWS
+#include <unistd.h>
+#else
+#include <windows.hpp>
+#endif
+
 void zmq_version (int *major_, int *minor_, int *patch_)
 {
     *major_ = ZMQ_VERSION_MAJOR;
@@ -451,8 +459,12 @@ unsigned long zmq_stopwatch_stop (void *watch)
     return xs_stopwatch_stop (watch);
 }
 
-void zmq_sleep (int seconds)
+void zmq_sleep (int seconds_)
 {
-    xs_sleep (seconds);
+#if defined XS_HAVE_WINDOWS
+    Sleep (seconds_ * 1000);
+#else
+    sleep (seconds_);
+#endif
 }
 
-- 
cgit v1.2.3