lib/libhttp
1
0
Fork 0
mirror of https://github.com/lammertb/libhttp.git synced 2026-01-27 08:02:47 +03:00
Code Activity

Moved WIN32 pthread_mutex_trylock to own file

Browse Source
This commit is contained in:
Lammert Bies
2016-12-11 18:42:30 +01:00
parent 419243c4fe
commit a0a89e5b31
3 changed files with 45 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -237,6 +237,7 @@ LIB_SOURCES = src/libhttp.c \
src/pthread_mutex_destroy.c \
src/pthread_mutex_init.c \
src/pthread_mutex_lock.c \
src/pthread_mutex_trylock.c \
src/sha1.c
LIB_INLINE = src/mod_lua.inl src/md5.inl
APP_SOURCES = src/main.c

14
src/libhttp.c
View File

@@ -829,19 +829,7 @@ void XX_httplib_set_thread_name(const char *threadName) {
#if defined(_WIN32)
int pthread_mutex_trylock( pthread_mutex_t *mutex ) {
switch ( WaitForSingleObject( *mutex, 0 ) ) {
case WAIT_OBJECT_0: return 0;
case WAIT_TIMEOUT: return -2; /* EBUSY */
}
return -1;
} /* pthread_mutex_trylock */
static int pthread_mutex_unlock( pthread_mutex_t *mutex ) {
int pthread_mutex_unlock( pthread_mutex_t *mutex ) {
return ( ReleaseMutex( *mutex ) == 0 ) ? -1 : 0;

43
src/pthread_mutex_trylock.c Normal file
View File

@@ -0,0 +1,43 @@
/*
* Copyright (c) 2016 Lammert Bies
* Copyright (c) 2013-2016 the Civetweb developers
* Copyright (c) 2004-2013 Sergey Lyubka
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "libhttp-private.h"
#if defined(_WIN32)
int pthread_mutex_trylock( pthread_mutex_t *mutex ) {
switch ( WaitForSingleObject( *mutex, 0 ) ) {
case WAIT_OBJECT_0: return 0;
case WAIT_TIMEOUT: return -2; /* EBUSY */
}
return -1;
} /* pthread_mutex_trylock */
#endif /* _WIN32 */