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 join_thread to own file

Browse Source
This commit is contained in:
Lammert Bies
2016-12-11 13:17:09 +01:00
parent f601499683
commit 1e3668733e
3 changed files with 66 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -100,6 +100,7 @@ LIB_SOURCES = src/libhttp.c \
src/httplib_is_valid_http_method.c \
src/httplib_is_valid_port.c \
src/httplib_is_websocket_protocol.c \
src/httplib_join_thread.c \
src/httplib_load_dll.c \
src/httplib_lock_unlock_connection.c \
src/httplib_lock_unlock_context.c \

65
src/httplib_join_thread.c Normal file
View File

@@ -0,0 +1,65 @@
/*
* 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)
/* Wait for a thread to finish. */
int XX_httplib_join_thread( pthread_t threadid ) {
int result;
DWORD dwevent;
result = -1;
dwevent = WaitForSingleObject(threadid, INFINITE);
if (dwevent == WAIT_FAILED) {
} else {
if (dwevent == WAIT_OBJECT_0) {
CloseHandle(threadid);
result = 0;
}
}
return result;
} /* XX_httplib_join_thread */
#else
/* Wait for a thread to finish. */
int XX_httplib_join_thread( pthread_t threadid ) {
int result;
result = pthread_join(threadid, NULL);
return result;
} /* XX_httplib_join_thread */
#endif /* _WIN32 */

31
src/libhttp.c
View File

@@ -2201,26 +2201,6 @@ int XX_httplib_start_thread_with_id( unsigned(__stdcall *f)(void *), void *p, pt
} /* XX_httplib_start_thread_with_id */
/* Wait for a thread to finish. */
int XX_httplib_join_thread( pthread_t threadid ) {
int result;
DWORD dwevent;
result = -1;
dwevent = WaitForSingleObject(threadid, INFINITE);
if (dwevent == WAIT_FAILED) {
} else {
if (dwevent == WAIT_OBJECT_0) {
CloseHandle(threadid);
result = 0;
}
}
return result;
} /* XX_httplib_join_thread */
#else
int XX_httplib_stat( struct mg_connection *conn, const char *path, struct file *filep ) {
@@ -2297,15 +2277,4 @@ int XX_httplib_start_thread_with_id( mg_thread_func_t func, void *param, pthread
} /* XX_httplib_start_thread_with_id */
/* Wait for a thread to finish. */
int XX_httplib_join_thread( pthread_t threadid ) {
int result;
result = pthread_join(threadid, NULL);
return result;
} /* XX_httplib_join_thread */
#endif /* _WIN32 */