Commit 384c8f35 authored by Yang Tse's avatar Yang Tse
Browse files

Use curl_global_init() and curl_global_cleanup(). 

Improve cleanup in case of initialization failure.
parent f44ef427

tests/libtest/lib500.c

+17 −1
Original line number Diff line number Diff line
@@ -3,11 +3,27 @@ 
int test(char *URL)

{

  CURLcode res;

  CURL *curl = curl_easy_init();

  CURL *curl;



  if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {

    fprintf(stderr, "curl_global_init() failed\n");

    return TEST_ERR_MAJOR_BAD;

  }



  if ((curl = curl_easy_init()) == NULL) {

    fprintf(stderr, "curl_easy_init() failed\n");

    curl_global_cleanup();

    return TEST_ERR_MAJOR_BAD;

  }



  curl_easy_setopt(curl, CURLOPT_URL, URL);

  curl_easy_setopt(curl, CURLOPT_HEADER, TRUE);



  res = curl_easy_perform(curl);



  curl_easy_cleanup(curl);  

  curl_global_cleanup();



  return (int)res;

}

tests/libtest/lib501.c

+18 −2
Original line number Diff line number Diff line
@@ -3,12 +3,28 @@ 
int test(char *URL)

{

  CURLcode res;

  CURL *curl = curl_easy_init();

  CURL *curl;



  (void)URL; /* we don't use this */



  if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {

    fprintf(stderr, "curl_global_init() failed\n");

    return TEST_ERR_MAJOR_BAD;

  }



  if ((curl = curl_easy_init()) == NULL) {

    fprintf(stderr, "curl_easy_init() failed\n");

    curl_global_cleanup();

    return TEST_ERR_MAJOR_BAD;

  }



  curl_easy_setopt(curl, CURLOPT_HEADER, TRUE);



  res = curl_easy_perform(curl);



  curl_easy_cleanup(curl);

  return res;

  curl_global_cleanup();



  return (int)res;

}

tests/libtest/lib502.c

+52 −6
Original line number Diff line number Diff line 
#include "test.h"



#include "timeval.h"



#define MULTI_PERFORM_HANG_TIMEOUT 30 * 1000



/*

 * Get a single URL without select().

 */
@@ -8,25 +12,67 @@ int test(char *URL) 
{

  CURL *c;

  CURLM *m;

  CURLMcode res;

  int res = 0;

  int running=1;

  struct timeval mp_start;

  char mp_timedout = FALSE;



  if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {

    fprintf(stderr, "curl_global_init() failed\n");

    return TEST_ERR_MAJOR_BAD;

  }



  if ((c = curl_easy_init()) == NULL) {

    fprintf(stderr, "curl_easy_init() failed\n");

    curl_global_cleanup();

    return TEST_ERR_MAJOR_BAD;

  }



  curl_global_init(CURL_GLOBAL_ALL);

  c = curl_easy_init();

  curl_easy_setopt(c, CURLOPT_URL, URL);

  m = curl_multi_init();



  res = curl_multi_add_handle(m, c);

  if ((m = curl_multi_init()) == NULL) {

    fprintf(stderr, "curl_multi_init() failed\n");

    curl_easy_cleanup(c);

    curl_global_cleanup();

    return TEST_ERR_MAJOR_BAD;

  }



  if ((res = (int)curl_multi_add_handle(m, c)) != CURLM_OK) {

    fprintf(stderr, "curl_multi_add_handle() failed, "

            "with code %d\n", res);

    curl_multi_cleanup(m);

    curl_easy_cleanup(c);

    curl_global_cleanup();

    return TEST_ERR_MAJOR_BAD;

  }



  mp_timedout = FALSE;

  mp_start = curlx_tvnow();



  while (running) {

    res = curl_multi_perform(m, &running);

    res = (int)curl_multi_perform(m, &running);

    if (curlx_tvdiff(curlx_tvnow(), mp_start) > 

        MULTI_PERFORM_HANG_TIMEOUT) {

      mp_timedout = TRUE;

      break;

    }

    if (running <= 0) {

      fprintf(stderr, "nothing left running.\n");

      break;

    }

  }



  if (mp_timedout) {

    if (mp_timedout) fprintf(stderr, "mp_timedout\n");

    fprintf(stderr, "ABORTING TEST, since it seems "

            "that it would have run forever.\n");

    res = TEST_ERR_RUNS_FOREVER;

  }



  curl_multi_remove_handle(m, c);

  curl_easy_cleanup(c);

  curl_multi_cleanup(m);

  curl_global_cleanup();



  return res;

}

tests/libtest/lib503.c

+27 −7
Original line number Diff line number Diff line
@@ -28,8 +28,17 @@ int test(char *URL) 
  char ml_timedout = FALSE;

  char mp_timedout = FALSE;



  curl_global_init(CURL_GLOBAL_ALL);

  c = curl_easy_init();

  if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {

    fprintf(stderr, "curl_global_init() failed\n");

    return TEST_ERR_MAJOR_BAD;

  }



  if ((c = curl_easy_init()) == NULL) {

    fprintf(stderr, "curl_easy_init() failed\n");

    curl_global_cleanup();

    return TEST_ERR_MAJOR_BAD;

  }



  curl_easy_setopt(c, CURLOPT_PROXY, arg2); /* set in first.c */

  curl_easy_setopt(c, CURLOPT_URL, URL);

  curl_easy_setopt(c, CURLOPT_USERPWD, "test:ing");
@@ -37,10 +46,21 @@ int test(char *URL) 
  curl_easy_setopt(c, CURLOPT_HTTPPROXYTUNNEL, 1);

  curl_easy_setopt(c, CURLOPT_HEADER, 1);



  if ((m = curl_multi_init()) == NULL) {

    fprintf(stderr, "curl_multi_init() failed\n");

    curl_easy_cleanup(c);

    curl_global_cleanup();

    return TEST_ERR_MAJOR_BAD;

  }



  m = curl_multi_init();



  res = (int)curl_multi_add_handle(m, c);

  if ((res = (int)curl_multi_add_handle(m, c)) != CURLM_OK) {

    fprintf(stderr, "curl_multi_add_handle() failed, "

            "with code %d\n", res);

    curl_multi_cleanup(m);

    curl_easy_cleanup(c);

    curl_global_cleanup();

    return TEST_ERR_MAJOR_BAD;

  }



  ml_timedout = FALSE;

  ml_start = curlx_tvnow();
@@ -106,14 +126,14 @@ int test(char *URL) 
    if (mp_timedout) fprintf(stderr, "mp_timedout\n");

    fprintf(stderr, "ABORTING TEST, since it seems "

            "that it would have run forever.\n");

    res = 77;

    res = TEST_ERR_RUNS_FOREVER;

  }



  curl_multi_remove_handle(m, c);

  curl_easy_cleanup(c);

  curl_multi_cleanup(m);



  curl_global_cleanup();



  return res;

}

tests/libtest/lib504.c

+85 −65
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ int test(char *URL) 
  CURLM *m;

  fd_set rd, wr, exc;

  CURLMcode res;

  char done = FALSE;

  int running;

  int max_fd;

  int rc;
@@ -30,8 +31,16 @@ int test(char *URL) 
  char ml_timedout = FALSE;

  char mp_timedout = FALSE;



  curl_global_init(CURL_GLOBAL_ALL);

  c = curl_easy_init();

  if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {

    fprintf(stderr, "curl_global_init() failed\n");

    return TEST_ERR_MAJOR_BAD;

  }



  if ((c = curl_easy_init()) == NULL) {

    fprintf(stderr, "curl_easy_init() failed\n");

    curl_global_cleanup();

    return TEST_ERR_MAJOR_BAD;

  }



  /* the point here being that there must not run anything on the given

     proxy port */
@@ -39,17 +48,26 @@ int test(char *URL) 
  curl_easy_setopt(c, CURLOPT_URL, URL);

  curl_easy_setopt(c, CURLOPT_VERBOSE, 1);



  m = curl_multi_init();

  if ((m = curl_multi_init()) == NULL) {

    fprintf(stderr, "curl_multi_init() failed\n");

    curl_easy_cleanup(c);

    curl_global_cleanup();

    return TEST_ERR_MAJOR_BAD;

  }



  res = curl_multi_add_handle(m, c);

  if(res && (res != CURLM_CALL_MULTI_PERFORM))

    ; /* major failure */

  else {

  if ((res = (int)curl_multi_add_handle(m, c)) != CURLM_OK) {

    fprintf(stderr, "curl_multi_add_handle() failed, "

            "with code %d\n", res);

    curl_multi_cleanup(m);

    curl_easy_cleanup(c);

    curl_global_cleanup();

    return TEST_ERR_MAJOR_BAD;

  }



  ml_timedout = FALSE;

  ml_start = curlx_tvnow();



    do {

  while (!done) {

    struct timeval interval;



    interval.tv_sec = 1;
@@ -60,22 +78,24 @@ int test(char *URL) 
      ml_timedout = TRUE;

      break;

    }

    mp_timedout = FALSE;

    mp_start = curlx_tvnow();



    fprintf(stderr, "curl_multi_perform()\n");



      mp_timedout = FALSE;

      mp_start = curlx_tvnow();

    res = CURLM_CALL_MULTI_PERFORM;



      do {

        res = curl_multi_perform(m, &running);

    while (res == CURLM_CALL_MULTI_PERFORM) {

      res = (int)curl_multi_perform(m, &running);

      if (curlx_tvdiff(curlx_tvnow(), mp_start) > 

          MULTI_PERFORM_HANG_TIMEOUT) {

        mp_timedout = TRUE;

        break;

      }

      } while (res == CURLM_CALL_MULTI_PERFORM);

    }

    if (mp_timedout)

      break;



    if(!running) {

      /* This is where this code is expected to reach */

      int numleft;
@@ -107,20 +127,20 @@ int test(char *URL) 
    }

    rc = select_test(max_fd+1, &rd, &wr, &exc, &interval);

    fprintf(stderr, "select returned %d\n", rc);

  }



    } while(1);

  if (ml_timedout || mp_timedout) {

    if (ml_timedout) fprintf(stderr, "ml_timedout\n");

    if (mp_timedout) fprintf(stderr, "mp_timedout\n");

    fprintf(stderr, "ABORTING TEST, since it seems "

            "that it would have run forever.\n");

      ret = 77;

    }

    ret = TEST_ERR_RUNS_FOREVER;

  }



  curl_multi_remove_handle(m, c);

  curl_easy_cleanup(c);

  curl_multi_cleanup(m);

  curl_global_cleanup();



  return ret;

}