[GNUnet-SVN] r37866 - libmicrohttpd/src/microhttpd

[gnunet]

Author: grothoff
Date: 2016-09-04 13:16:38 +0200 (Sun, 04 Sep 2016)
New Revision: 37866

Modified:
   libmicrohttpd/src/microhttpd/test_upgrade.c
   libmicrohttpd/src/microhttpd/test_upgrade_ssl.c
Log:
-run tests with/without thread pool

Modified: libmicrohttpd/src/microhttpd/test_upgrade.c
===================================================================
--- libmicrohttpd/src/microhttpd/test_upgrade.c 2016-09-04 11:13:29 UTC (rev 
37865)
+++ libmicrohttpd/src/microhttpd/test_upgrade.c 2016-09-04 11:16:38 UTC (rev 
37866)
@@ -279,7 +279,8 @@
 
 
 static int
-test_upgrade_internal (int flags)
+test_upgrade_internal (int flags,
+                       unsigned int pool)
 {
   struct MHD_Daemon *d;
   MHD_socket sock;
@@ -289,6 +290,7 @@
                         1080,
                         NULL, NULL,
                         &ahc_upgrade, NULL,
+                        MHD_OPTION_THREAD_POOL_SIZE, pool,
                         MHD_OPTION_END);
   if (NULL == d)
     return 2;
@@ -323,12 +325,21 @@
 {
   int error_count = 0;
 
-  error_count += test_upgrade_internal (MHD_USE_SELECT_INTERNALLY);
+  error_count += test_upgrade_internal (MHD_USE_SELECT_INTERNALLY,
+                                        1);
+  error_count += test_upgrade_internal (MHD_USE_SELECT_INTERNALLY,
+                                        2);
 #ifdef HAVE_POLL
-  error_count += test_upgrade_internal (MHD_USE_POLL_INTERNALLY);
+  error_count += test_upgrade_internal (MHD_USE_POLL_INTERNALLY,
+                                        1);
+  error_count += test_upgrade_internal (MHD_USE_POLL_INTERNALLY,
+                                        2);
 #endif
 #ifdef EPOLL_SUPPORT
-  error_count += test_upgrade_internal (MHD_USE_EPOLL_INTERNALLY);
+  error_count += test_upgrade_internal (MHD_USE_EPOLL_INTERNALLY,
+                                        1);
+  error_count += test_upgrade_internal (MHD_USE_EPOLL_INTERNALLY,
+                                        2);
 #endif
   if (error_count != 0)
     fprintf (stderr,

Modified: libmicrohttpd/src/microhttpd/test_upgrade_ssl.c
===================================================================
--- libmicrohttpd/src/microhttpd/test_upgrade_ssl.c     2016-09-04 11:13:29 UTC 
(rev 37865)
+++ libmicrohttpd/src/microhttpd/test_upgrade_ssl.c     2016-09-04 11:16:38 UTC 
(rev 37866)
@@ -393,7 +393,8 @@
 
 
 static int
-test_upgrade_internal (int flags)
+test_upgrade_internal (int flags,
+                       unsigned int pool)
 {
   struct MHD_Daemon *d;
   MHD_socket sock;
@@ -405,6 +406,7 @@
                         &ahc_upgrade, NULL,
                         MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem,
                         MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem,
+                        MHD_OPTION_THREAD_POOL_SIZE, pool,
                         MHD_OPTION_END);
   if (NULL == d)
     return 2;
@@ -440,13 +442,23 @@
 
   if (0 != system ("openssl version 1> /dev/null"))
     return 77; /* openssl not available, can't run the test */
-  error_count += test_upgrade_internal (MHD_USE_SELECT_INTERNALLY);
+  error_count += test_upgrade_internal (MHD_USE_SELECT_INTERNALLY,
+                                        1);
+  error_count += test_upgrade_internal (MHD_USE_SELECT_INTERNALLY,
+                                        2);
 #ifdef HAVE_POLL
-  error_count += test_upgrade_internal (MHD_USE_POLL_INTERNALLY);
+  error_count += test_upgrade_internal (MHD_USE_POLL_INTERNALLY,
+                                        1);
+  error_count += test_upgrade_internal (MHD_USE_POLL_INTERNALLY,
+                                        2);
 #endif
 #ifdef EPOLL_SUPPORT
   error_count += test_upgrade_internal (MHD_USE_EPOLL_INTERNALLY |
-                                       MHD_USE_TLS_EPOLL_UPGRADE);
+                                        MHD_USE_TLS_EPOLL_UPGRADE,
+                                        1);
+  error_count += test_upgrade_internal (MHD_USE_EPOLL_INTERNALLY |
+                                        MHD_USE_TLS_EPOLL_UPGRADE,
+                                        2);
 #endif
   if (error_count != 0)
     fprintf (stderr,