aboutsummaryrefslogtreecommitdiff
path: root/src/testcurl/perf_get.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testcurl/perf_get.c')
-rw-r--r--src/testcurl/perf_get.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/testcurl/perf_get.c b/src/testcurl/perf_get.c
index 651bc36e..7ed706b7 100644
--- a/src/testcurl/perf_get.c
+++ b/src/testcurl/perf_get.c
@@ -368,7 +368,12 @@ testExternalGet (int port)
368 fd_set rs; 368 fd_set rs;
369 fd_set ws; 369 fd_set ws;
370 fd_set es; 370 fd_set es;
371 MHD_socket max; 371 MHD_socket maxsock;
372#ifdef MHD_WINSOCK_SOCKETS
373 int maxposixs; /* Max socket number unused on W32 */
374#else /* MHD_POSIX_SOCKETS */
375#define maxposixs maxsock
376#endif /* MHD_POSIX_SOCKETS */
372 int running; 377 int running;
373 struct CURLMsg *msg; 378 struct CURLMsg *msg;
374 time_t start; 379 time_t start;
@@ -421,12 +426,13 @@ testExternalGet (int port)
421 start = time (NULL); 426 start = time (NULL);
422 while ((time (NULL) - start < 5) && (c != NULL)) 427 while ((time (NULL) - start < 5) && (c != NULL))
423 { 428 {
424 max = 0; 429 maxsock = MHD_INVALID_SOCKET;
430 maxposixs = -1;
425 FD_ZERO (&rs); 431 FD_ZERO (&rs);
426 FD_ZERO (&ws); 432 FD_ZERO (&ws);
427 FD_ZERO (&es); 433 FD_ZERO (&es);
428 curl_multi_perform (multi, &running); 434 curl_multi_perform (multi, &running);
429 mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); 435 mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
430 if (mret != CURLM_OK) 436 if (mret != CURLM_OK)
431 { 437 {
432 curl_multi_remove_handle (multi, c); 438 curl_multi_remove_handle (multi, c);
@@ -435,7 +441,7 @@ testExternalGet (int port)
435 MHD_stop_daemon (d); 441 MHD_stop_daemon (d);
436 return 2048; 442 return 2048;
437 } 443 }
438 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) 444 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
439 { 445 {
440 curl_multi_remove_handle (multi, c); 446 curl_multi_remove_handle (multi, c);
441 curl_multi_cleanup (multi); 447 curl_multi_cleanup (multi);
@@ -445,7 +451,7 @@ testExternalGet (int port)
445 } 451 }
446 tv.tv_sec = 0; 452 tv.tv_sec = 0;
447 tv.tv_usec = 1000; 453 tv.tv_usec = 1000;
448 select (max + 1, &rs, &ws, &es, &tv); 454 select (maxposixs + 1, &rs, &ws, &es, &tv);
449 curl_multi_perform (multi, &running); 455 curl_multi_perform (multi, &running);
450 if (running == 0) 456 if (running == 0)
451 { 457 {