moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

clean up properly on failure to enable easier libcurl leak detection

Browse Source
This commit is contained in:
Daniel Stenberg 2004-05-14 09:22:12 +00:00
parent 9ce0a7b49d
commit e2e593a036
5 changed files with 68 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/libtest/lib503.c
View File

@ -54,7 +54,7 @@ int test(char *URL)
if (res != CURLM_OK) {
fprintf(stderr, "not okay???\n");
return 80;
break;
}
FD_ZERO(&rd);

86
tests/libtest/lib504.c
View File

@ -35,53 +35,55 @@ int test(char *URL)
res = curl_multi_add_handle(m, c);
if(res && (res != CURLM_CALL_MULTI_PERFORM))
return 1; /* major failure */
do {
struct timeval interval;
interval.tv_sec = 1;
interval.tv_usec = 0;
fprintf(stderr, "curl_multi_perform()\n");
; /* major failure */
else {
do {
res = curl_multi_perform(m, &running);
} 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, "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);
struct timeval interval;
if (res != CURLM_OK) {
ret = 2;
break;
}
interval.tv_sec = 1;
interval.tv_usec = 0;
FD_ZERO(&rd);
FD_ZERO(&wr);
FD_ZERO(&exc);
max_fd = 0;
fprintf(stderr, "curl_multi_perform()\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;
}
rc = select(max_fd+1, &rd, &wr, &exc, &interval);
fprintf(stderr, "select returned %d\n", rc);
do {
res = curl_multi_perform(m, &running);
} 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, "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);
/* we only allow a certain number of loops to avoid hanging here
forever */
} while(rc && (--loop>0));
if (res != CURLM_OK) {
ret = 2;
break;
}
FD_ZERO(&rd);
FD_ZERO(&wr);
FD_ZERO(&exc);
max_fd = 0;
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;
}
rc = select(max_fd+1, &rd, &wr, &exc, &interval);
fprintf(stderr, "select returned %d\n", rc);
/* we only allow a certain number of loops to avoid hanging here
forever */
} while(rc && (--loop>0));
}
curl_multi_remove_handle(m, c);
curl_easy_cleanup(c);

9
tests/libtest/lib505.c
View File

@ -72,9 +72,14 @@ int test(char *URL)
/* get a curl handle */
curl = curl_easy_init();
if(curl) {
struct curl_slist *hl;
/* build a list of commands to pass to libcurl */
headerlist = curl_slist_append(headerlist, buf_1);
headerlist = curl_slist_append(headerlist, buf_2);
hl = curl_slist_append(headerlist, buf_1);
if(hl) {
headerlist = curl_slist_append(hl, buf_2);
if(hl)
headerlist = hl;
}
/* enable uploading */
curl_easy_setopt(curl, CURLOPT_UPLOAD, TRUE) ;

16
tests/libtest/lib506.c
View File

@ -148,13 +148,19 @@ int test(char *URL)
/* prepare share */
printf( "SHARE_INIT\n" );
share = curl_share_init();
curl_share_setopt( share, CURLSHOPT_LOCKFUNC, lock);
curl_share_setopt( share, CURLSHOPT_UNLOCKFUNC, unlock);
curl_share_setopt( share, CURLSHOPT_USERDATA, &user);
scode = curl_share_setopt( share, CURLSHOPT_LOCKFUNC, lock);
scode += curl_share_setopt( share, CURLSHOPT_UNLOCKFUNC, unlock);
scode += curl_share_setopt( share, CURLSHOPT_USERDATA, &user);
printf( "CURL_LOCK_DATA_COOKIE\n" );
curl_share_setopt( share, CURLSHOPT_SHARE, CURL_LOCK_DATA_COOKIE);
scode += curl_share_setopt( share, CURLSHOPT_SHARE, CURL_LOCK_DATA_COOKIE);
printf( "CURL_LOCK_DATA_DNS\n" );
curl_share_setopt( share, CURLSHOPT_SHARE, CURL_LOCK_DATA_DNS);
scode += curl_share_setopt( share, CURLSHOPT_SHARE, CURL_LOCK_DATA_DNS);
if(scode) {
curl_share_cleanup(share);
return 2;
}
res = 0;

7
tests/libtest/lib507.c
View File

@ -39,9 +39,10 @@ int test(char *URL)
}
}
msg = curl_multi_info_read(multi, &still_running);
/* this should now contain a result code from the easy handle,
get it */
i = msg->data.result;
if(msg)
/* this should now contain a result code from the easy handle,
get it */
i = msg->data.result;
curl_multi_cleanup(multi);
curl_easy_cleanup(curls);