From f51b01a5b3b6fb4a75afa18303556fbccbc31403 Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Fri, 23 Jun 2017 17:58:02 +0300 Subject: [PATCH] Remove unused mutex wrappers --- src/thread.c | 116 --------------------------------------------------- src/thread.h | 40 ------------------ 2 files changed, 156 deletions(-) delete mode 100644 src/thread.c delete mode 100644 src/thread.h diff --git a/src/thread.c b/src/thread.c deleted file mode 100644 index 07fcf4a..0000000 --- a/src/thread.c +++ /dev/null @@ -1,116 +0,0 @@ -/* thread.c -** strophe XMPP client library -- thread abstraction -** -** Copyright (C) 2005-2009 Collecta, Inc. -** -** This software is provided AS-IS with no warranty, either express -** or implied. -** -** This program is dual licensed under the MIT and GPLv3 licenses. -*/ - -/** @file - * Thread absraction. - */ - -#include -#include - -#ifdef _WIN32 -#define WIN32_LEAN_AND_MEAN -#include -#else -#include -#endif - -#include "strophe.h" -#include "common.h" -#include "thread.h" - -struct _mutex_t { - const xmpp_ctx_t *ctx; - -#ifdef _WIN32 - HANDLE mutex; -#else - pthread_mutex_t *mutex; -#endif -}; - -/* mutex functions */ - -mutex_t *mutex_create(const xmpp_ctx_t * ctx) -{ - mutex_t *mutex; - - mutex = xmpp_alloc(ctx, sizeof(mutex_t)); - if (mutex) { - mutex->ctx = ctx; -#ifdef _WIN32 - mutex->mutex = CreateMutex(NULL, FALSE, NULL); -#else - mutex->mutex = xmpp_alloc(ctx, sizeof(pthread_mutex_t)); - if (mutex->mutex) - if (pthread_mutex_init(mutex->mutex, NULL) != 0) { - xmpp_free(ctx, mutex->mutex); - mutex->mutex = NULL; - } -#endif - if (!mutex->mutex) { - xmpp_free(ctx, mutex); - mutex = NULL; - } - } - - return mutex; -} - -int mutex_destroy(mutex_t *mutex) -{ - int ret = 1; - const xmpp_ctx_t *ctx; - -#ifdef _WIN32 - if (mutex->mutex) - ret = CloseHandle(mutex->mutex); -#else - if (mutex->mutex) - ret = pthread_mutex_destroy(mutex->mutex) == 0; -#endif - ctx = mutex->ctx; - xmpp_free(ctx, mutex); - - return ret; -} - -int mutex_lock(mutex_t *mutex) -{ - int ret; - -#ifdef _WIN32 - ret = WaitForSingleObject(mutex->mutex, INFINITE) == 0; -#else - ret = pthread_mutex_lock(mutex->mutex) == 0; -#endif - - return ret; -} - -int mutex_trylock(mutex_t *mutex) -{ - /* TODO */ - return 0; -} - -int mutex_unlock(mutex_t *mutex) -{ - int ret; - -#ifdef _WIN32 - ret = ReleaseMutex(mutex->mutex); -#else - ret = pthread_mutex_unlock(mutex->mutex) == 0; -#endif - - return ret; -} diff --git a/src/thread.h b/src/thread.h deleted file mode 100644 index e16d5aa..0000000 --- a/src/thread.h +++ /dev/null @@ -1,40 +0,0 @@ -/* thread.h -** strophe XMPP client library -- thread abstraction header -** -** Copyright (C) 2005-2009 Collecta, Inc. -** -** This software is provided AS-IS with no warranty, either express -** or implied. -** -** This program is dual licensed under the MIT and GPLv3 licenses. -*/ - -/** @file - * Threading abstraction API. - */ - -#ifndef __LIBSTROPHE_THREAD_H__ -#define __LIBSTROPHE_THREAD_H__ - -#include -#include - -#ifdef _WIN32 -#include -#else -#include -#endif - -#include "strophe.h" - -typedef struct _mutex_t mutex_t; - -/* mutex functions */ - -mutex_t *mutex_create(const xmpp_ctx_t *ctx); -int mutex_destroy(mutex_t *mutex); -int mutex_lock(mutex_t *mutex); -int mutex_trylock(mutex_t *mutex); -int mutex_unlock(mutex_t *mutex); - -#endif /* __LIBSTROPHE_THREAD_H__ */