diff options
Diffstat (limited to 'src/microhttpd/test_upgrade.c')
-rw-r--r-- | src/microhttpd/test_upgrade.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c index 6ca9e7dc..b29ab72a 100644 --- a/src/microhttpd/test_upgrade.c +++ b/src/microhttpd/test_upgrade.c | |||
@@ -1064,7 +1064,7 @@ test_upgrade (int flags, | |||
1064 | &run_usock_client, | 1064 | &run_usock_client, |
1065 | &sock)) | 1065 | &sock)) |
1066 | abort (); | 1066 | abort (); |
1067 | if (0 == (flags & (MHD_USE_SELECT_INTERNALLY | | 1067 | if (0 == (flags & (MHD_USE_INTERNAL_POLLING_THREAD | |
1068 | MHD_USE_THREAD_PER_CONNECTION)) ) | 1068 | MHD_USE_THREAD_PER_CONNECTION)) ) |
1069 | run_mhd_loop (d, flags); | 1069 | run_mhd_loop (d, flags); |
1070 | pthread_join (pt_client, | 1070 | pthread_join (pt_client, |
@@ -1176,14 +1176,14 @@ main (int argc, | |||
1176 | #endif /* HAVE_POLL */ | 1176 | #endif /* HAVE_POLL */ |
1177 | 1177 | ||
1178 | /* Test different event loops, with and without thread pool */ | 1178 | /* Test different event loops, with and without thread pool */ |
1179 | res = test_upgrade (MHD_USE_SELECT_INTERNALLY, | 1179 | res = test_upgrade (MHD_USE_INTERNAL_POLLING_THREAD, |
1180 | 0); | 1180 | 0); |
1181 | error_count += res; | 1181 | error_count += res; |
1182 | if (res) | 1182 | if (res) |
1183 | fprintf (stderr, "FAILED: Upgrade with internal select, return code %d.\n", res); | 1183 | fprintf (stderr, "FAILED: Upgrade with internal select, return code %d.\n", res); |
1184 | else if (verbose) | 1184 | else if (verbose) |
1185 | printf ("PASSED: Upgrade with internal select.\n"); | 1185 | printf ("PASSED: Upgrade with internal select.\n"); |
1186 | res = test_upgrade (MHD_USE_SELECT_INTERNALLY, | 1186 | res = test_upgrade (MHD_USE_INTERNAL_POLLING_THREAD, |
1187 | 2); | 1187 | 2); |
1188 | error_count += res; | 1188 | error_count += res; |
1189 | if (res) | 1189 | if (res) |
@@ -1191,14 +1191,14 @@ main (int argc, | |||
1191 | else if (verbose) | 1191 | else if (verbose) |
1192 | printf ("PASSED: Upgrade with internal select with thread pool.\n"); | 1192 | printf ("PASSED: Upgrade with internal select with thread pool.\n"); |
1193 | #ifdef HAVE_POLL | 1193 | #ifdef HAVE_POLL |
1194 | res = test_upgrade (MHD_USE_POLL_INTERNALLY, | 1194 | res = test_upgrade (MHD_USE_POLL_INTERNAL_THREAD, |
1195 | 0); | 1195 | 0); |
1196 | error_count += res; | 1196 | error_count += res; |
1197 | if (res) | 1197 | if (res) |
1198 | fprintf (stderr, "FAILED: Upgrade with internal poll, return code %d.\n", res); | 1198 | fprintf (stderr, "FAILED: Upgrade with internal poll, return code %d.\n", res); |
1199 | else if (verbose) | 1199 | else if (verbose) |
1200 | printf ("PASSED: Upgrade with internal poll.\n"); | 1200 | printf ("PASSED: Upgrade with internal poll.\n"); |
1201 | res = test_upgrade (MHD_USE_POLL_INTERNALLY, | 1201 | res = test_upgrade (MHD_USE_POLL_INTERNAL_THREAD, |
1202 | 2); | 1202 | 2); |
1203 | if (res) | 1203 | if (res) |
1204 | fprintf (stderr, "FAILED: Upgrade with internal poll with thread pool, return code %d.\n", res); | 1204 | fprintf (stderr, "FAILED: Upgrade with internal poll with thread pool, return code %d.\n", res); |
@@ -1206,13 +1206,13 @@ main (int argc, | |||
1206 | printf ("PASSED: Upgrade with internal poll with thread pool.\n"); | 1206 | printf ("PASSED: Upgrade with internal poll with thread pool.\n"); |
1207 | #endif | 1207 | #endif |
1208 | #ifdef EPOLL_SUPPORT | 1208 | #ifdef EPOLL_SUPPORT |
1209 | res = test_upgrade (MHD_USE_EPOLL_INTERNALLY, | 1209 | res = test_upgrade (MHD_USE_EPOLL_INTERNAL_THREAD, |
1210 | 0); | 1210 | 0); |
1211 | if (res) | 1211 | if (res) |
1212 | fprintf (stderr, "FAILED: Upgrade with internal epoll, return code %d.\n", res); | 1212 | fprintf (stderr, "FAILED: Upgrade with internal epoll, return code %d.\n", res); |
1213 | else if (verbose) | 1213 | else if (verbose) |
1214 | printf ("PASSED: Upgrade with internal epoll.\n"); | 1214 | printf ("PASSED: Upgrade with internal epoll.\n"); |
1215 | res = test_upgrade (MHD_USE_EPOLL_INTERNALLY, | 1215 | res = test_upgrade (MHD_USE_EPOLL_INTERNAL_THREAD, |
1216 | 2); | 1216 | 2); |
1217 | if (res) | 1217 | if (res) |
1218 | fprintf (stderr, "FAILED: Upgrade with internal epoll, return code %d.\n", res); | 1218 | fprintf (stderr, "FAILED: Upgrade with internal epoll, return code %d.\n", res); |