aboutsummaryrefslogtreecommitdiff
path: root/src/threads
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2010-09-06 16:52:14 +0200
committerAris Adamantiadis <aris@0xbadc0de.be>2010-09-06 16:52:14 +0200
commit49f57a8d0dcf990169e2f591a937672f74ffa4a9 (patch)
treee8f872af3dd4f0c7d02ef47e214f016747396c23 /src/threads
parentfbe102bada583f308450c27e256053b51643a532 (diff)
downloadlibssh-49f57a8d0dcf990169e2f591a937672f74ffa4a9.tar.gz
libssh-49f57a8d0dcf990169e2f591a937672f74ffa4a9.tar.xz
libssh-49f57a8d0dcf990169e2f591a937672f74ffa4a9.zip
Implemented the noop and native pointers
Diffstat (limited to 'src/threads')
-rw-r--r--src/threads/CMakeLists.txt1
-rw-r--r--src/threads/native.c4
-rw-r--r--src/threads/pthread.c88
3 files changed, 52 insertions, 41 deletions
diff --git a/src/threads/CMakeLists.txt b/src/threads/CMakeLists.txt
index 1cf3d7b1..2cebb416 100644
--- a/src/threads/CMakeLists.txt
+++ b/src/threads/CMakeLists.txt
@@ -33,7 +33,6 @@ set(LIBSSH_THREADS_LINK_LIBRARIES
)
set(libssh_threads_SRCS
- native.c
)
# build and link pthread
diff --git a/src/threads/native.c b/src/threads/native.c
deleted file mode 100644
index c65c18e4..00000000
--- a/src/threads/native.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "config.h"
-#include <libssh/callbacks.h>
-
-struct ssh_threads_callbacks_struct ssh_pthread_callbacks;
diff --git a/src/threads/pthread.c b/src/threads/pthread.c
index 35589cc7..0fc0b110 100644
--- a/src/threads/pthread.c
+++ b/src/threads/pthread.c
@@ -45,43 +45,59 @@
* callbacks for threading
*
*/
-#define SSH_THREADS_PTHREAD(name) \
-static int ssh_pthread_mutex_init (void **priv){ \
- int err = 0; \
- *priv = malloc (sizeof (pthread_mutex_t)); \
- if (*priv==NULL) \
- return ENOMEM; \
- err = pthread_mutex_init (*priv, NULL); \
- if (err != 0){ \
- free (*priv); \
- *priv=NULL; \
- } \
- return err; \
-} \
-static int ssh_pthread_mutex_destroy (void **lock) { \
- int err = pthread_mutex_destroy (*lock); \
- free (*lock); \
- *lock=NULL; \
- return err; \
-} \
-static int ssh_pthread_mutex_lock (void **lock) { \
- return pthread_mutex_lock (*lock); \
-} \
-static int ssh_pthread_mutex_unlock (void **lock){ \
- return pthread_mutex_unlock (*lock); \
-} \
-static unsigned long ssh_pthread_thread_id (void){ \
- return (unsigned long) pthread_self(); \
-} \
-static struct ssh_threads_callbacks_struct name= \
-{ \
- .mutex_init=ssh_pthread_mutex_init, \
- .mutex_destroy=ssh_pthread_mutex_destroy, \
- .mutex_lock=ssh_pthread_mutex_lock, \
- .mutex_unlock=ssh_pthread_mutex_unlock, \
- .thread_id=ssh_pthread_thread_id \
+
+static int ssh_pthread_mutex_init (void **priv){
+ int err = 0;
+ *priv = malloc (sizeof (pthread_mutex_t));
+ if (*priv==NULL)
+ return ENOMEM;
+ err = pthread_mutex_init (*priv, NULL);
+ if (err != 0){
+ free (*priv);
+ *priv=NULL;
+ }
+ return err;
+}
+
+static int ssh_pthread_mutex_destroy (void **lock) {
+ int err = pthread_mutex_destroy (*lock);
+ free (*lock);
+ *lock=NULL;
+ return err;
+}
+
+static int ssh_pthread_mutex_lock (void **lock) {
+ return pthread_mutex_lock (*lock);
}
-SSH_THREADS_PTHREAD(ssh_pthread_user_callbacks);
+static int ssh_pthread_mutex_unlock (void **lock){
+ return pthread_mutex_unlock (*lock);
+}
+
+static unsigned long ssh_pthread_thread_id (void){
+ return (unsigned long) pthread_self();
+}
+
+struct ssh_threads_callbacks_struct ssh_threads_pthread =
+{
+ .type=ssh_threads_type_pthread,
+ .mutex_init=ssh_pthread_mutex_init,
+ .mutex_destroy=ssh_pthread_mutex_destroy,
+ .mutex_lock=ssh_pthread_mutex_lock,
+ .mutex_unlock=ssh_pthread_mutex_unlock,
+ .thread_id=ssh_pthread_thread_id
+};
+
+#ifdef THREAD_NATIVE_PTHREAD
+struct ssh_threads_callbacks_struct ssh_threads_native =
+{
+ .type=ssh_threads_type_pthread,
+ .mutex_init=ssh_pthread_mutex_init,
+ .mutex_destroy=ssh_pthread_mutex_destroy,
+ .mutex_lock=ssh_pthread_mutex_lock,
+ .mutex_unlock=ssh_pthread_mutex_unlock,
+ .thread_id=ssh_pthread_thread_id
+};
+#endif
#endif /* HAVE_PTHREAD */