diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2016-11-10 16:13:56 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2016-11-10 16:27:42 +0300 |
commit | 1b0c23c11965658cfead46eb014eda5d88b972cc (patch) | |
tree | 413a0cba835bb6cca60b66c307461e1167ccd105 /src/testcurl/perf_get_concurrent.c | |
parent | d2e9b53c6ee806175b1356cdb2ef9e2fae25f6d7 (diff) | |
download | libmicrohttpd-1b0c23c11965658cfead46eb014eda5d88b972cc.tar.gz libmicrohttpd-1b0c23c11965658cfead46eb014eda5d88b972cc.zip |
perf_get_concurrent: fixed tests descriptions
Diffstat (limited to 'src/testcurl/perf_get_concurrent.c')
-rw-r--r-- | src/testcurl/perf_get_concurrent.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/testcurl/perf_get_concurrent.c b/src/testcurl/perf_get_concurrent.c index 043be1c4..ebc76841 100644 --- a/src/testcurl/perf_get_concurrent.c +++ b/src/testcurl/perf_get_concurrent.c | |||
@@ -233,7 +233,8 @@ static int | |||
233 | testInternalGet (int port, int poll_flag) | 233 | testInternalGet (int port, int poll_flag) |
234 | { | 234 | { |
235 | struct MHD_Daemon *d; | 235 | struct MHD_Daemon *d; |
236 | const char * const test_desc = poll_flag ? "internal poll" : "internal select"; | 236 | const char * const test_desc = ((poll_flag & MHD_USE_POLL) ? "internal thread with poll()" : |
237 | (poll_flag & MHD_USE_EPOLL) ? "internal thread with epoll" : "internal thread with select()"); | ||
237 | const char * ret_val; | 238 | const char * ret_val; |
238 | 239 | ||
239 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | poll_flag, | 240 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | poll_flag, |
@@ -259,7 +260,9 @@ static int | |||
259 | testMultithreadedGet (int port, int poll_flag) | 260 | testMultithreadedGet (int port, int poll_flag) |
260 | { | 261 | { |
261 | struct MHD_Daemon *d; | 262 | struct MHD_Daemon *d; |
262 | const char * const test_desc = poll_flag ? "thread with poll" : "thread with select"; | 263 | const char * const test_desc = ((poll_flag & MHD_USE_POLL) ? "internal thread with poll() and thread per connection" : |
264 | (poll_flag & MHD_USE_EPOLL) ? "internal thread with epoll and thread per connection" | ||
265 | : "internal thread with select() and thread per connection"); | ||
263 | const char * ret_val; | 266 | const char * ret_val; |
264 | 267 | ||
265 | d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | poll_flag, | 268 | 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 | |||
284 | testMultithreadedPoolGet (int port, int poll_flag) | 287 | testMultithreadedPoolGet (int port, int poll_flag) |
285 | { | 288 | { |
286 | struct MHD_Daemon *d; | 289 | struct MHD_Daemon *d; |
287 | const char * const test_desc = poll_flag ? "thread pool with poll" : "thread pool with select"; | 290 | const char * const test_desc = ((poll_flag & MHD_USE_POLL) ? "internal thread pool with poll()" : |
291 | (poll_flag & MHD_USE_EPOLL) ? "internal thread poll with epoll" : "internal thread pool with select()"); | ||
288 | const char * ret_val; | 292 | const char * ret_val; |
289 | 293 | ||
290 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | poll_flag, | 294 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | poll_flag, |