[GNUnet-SVN] [libmicrohttpd] GNU libmicrohttpd branch master updated. 6d522346279df691b52a654dc1d1b815feae58e2

[gitolite]

The branch, master has been updated
       via  6d522346279df691b52a654dc1d1b815feae58e2 (commit)
       via  1b0c23c11965658cfead46eb014eda5d88b972cc (commit)
       via  d2e9b53c6ee806175b1356cdb2ef9e2fae25f6d7 (commit)
      from  df98141b03a5c2fec11442f617e8842b6230b793 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6d522346279df691b52a654dc1d1b815feae58e2
Author: Evgeny Grin (Karlson2k) <address@hidden>
Date:   Thu Nov 10 16:23:41 2016 +0300

    perf_get: used same names as in perf_get_concurrent

commit 1b0c23c11965658cfead46eb014eda5d88b972cc
Author: Evgeny Grin (Karlson2k) <address@hidden>
Date:   Thu Nov 10 16:13:56 2016 +0300

    perf_get_concurrent: fixed tests descriptions

commit d2e9b53c6ee806175b1356cdb2ef9e2fae25f6d7
Author: Evgeny Grin (Karlson2k) <address@hidden>
Date:   Wed Nov 9 23:12:56 2016 +0300

    Define missing HAVE_STDBOOL_H for VS

-----------------------------------------------------------------------

Summary of changes:
 src/testcurl/perf_get.c            | 13 +++++++------
 src/testcurl/perf_get_concurrent.c | 10 +++++++---
 w32/common/MHD_config.h            |  4 ++++
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/testcurl/perf_get.c b/src/testcurl/perf_get.c
index d8d1287..3da5f60 100644
--- a/src/testcurl/perf_get.c
+++ b/src/testcurl/perf_get.c
@@ -226,8 +226,8 @@ testInternalGet (int port, int poll_flag)
        }
       curl_easy_cleanup (c);
     }
-  stop (poll_flag == MHD_USE_POLL ? "internal poll" :
-       poll_flag == MHD_USE_EPOLL ? "internal epoll" : "internal select");
+  stop (poll_flag == MHD_USE_POLL ? "internal thread with poll()" :
+       poll_flag == MHD_USE_EPOLL ? "internal thread with epoll" : "internal 
thread with select()");
   MHD_stop_daemon (d);
   if (cbc.pos != strlen ("/hello_world"))
     return 4;
@@ -286,8 +286,9 @@ testMultithreadedGet (int port, int poll_flag)
        }
       curl_easy_cleanup (c);
     }
-  stop ((poll_flag & MHD_USE_POLL) ? "thread with poll" :
-       (poll_flag & MHD_USE_EPOLL) ? "thread with epoll" : "thread with 
select");
+  stop ((poll_flag & MHD_USE_POLL) ? "internal thread with poll() and thread 
per connection" :
+       (poll_flag & MHD_USE_EPOLL) ? "internal thread with epoll and thread 
per connection" :
+           "internal thread with select() and thread per connection");
   MHD_stop_daemon (d);
   if (cbc.pos != strlen ("/hello_world"))
     return 64;
@@ -346,8 +347,8 @@ testMultithreadedPoolGet (int port, int poll_flag)
        }
       curl_easy_cleanup (c);
     }
-  stop (0 != (poll_flag & MHD_USE_POLL) ? "thread pool with poll" :
-       0 != (poll_flag & MHD_USE_EPOLL) ? "thread pool with epoll" : "thread 
pool with select");
+  stop (0 != (poll_flag & MHD_USE_POLL) ? "internal thread pool with poll()" :
+       0 != (poll_flag & MHD_USE_EPOLL) ? "internal thread pool with epoll" : 
"internal thread pool with select()");
   MHD_stop_daemon (d);
   if (cbc.pos != strlen ("/hello_world"))
     return 64;
diff --git a/src/testcurl/perf_get_concurrent.c 
b/src/testcurl/perf_get_concurrent.c
index 043be1c..ebc7684 100644
--- a/src/testcurl/perf_get_concurrent.c
+++ b/src/testcurl/perf_get_concurrent.c
@@ -233,7 +233,8 @@ static int
 testInternalGet (int port, int poll_flag)
 {
   struct MHD_Daemon *d;
-  const char * const test_desc = poll_flag ? "internal poll" : "internal 
select";
+  const char * const test_desc = ((poll_flag & MHD_USE_POLL) ? "internal 
thread with poll()" :
+                                  (poll_flag & MHD_USE_EPOLL) ? "internal 
thread with epoll" : "internal thread with select()");
   const char * ret_val;
 
   d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG  | 
poll_flag,
@@ -259,7 +260,9 @@ static int
 testMultithreadedGet (int port, int poll_flag)
 {
   struct MHD_Daemon *d;
-  const char * const test_desc = poll_flag ? "thread with poll" : "thread with 
select";
+  const char * const test_desc = ((poll_flag & MHD_USE_POLL) ? "internal 
thread with poll() and thread per connection" :
+                                  (poll_flag & MHD_USE_EPOLL) ? "internal 
thread with epoll and thread per connection"
+                                      : "internal thread with select() and 
thread per connection");
   const char * ret_val;
 
   d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | 
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG  | poll_flag,
@@ -284,7 +287,8 @@ static int
 testMultithreadedPoolGet (int port, int poll_flag)
 {
   struct MHD_Daemon *d;
-  const char * const test_desc = poll_flag ? "thread pool with poll" : "thread 
pool with select";
+  const char * const test_desc = ((poll_flag & MHD_USE_POLL) ? "internal 
thread pool with poll()" :
+                                  (poll_flag & MHD_USE_EPOLL) ? "internal 
thread poll with epoll" : "internal thread pool with select()");
   const char * ret_val;
 
   d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 
poll_flag,
diff --git a/w32/common/MHD_config.h b/w32/common/MHD_config.h
index 0101756..793e353 100644
--- a/w32/common/MHD_config.h
+++ b/w32/common/MHD_config.h
@@ -139,6 +139,10 @@
 /* Define to 1 if you have the <stddef.h> header file. */
 #define HAVE_STDDEF_H 1
 
+/* Define to 1 if you have the <stdbool.h> header file and <stdbool.h> defines
+'bool' type. */
+#define HAVE_STDBOOL_H 1
+
 
 /* *** Other useful staff *** */
 


hooks/post-receive
-- 
GNU libmicrohttpd