[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r9143 - libmicrohttpd/src/daemon
From: |
gnunet |
Subject: |
[GNUnet-SVN] r9143 - libmicrohttpd/src/daemon |
Date: |
Sat, 10 Oct 2009 05:42:03 -0600 |
Author: grothoff
Date: 2009-10-10 05:42:02 -0600 (Sat, 10 Oct 2009)
New Revision: 9143
Modified:
libmicrohttpd/src/daemon/daemon.c
Log:
fixing the fix
Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c 2009-10-09 13:23:58 UTC (rev 9142)
+++ libmicrohttpd/src/daemon/daemon.c 2009-10-10 11:42:02 UTC (rev 9143)
@@ -767,14 +767,7 @@
prev->next = pos->next;
if (0 != (pos->daemon->options & MHD_USE_THREAD_PER_CONNECTION))
{
- if (0 != pthread_kill (pos->pid, SIGALRM))
- {
-#if HAVE_MESSAGES
- MHD_DLOG (daemon, "Failed to signal a thread: %s\n",
- STRERROR (errno));
-#endif
- abort();
- }
+ pthread_kill (pos->pid, SIGALRM);
if (0 != pthread_join (pos->pid, &unused))
{
#if HAVE_MESSAGES
@@ -1489,16 +1482,7 @@
/* Signal workers to stop and clean them up */
for (i = 0; i < daemon->worker_pool_size; ++i)
- {
- if (0 != pthread_kill (daemon->worker_pool[i].pid, SIGALRM))
- {
-#if HAVE_MESSAGES
- MHD_DLOG (daemon, "Failed to signal a thread: %s\n",
- STRERROR (errno));
-#endif
- abort();
- }
- }
+ pthread_kill (daemon->worker_pool[i].pid, SIGALRM);
for (i = 0; i < daemon->worker_pool_size; ++i)
{
if (0 != pthread_join (daemon->worker_pool[i].pid, &unused))
@@ -1517,14 +1501,7 @@
((0 != (daemon->options & MHD_USE_SELECT_INTERNALLY))
&& (0 == daemon->worker_pool_size)))
{
- if (0 != pthread_kill (daemon->pid, SIGALRM))
- {
-#if HAVE_MESSAGES
- MHD_DLOG (daemon, "Failed to signal a thread: %s\n",
- STRERROR (errno));
-#endif
- abort();
- }
+ pthread_kill (daemon->pid, SIGALRM);
if (0 != pthread_join (daemon->pid, &unused))
{
#if HAVE_MESSAGES
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r9143 - libmicrohttpd/src/daemon,
gnunet <=