[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libmicrohttpd] branch master updated: check rvalues from pthread_mutex_
|
From: |
gnunet |
|
Subject: |
[libmicrohttpd] branch master updated: check rvalues from pthread_mutex_ operations in examples |
|
Date: |
Mon, 25 Sep 2023 21:26:40 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository libmicrohttpd.
The following commit(s) were added to refs/heads/master by this push:
new 2212a372 check rvalues from pthread_mutex_ operations in examples
2212a372 is described below
commit 2212a372569ddbb2841ebbdb25260fac168fef23
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Mon Sep 25 21:26:31 2023 +0200
check rvalues from pthread_mutex_ operations in examples
---
src/examples/websocket_chatserver_example.c | 481 ++++++++++++++--------------
src/examples/websocket_threaded_example.c | 18 +-
2 files changed, 250 insertions(+), 249 deletions(-)
diff --git a/src/examples/websocket_chatserver_example.c
b/src/examples/websocket_chatserver_example.c
index f4aac7b3..9e5319ad 100644
--- a/src/examples/websocket_chatserver_example.c
+++ b/src/examples/websocket_chatserver_example.c
@@ -187,8 +187,9 @@
" function window_onload(event)\n" \
" {\n" \
" /* Determine the base url (for http:/" "/ this is ws:/" "/ for https:/" \
- "/ this must be wss:/" "/) */\n" \
- " baseUrl = 'ws' + (window.location.protocol === 'https:' ? 's' : '') +
':/" "/' + window.location.host + '/ChatServerWebSocket';\n" \
+ "/ this must be wss:/" "/) */\n" \
+ " baseUrl = 'ws' + (window.location.protocol === 'https:' ? 's' : '') +
':/" \
+ "/' + window.location.host + '/ChatServerWebSocket';\n" \
" chat_generate();\n" \
" chat_connect();\n" \
" }\n" \
@@ -586,7 +587,7 @@
" let message = [ ];\n" \
" /* message type */ \n" \
" let j = 0;\n" \
- " let i = byteData.indexOf(0x7C, j); /* | = 0x7C;*/ \n"\
+ " let i = byteData.indexOf(0x7C, j); /* | = 0x7C;*/ \n" \
" if(i < 0)\n" \
" return;\n" \
" message.push(decoder.decode(byteData.slice(0, i)));\n" \
@@ -737,28 +738,28 @@ send_all (struct ConnectedUser *cu,
ssize_t ret;
size_t off;
- if (0 == pthread_mutex_lock (&cu->send_mutex))
+ if (0 != pthread_mutex_lock (&cu->send_mutex))
+ abort ();
+ for (off = 0; off < len; off += ret)
{
- for (off = 0; off < len; off += ret)
+ ret = send (cu->fd,
+ &buf[off],
+ (int) (len - off),
+ 0);
+ if (0 > ret)
{
- ret = send (cu->fd,
- &buf[off],
- (int) (len - off),
- 0);
- if (0 > ret)
+ if (EAGAIN == errno)
{
- if (EAGAIN == errno)
- {
- ret = 0;
- continue;
- }
- break;
+ ret = 0;
+ continue;
}
- if (0 == ret)
- break;
+ break;
}
- pthread_mutex_unlock (&cu->send_mutex);
+ if (0 == ret)
+ break;
}
+ if (0 != pthread_mutex_unlock (&cu->send_mutex))
+ abort ();
}
@@ -806,7 +807,7 @@ chat_addmessage (size_t from_user_id,
if (0 != needs_lock)
{
if (0 != pthread_mutex_lock (&chat_mutex))
- return 1;
+ abort ();
}
/* add the new message to the global message list */
@@ -819,7 +820,8 @@ chat_addmessage (size_t from_user_id,
{
free (message);
if (0 != needs_lock)
- pthread_mutex_unlock (&chat_mutex);
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
return 1;
}
messages_[message_count] = message;
@@ -834,7 +836,8 @@ chat_addmessage (size_t from_user_id,
if (0 != needs_lock)
{
if (0 != needs_lock)
- pthread_mutex_unlock (&chat_mutex);
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
}
return 0;
}
@@ -854,7 +857,7 @@ chat_clearmessages (int needs_lock)
if (0 != needs_lock)
{
if (0 != pthread_mutex_lock (&chat_mutex))
- return 1;
+ abort ();
}
/* update the clean counter and check whether we need cleaning */
@@ -864,7 +867,8 @@ chat_clearmessages (int needs_lock)
/* no cleanup required */
if (0 != needs_lock)
{
- pthread_mutex_unlock (&chat_mutex);
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
}
return 0;
}
@@ -916,7 +920,8 @@ chat_clearmessages (int needs_lock)
/* unlock the global mutex if needed */
if (0 != needs_lock)
{
- pthread_mutex_unlock (&chat_mutex);
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
}
return 0;
}
@@ -947,10 +952,7 @@ chat_adduser (struct ConnectedUser *cu)
/* lock the mutex */
if (0 != pthread_mutex_lock (&chat_mutex))
- {
- free (data);
- return 1;
- }
+ abort ();
/* inform the other chat users about the new user */
if (0 != chat_addmessage (0,
0,
@@ -960,7 +962,8 @@ chat_adduser (struct ConnectedUser *cu)
0))
{
free (data);
- pthread_mutex_unlock (&chat_mutex);
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
return 1;
}
free (data);
@@ -973,7 +976,8 @@ chat_adduser (struct ConnectedUser *cu)
if (NULL == users_)
{
/* realloc failed */
- pthread_mutex_unlock (&chat_mutex);
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
return 1;
}
users_[user_count] = cu;
@@ -985,7 +989,8 @@ chat_adduser (struct ConnectedUser *cu)
cu->next_message_index = message_count;
/* unlock the mutex */
- pthread_mutex_unlock (&chat_mutex);
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
return 0;
}
@@ -1014,10 +1019,7 @@ chat_removeuser (struct ConnectedUser *cu)
/* lock the mutex */
if (0 != pthread_mutex_lock (&chat_mutex))
- {
- free (data);
- return 1;
- }
+ abort ();
/* inform the other chat users that the user is gone */
int got_error = 0;
if (0 != chat_addmessage (0, 0, data, data_len, 0, 0))
@@ -1045,7 +1047,8 @@ chat_removeuser (struct ConnectedUser *cu)
got_error = 1;
/* unlock the mutex */
- pthread_mutex_unlock (&chat_mutex);
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
return got_error;
}
@@ -1066,9 +1069,7 @@ chat_renameuser (struct ConnectedUser *cu,
{
/* lock the mutex */
if (0 != pthread_mutex_lock (&chat_mutex))
- {
- return 1;
- }
+ abort ();
/* check whether the name is already in use */
for (size_t i = 0; i < user_count; ++i)
@@ -1078,7 +1079,8 @@ chat_renameuser (struct ConnectedUser *cu,
if ((users[i]->user_name_len == new_name_len) &&
(0 == strcasecmp (users[i]->user_name, new_name)))
{
- pthread_mutex_unlock (&chat_mutex);
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
return 2;
}
}
@@ -1101,7 +1103,8 @@ chat_renameuser (struct ConnectedUser *cu,
if (0 != chat_addmessage (0, 0, data, data_len, 0, 0))
{
free (data);
- pthread_mutex_unlock (&chat_mutex);
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
return 1;
}
free (data);
@@ -1112,7 +1115,8 @@ chat_renameuser (struct ConnectedUser *cu,
cu->user_name_len = new_name_len;
/* unlock the mutex */
- pthread_mutex_unlock (&chat_mutex);
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
return 0;
}
@@ -1411,48 +1415,39 @@ connecteduser_parse_received_websocket_stream (struct
ConnectedUser *cu,
case 3:
/* ping */
{
- if (0 == pthread_mutex_lock (&chat_mutex))
+ if (0 != pthread_mutex_lock (&chat_mutex))
+ abort ();
+ /* check whether the to_user exists */
+ struct ConnectedUser *ping_user = NULL;
+ for (size_t k = 0; k < user_count; ++k)
{
- /* check whether the to_user exists */
- struct ConnectedUser *ping_user = NULL;
- for (size_t k = 0; k < user_count; ++k)
- {
- if (users[k]->user_id == to_user_id)
- {
- ping_user = users[k];
- break;
- }
- }
- if (NULL == ping_user)
- {
- chat_addmessage (0,
- from_user_id,
- "error||Couldn't find the specified
user for pinging.",
- 52,
- 0,
- 0);
- }
- else
+ if (users[k]->user_id == to_user_id)
{
- /* if pinging is requested, */
- /* we mark the user and inform the sender about this */
- if (0 == ping_user->ping_status)
- {
- ping_user->ping_status = 1;
- pthread_cond_signal (&ping_user->wake_up_sender);
- }
+ ping_user = users[k];
+ break;
}
- pthread_mutex_unlock (&chat_mutex);
}
- else
+ if (NULL == ping_user)
{
chat_addmessage (0,
from_user_id,
- "error||Error while pinging.",
- 27,
+ "error||Couldn't find the specified user
for pinging.",
+ 52,
0,
- 1);
+ 0);
+ }
+ else
+ {
+ /* if pinging is requested, */
+ /* we mark the user and inform the sender about this */
+ if (0 == ping_user->ping_status)
+ {
+ ping_user->ping_status = 1;
+ pthread_cond_signal (&ping_user->wake_up_sender);
+ }
}
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
}
break;
@@ -1591,135 +1586,134 @@ connecteduser_send_messages (void *cls)
struct ConnectedUser *cu = cls;
/* the main loop of sending messages requires to lock the mutex */
- if (0 == pthread_mutex_lock (&chat_mutex))
+ if (0 != pthread_mutex_lock (&chat_mutex))
+ abort ();
+ for (;;)
{
- for (;;)
+ /* loop while not all messages processed */
+ int all_messages_read = 0;
+ while (0 == all_messages_read)
{
- /* loop while not all messages processed */
- int all_messages_read = 0;
- while (0 == all_messages_read)
+ if (1 == disconnect_all)
{
- if (1 == disconnect_all)
+ /* the application closes and want that we disconnect all users */
+ struct MHD_UpgradeResponseHandle *urh = cu->urh;
+ if (NULL != urh)
{
- /* the application closes and want that we disconnect all users */
- struct MHD_UpgradeResponseHandle *urh = cu->urh;
- if (NULL != urh)
- {
- /* Close the TCP/IP socket. */
- /* This will also wake-up the waiting receive-thread for this
connected user. */
- cu->urh = NULL;
- MHD_upgrade_action (urh,
- MHD_UPGRADE_ACTION_CLOSE);
- }
- pthread_mutex_unlock (&chat_mutex);
- return NULL;
+ /* Close the TCP/IP socket. */
+ /* This will also wake-up the waiting receive-thread for this
connected user. */
+ cu->urh = NULL;
+ MHD_upgrade_action (urh,
+ MHD_UPGRADE_ACTION_CLOSE);
}
- else if (1 == cu->disconnect)
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
+ return NULL;
+ }
+ else if (1 == cu->disconnect)
+ {
+ /* The sender thread shall close. */
+ /* This is only requested by the receive thread, so we can just leave.
*/
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
+ return NULL;
+ }
+ else if (1 == cu->ping_status)
+ {
+ /* A pending ping is requested */
+ ++cu->ping_counter;
+ strcpy (cu->ping_message,
+ "libmicrohttpdchatserverpingdata");
+ snprintf (cu->ping_message + 31, 97, "%d", (int) cu->ping_counter);
+ cu->ping_message_len = strlen (cu->ping_message);
+ char *frame_data = NULL;
+ size_t frame_len = 0;
+ int er = MHD_websocket_encode_ping (cu->ws,
+ cu->ping_message,
+ cu->ping_message_len,
+ &frame_data,
+ &frame_len);
+ if (MHD_WEBSOCKET_STATUS_OK == er)
{
- /* The sender thread shall close. */
- /* This is only requested by the receive thread, so we can just
leave. */
- pthread_mutex_unlock (&chat_mutex);
- return NULL;
+ cu->ping_status = 2;
+ timespec_get (&cu->ping_start, TIME_UTC);
+
+ /* send the data via the TCP/IP socket and */
+ /* unlock the mutex while sending */
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
+ send_all (cu,
+ frame_data,
+ frame_len);
+ if (0 != pthread_mutex_lock (&chat_mutex))
+ abort ();
}
- else if (1 == cu->ping_status)
+ MHD_websocket_free (cu->ws, frame_data);
+ }
+ else if (cu->next_message_index < message_count)
+ {
+ /* a chat message or command is pending */
+ char *frame_data = NULL;
+ size_t frame_len = 0;
+ int er = 0;
{
- /* A pending ping is requested */
- ++cu->ping_counter;
- strcpy (cu->ping_message,
- "libmicrohttpdchatserverpingdata");
- snprintf (cu->ping_message + 31, 97, "%d", (int) cu->ping_counter);
- cu->ping_message_len = strlen (cu->ping_message);
- char *frame_data = NULL;
- size_t frame_len = 0;
- int er = MHD_websocket_encode_ping (cu->ws,
- cu->ping_message,
- cu->ping_message_len,
- &frame_data,
- &frame_len);
- if (MHD_WEBSOCKET_STATUS_OK == er)
+ struct Message *msg = messages[cu->next_message_index];
+ if ((0 == msg->to_user_id) ||
+ (cu->user_id == msg->to_user_id) ||
+ (cu->user_id == msg->from_user_id) )
{
- cu->ping_status = 2;
- timespec_get (&cu->ping_start, TIME_UTC);
-
- /* send the data via the TCP/IP socket and */
- /* unlock the mutex while sending */
- pthread_mutex_unlock (&chat_mutex);
- send_all (cu,
- frame_data,
- frame_len);
- if (0 != pthread_mutex_lock (&chat_mutex))
+ if (0 == msg->is_binary)
{
- return NULL;
+ er = MHD_websocket_encode_text (cu->ws,
+ msg->data,
+ msg->data_len,
+ MHD_WEBSOCKET_FRAGMENTATION_NONE,
+ &frame_data,
+ &frame_len,
+ NULL);
}
- }
- MHD_websocket_free (cu->ws, frame_data);
- }
- else if (cu->next_message_index < message_count)
- {
- /* a chat message or command is pending */
- char *frame_data = NULL;
- size_t frame_len = 0;
- int er = 0;
- {
- struct Message *msg = messages[cu->next_message_index];
- if ((0 == msg->to_user_id) ||
- (cu->user_id == msg->to_user_id) ||
- (cu->user_id == msg->from_user_id) )
+ else
{
- if (0 == msg->is_binary)
- {
- er = MHD_websocket_encode_text (cu->ws,
+ er = MHD_websocket_encode_binary (cu->ws,
msg->data,
msg->data_len,
MHD_WEBSOCKET_FRAGMENTATION_NONE,
&frame_data,
- &frame_len,
- NULL);
- }
- else
- {
- er = MHD_websocket_encode_binary (cu->ws,
- msg->data,
- msg->data_len,
-
MHD_WEBSOCKET_FRAGMENTATION_NONE,
- &frame_data,
- &frame_len);
- }
+ &frame_len);
}
}
- ++cu->next_message_index;
-
- /* send the data via the TCP/IP socket and */
- /* unlock the mutex while sending */
- pthread_mutex_unlock (&chat_mutex);
- if (MHD_WEBSOCKET_STATUS_OK == er)
- {
- send_all (cu,
- frame_data,
- frame_len);
- }
- MHD_websocket_free (cu->ws,
- frame_data);
- if (0 != pthread_mutex_lock (&chat_mutex))
- {
- return NULL;
- }
- /* check whether there are still pending messages */
- all_messages_read = (cu->next_message_index < message_count) ? 0 : 1;
}
- else
+ ++cu->next_message_index;
+
+ /* send the data via the TCP/IP socket and */
+ /* unlock the mutex while sending */
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
+ if (MHD_WEBSOCKET_STATUS_OK == er)
{
- all_messages_read = 1;
+ send_all (cu,
+ frame_data,
+ frame_len);
}
+ MHD_websocket_free (cu->ws,
+ frame_data);
+ if (0 != pthread_mutex_lock (&chat_mutex))
+ abort ();
+ /* check whether there are still pending messages */
+ all_messages_read = (cu->next_message_index < message_count) ? 0 : 1;
+ }
+ else
+ {
+ all_messages_read = 1;
}
- /* clear old messages */
- chat_clearmessages (0);
-
- /* Wait for wake up. */
- /* This will automatically unlock the mutex while waiting and */
- /* lock the mutex after waiting */
- pthread_cond_wait (&cu->wake_up_sender, &chat_mutex);
}
+ /* clear old messages */
+ chat_clearmessages (0);
+
+ /* Wait for wake up. */
+ /* This will automatically unlock the mutex while waiting and */
+ /* lock the mutex after waiting */
+ pthread_cond_wait (&cu->wake_up_sender, &chat_mutex);
}
return NULL;
@@ -1817,37 +1811,37 @@ connecteduser_receive_messages (void *cls)
size_t init_users_len = 0;
/* first collect all users without sending (so the mutex isn't locked too
long) */
- if (0 == pthread_mutex_lock (&chat_mutex))
+ if (0 != pthread_mutex_lock (&chat_mutex))
+ abort ();
+ if (0 < user_count)
{
- if (0 < user_count)
+ init_users = (struct UserInit *) malloc (user_count * sizeof (struct
+ UserInit));
+ if (NULL != init_users)
{
- init_users = (struct UserInit *) malloc (user_count * sizeof (struct
-
UserInit));
- if (NULL != init_users)
+ init_users_len = user_count;
+ for (size_t i = 0; i < user_count; ++i)
{
- init_users_len = user_count;
- for (size_t i = 0; i < user_count; ++i)
+ char user_index[32];
+ snprintf (user_index, 32, "%d", (int) users[i]->user_id);
+ size_t user_index_len = strlen (user_index);
+ struct UserInit iu;
+ iu.user_init_len = user_index_len + users[i]->user_name_len + 10;
+ iu.user_init = (char *) malloc (iu.user_init_len + 1);
+ if (NULL != iu.user_init)
{
- char user_index[32];
- snprintf (user_index, 32, "%d", (int) users[i]->user_id);
- size_t user_index_len = strlen (user_index);
- struct UserInit iu;
- iu.user_init_len = user_index_len + users[i]->user_name_len + 10;
- iu.user_init = (char *) malloc (iu.user_init_len + 1);
- if (NULL != iu.user_init)
- {
- strcpy (iu.user_init, "userinit|");
- strcat (iu.user_init, user_index);
- strcat (iu.user_init, "|");
- if (0 < users[i]->user_name_len)
- strcat (iu.user_init, users[i]->user_name);
- }
- init_users[i] = iu;
+ strcpy (iu.user_init, "userinit|");
+ strcat (iu.user_init, user_index);
+ strcat (iu.user_init, "|");
+ if (0 < users[i]->user_name_len)
+ strcat (iu.user_init, users[i]->user_name);
}
+ init_users[i] = iu;
}
}
- pthread_mutex_unlock (&chat_mutex);
}
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
/* then send all users to the connected client */
for (size_t i = 0; i < init_users_len; ++i)
@@ -1922,13 +1916,14 @@ connecteduser_receive_messages (void *cls)
cu->extra_in_size))
{
chat_removeuser (cu);
- if (0 == pthread_mutex_lock (&chat_mutex))
- {
- cu->disconnect = 1;
- pthread_cond_signal (&cu->wake_up_sender);
- pthread_mutex_unlock (&chat_mutex);
- pthread_join (pt, NULL);
- }
+ if (0 != pthread_mutex_lock (&chat_mutex))
+ abort ();
+ cu->disconnect = 1;
+ pthread_cond_signal (&cu->wake_up_sender);
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
+ pthread_join (pt, NULL);
+
struct MHD_UpgradeResponseHandle *urh = cu->urh;
if (NULL != urh)
{
@@ -1967,13 +1962,13 @@ connecteduser_receive_messages (void *cls)
{
/* A websocket protocol error occurred */
chat_removeuser (cu);
- if (0 == pthread_mutex_lock (&chat_mutex))
- {
- cu->disconnect = 1;
- pthread_cond_signal (&cu->wake_up_sender);
- pthread_mutex_unlock (&chat_mutex);
- pthread_join (pt, NULL);
- }
+ if (0 != pthread_mutex_lock (&chat_mutex))
+ abort ();
+ cu->disconnect = 1;
+ pthread_cond_signal (&cu->wake_up_sender);
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
+ pthread_join (pt, NULL);
struct MHD_UpgradeResponseHandle *urh = cu->urh;
if (NULL != urh)
{
@@ -1993,13 +1988,13 @@ connecteduser_receive_messages (void *cls)
/* cleanup */
chat_removeuser (cu);
- if (0 == pthread_mutex_lock (&chat_mutex))
- {
- cu->disconnect = 1;
- pthread_cond_signal (&cu->wake_up_sender);
- pthread_mutex_unlock (&chat_mutex);
- pthread_join (pt, NULL);
- }
+ if (0 != pthread_mutex_lock (&chat_mutex))
+ abort ();
+ cu->disconnect = 1;
+ pthread_cond_signal (&cu->wake_up_sender);
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
+ pthread_join (pt, NULL);
struct MHD_UpgradeResponseHandle *urh = cu->urh;
if (NULL != urh)
{
@@ -2322,28 +2317,28 @@ main (int argc,
return 1;
(void) getc (stdin);
- if (0 == pthread_mutex_lock (&chat_mutex))
- {
- disconnect_all = 1;
- for (size_t i = 0; i < user_count; ++i)
- pthread_cond_signal (&users[i]->wake_up_sender);
- pthread_mutex_unlock (&chat_mutex);
- }
+ if (0 != pthread_mutex_lock (&chat_mutex))
+ abort ();
+ disconnect_all = 1;
+ for (size_t i = 0; i < user_count; ++i)
+ pthread_cond_signal (&users[i]->wake_up_sender);
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
sleep (2);
- if (0 == pthread_mutex_lock (&chat_mutex))
+ if (0 != pthread_mutex_lock (&chat_mutex))
+ abort ();
+ for (size_t i = 0; i < user_count; ++i)
{
- for (size_t i = 0; i < user_count; ++i)
+ struct MHD_UpgradeResponseHandle *urh = users[i]->urh;
+ if (NULL != urh)
{
- struct MHD_UpgradeResponseHandle *urh = users[i]->urh;
- if (NULL != urh)
- {
- users[i]->urh = NULL;
- MHD_upgrade_action (users[i]->urh,
- MHD_UPGRADE_ACTION_CLOSE);
- }
+ users[i]->urh = NULL;
+ MHD_upgrade_action (users[i]->urh,
+ MHD_UPGRADE_ACTION_CLOSE);
}
- pthread_mutex_unlock (&chat_mutex);
}
+ if (0 != pthread_mutex_unlock (&chat_mutex))
+ abort ();
sleep (2);
/* usually we should wait here in a safe way for all threads to disconnect,
*/
diff --git a/src/examples/websocket_threaded_example.c
b/src/examples/websocket_threaded_example.c
index 4fcac79b..eec1f557 100644
--- a/src/examples/websocket_threaded_example.c
+++ b/src/examples/websocket_threaded_example.c
@@ -625,7 +625,8 @@ ws_send_frame (MHD_socket sock, const char *msg, size_t
length)
}
response[idx_response] = '\0';
output = 0;
- pthread_mutex_lock (&MUTEX);
+ if (0 != pthread_mutex_lock (&MUTEX))
+ abort ();
for (i = 0; i < MAX_CLIENTS; i++)
{
isock = CLIENT_SOCKS[i];
@@ -634,7 +635,8 @@ ws_send_frame (MHD_socket sock, const char *msg, size_t
length)
output += send_all (isock, response, idx_response);
}
}
- pthread_mutex_unlock (&MUTEX);
+ if (0 != pthread_mutex_unlock (&MUTEX))
+ abort ();
free (response);
return (ssize_t) output;
}
@@ -759,7 +761,8 @@ run_usock (void *cls)
}
}
}
- pthread_mutex_lock (&MUTEX);
+ if (0 != pthread_mutex_lock (&MUTEX))
+ abort ();
for (i = 0; i < MAX_CLIENTS; i++)
{
if (CLIENT_SOCKS[i] == ws->sock)
@@ -768,7 +771,8 @@ run_usock (void *cls)
break;
}
}
- pthread_mutex_unlock (&MUTEX);
+ if (0 != pthread_mutex_unlock (&MUTEX))
+ abort ();
free (ws);
MHD_upgrade_action (urh, MHD_UPGRADE_ACTION_CLOSE);
return NULL;
@@ -798,7 +802,8 @@ uh_cb (void *cls, struct MHD_Connection *con, void *req_cls,
ws->sock = sock;
ws->urh = urh;
sock_overflow = MHD_YES;
- pthread_mutex_lock (&MUTEX);
+ if (0 != pthread_mutex_lock (&MUTEX))
+ abort ();
for (i = 0; i < MAX_CLIENTS; i++)
{
if (MHD_INVALID_SOCKET == CLIENT_SOCKS[i])
@@ -808,7 +813,8 @@ uh_cb (void *cls, struct MHD_Connection *con, void *req_cls,
break;
}
}
- pthread_mutex_unlock (&MUTEX);
+ if (0 != pthread_mutex_unlock (&MUTEX))
+ abort ();
if (sock_overflow)
{
free (ws);
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [libmicrohttpd] branch master updated: check rvalues from pthread_mutex_ operations in examples,
gnunet <=