diff options
Diffstat (limited to 'src/testcurl/perf_get.c')
-rw-r--r-- | src/testcurl/perf_get.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/testcurl/perf_get.c b/src/testcurl/perf_get.c index 3da5f605..b215c837 100644 --- a/src/testcurl/perf_get.c +++ b/src/testcurl/perf_get.c | |||
@@ -226,7 +226,8 @@ testInternalGet (int port, int poll_flag) | |||
226 | } | 226 | } |
227 | curl_easy_cleanup (c); | 227 | curl_easy_cleanup (c); |
228 | } | 228 | } |
229 | stop (poll_flag == MHD_USE_POLL ? "internal thread with poll()" : | 229 | stop (poll_flag == MHD_USE_AUTO ? "internal thread with 'auto'" : |
230 | poll_flag == MHD_USE_POLL ? "internal thread with poll()" : | ||
230 | poll_flag == MHD_USE_EPOLL ? "internal thread with epoll" : "internal thread with select()"); | 231 | poll_flag == MHD_USE_EPOLL ? "internal thread with epoll" : "internal thread with select()"); |
231 | MHD_stop_daemon (d); | 232 | MHD_stop_daemon (d); |
232 | if (cbc.pos != strlen ("/hello_world")) | 233 | if (cbc.pos != strlen ("/hello_world")) |
@@ -286,7 +287,8 @@ testMultithreadedGet (int port, int poll_flag) | |||
286 | } | 287 | } |
287 | curl_easy_cleanup (c); | 288 | curl_easy_cleanup (c); |
288 | } | 289 | } |
289 | stop ((poll_flag & MHD_USE_POLL) ? "internal thread with poll() and thread per connection" : | 290 | stop ((poll_flag & MHD_USE_AUTO) ? "internal thread with 'auto' and thread per connection" : |
291 | (poll_flag & MHD_USE_POLL) ? "internal thread with poll() and thread per connection" : | ||
290 | (poll_flag & MHD_USE_EPOLL) ? "internal thread with epoll and thread per connection" : | 292 | (poll_flag & MHD_USE_EPOLL) ? "internal thread with epoll and thread per connection" : |
291 | "internal thread with select() and thread per connection"); | 293 | "internal thread with select() and thread per connection"); |
292 | MHD_stop_daemon (d); | 294 | MHD_stop_daemon (d); |
@@ -347,7 +349,8 @@ testMultithreadedPoolGet (int port, int poll_flag) | |||
347 | } | 349 | } |
348 | curl_easy_cleanup (c); | 350 | curl_easy_cleanup (c); |
349 | } | 351 | } |
350 | stop (0 != (poll_flag & MHD_USE_POLL) ? "internal thread pool with poll()" : | 352 | stop (0 != (poll_flag & MHD_USE_AUTO) ? "internal thread pool with 'auto'" : |
353 | 0 != (poll_flag & MHD_USE_POLL) ? "internal thread pool with poll()" : | ||
351 | 0 != (poll_flag & MHD_USE_EPOLL) ? "internal thread pool with epoll" : "internal thread pool with select()"); | 354 | 0 != (poll_flag & MHD_USE_EPOLL) ? "internal thread pool with epoll" : "internal thread pool with select()"); |
352 | MHD_stop_daemon (d); | 355 | MHD_stop_daemon (d); |
353 | if (cbc.pos != strlen ("/hello_world")) | 356 | if (cbc.pos != strlen ("/hello_world")) |
@@ -521,6 +524,9 @@ main (int argc, char *const *argv) | |||
521 | "/hello_world", | 524 | "/hello_world", |
522 | MHD_RESPMEM_MUST_COPY); | 525 | MHD_RESPMEM_MUST_COPY); |
523 | errorCount += testExternalGet (port++); | 526 | errorCount += testExternalGet (port++); |
527 | errorCount += testInternalGet (port++, MHD_USE_AUTO); | ||
528 | errorCount += testMultithreadedGet (port++, MHD_USE_AUTO); | ||
529 | errorCount += testMultithreadedPoolGet (port++, MHD_USE_AUTO); | ||
524 | errorCount += testInternalGet (port++, 0); | 530 | errorCount += testInternalGet (port++, 0); |
525 | errorCount += testMultithreadedGet (port++, 0); | 531 | errorCount += testMultithreadedGet (port++, 0); |
526 | errorCount += testMultithreadedPoolGet (port++, 0); | 532 | errorCount += testMultithreadedPoolGet (port++, 0); |