moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

don't select() forever, set a timeout so at least the test fails nice

Browse Source
This commit is contained in:
Daniel Stenberg 2003-10-24 20:58:34 +00:00
parent ed7ac3c932
commit da0b380655
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/libtest/lib503.c
View File

@ -40,6 +40,7 @@ CURLcode test(char *URL)
while(!done) {
fd_set rd, wr, exc;
int max_fd;
struct timeval interval={1,0};
while (res == CURLM_CALL_MULTI_PERFORM) {
res = curl_multi_perform(m, &running);
@ -66,7 +67,7 @@ CURLcode test(char *URL)
return 89;
}
if (select(max_fd+1, &rd, &wr, &exc, NULL) == -1) {
if (select(max_fd+1, &rd, &wr, &exc, &interval) == -1) {
fprintf(stderr, "bad select??\n");
return 95;
}

23
tests/libtest/lib504.c
View File

@ -22,6 +22,7 @@ CURLcode test(char *URL)
CURLMcode res;
int running;
int max_fd;
int rc;
curl_global_init(CURL_GLOBAL_ALL);
c = curl_easy_init();
@ -36,26 +37,29 @@ CURLcode test(char *URL)
res = curl_multi_add_handle(m, c);
if(res && (res != CURLM_CALL_MULTI_PERFORM))
return 1; /* major failure */
return 1; /* major failure */
do {
struct timeval interval={1,0};
fprintf(stderr, "curl_multi_perform()\n");
do {
res = curl_multi_perform(m, &running);
} while (res == CURLM_CALL_MULTI_PERFORM);
} while (res == CURLM_CALL_MULTI_PERFORM);
if(!running) {
/* This is where this code is expected to reach */
int numleft;
CURLMsg *msg = curl_multi_info_read(m, &numleft);
fprintf(stderr, "Not running\n");
fprintf(stderr, "Expected: not running\n");
if(msg && !numleft)
ret = 100; /* this is where we should be */
else
ret = 99; /* not correct */
break;
}
fprintf(stderr, "running %d res %d\n", running, res);
fprintf(stderr, "running == %d, res == %d\n", running, res);
if (res != CURLM_OK) {
fprintf(stderr, "not okay???\n");
ret = 2;
break;
}
@ -65,17 +69,16 @@ CURLcode test(char *URL)
FD_ZERO(&exc);
max_fd = 0;
fprintf(stderr, "_fdset()\n");
fprintf(stderr, "curl_multi_fdset()\n");
if (curl_multi_fdset(m, &rd, &wr, &exc, &max_fd) != CURLM_OK) {
fprintf(stderr, "unexpected failured of fdset.\n");
ret = 3;
break;
}
fprintf(stderr, "select\n");
select(max_fd+1, &rd, &wr, &exc, NULL);
rc = select(max_fd+1, &rd, &wr, &exc, &interval);
fprintf(stderr, "select returned %d\n", rc);
fprintf(stderr, "loop!\n");
} while(1);
} while(rc);
curl_multi_remove_handle(m, c);
curl_easy_cleanup(c);