4a5aa6682d
This reverts renaming and usage of lib/*.h header files done
28-12-2012, reverting 2 commits:
f871de0... build: make use of 76 lib/*.h renamed files
ffd8e12... build: rename 76 lib/*.h files
This also reverts removal of redundant include guard (redundant thanks
to changes in above commits) done 2-12-2013, reverting 1 commit:
c087374... curl_setup.h: remove redundant include guard
This also reverts renaming and usage of lib/*.c source files done
3-12-2013, reverting 3 commits:
13606bb... build: make use of 93 lib/*.c renamed files
5b6e792... build: rename 93 lib/*.c files
7d83dff... build: commit 13606bbfde
follow-up 1
Start of related discussion thread:
http://curl.haxx.se/mail/lib-2013-01/0012.html
Asking for confirmation on pushing this revertion commit:
http://curl.haxx.se/mail/lib-2013-01/0048.html
Confirmation summary:
http://curl.haxx.se/mail/lib-2013-01/0079.html
NOTICE: The list of 2 files that have been modified by other
intermixed commits, while renamed, and also by at least one
of the 6 commits this one reverts follows below. These 2 files
will exhibit a hole in history unless git's '--follow' option
is used when viewing logs.
lib/curl_imap.h
lib/curl_smtp.h
142 lines
4.2 KiB
C
142 lines
4.2 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at http://curl.haxx.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
***************************************************************************/
|
|
#include "test.h"
|
|
|
|
#include "testtrace.h"
|
|
#include "memdebug.h"
|
|
|
|
#ifdef LIB585
|
|
|
|
static int counter;
|
|
|
|
static curl_socket_t tst_opensocket(void *clientp,
|
|
curlsocktype purpose,
|
|
struct curl_sockaddr *addr)
|
|
{
|
|
(void)clientp;
|
|
(void)purpose;
|
|
printf("[OPEN] counter: %d\n", ++counter);
|
|
return socket(addr->family, addr->socktype, addr->protocol);
|
|
}
|
|
|
|
static int tst_closesocket(void *clientp, curl_socket_t sock)
|
|
{
|
|
(void)clientp;
|
|
printf("[CLOSE] counter: %d\n", counter--);
|
|
return sclose(sock);
|
|
}
|
|
|
|
static void setupcallbacks(CURL *curl)
|
|
{
|
|
curl_easy_setopt(curl, CURLOPT_OPENSOCKETFUNCTION, tst_opensocket);
|
|
curl_easy_setopt(curl, CURLOPT_CLOSESOCKETFUNCTION, tst_closesocket);
|
|
counter = 0;
|
|
}
|
|
|
|
#else
|
|
#define setupcallbacks(x) Curl_nop_stmt
|
|
#endif
|
|
|
|
|
|
int test(char *URL)
|
|
{
|
|
CURLcode res;
|
|
CURL *curl;
|
|
char *ipstr=NULL;
|
|
|
|
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;
|
|
}
|
|
|
|
test_setopt(curl, CURLOPT_URL, URL);
|
|
test_setopt(curl, CURLOPT_HEADER, 1L);
|
|
|
|
libtest_debug_config.nohex = 1;
|
|
libtest_debug_config.tracetime = 1;
|
|
test_setopt(curl, CURLOPT_DEBUGDATA, &libtest_debug_config);
|
|
test_setopt(curl, CURLOPT_DEBUGFUNCTION, libtest_debug_cb);
|
|
test_setopt(curl, CURLOPT_VERBOSE, 1L);
|
|
|
|
if(libtest_arg3 && !strcmp(libtest_arg3, "activeftp"))
|
|
test_setopt(curl, CURLOPT_FTPPORT, "-");
|
|
|
|
setupcallbacks(curl);
|
|
|
|
res = curl_easy_perform(curl);
|
|
|
|
if(!res) {
|
|
FILE *moo;
|
|
res = curl_easy_getinfo(curl, CURLINFO_PRIMARY_IP, &ipstr);
|
|
moo = fopen(libtest_arg2, "wb");
|
|
if(moo) {
|
|
double time_namelookup;
|
|
double time_connect;
|
|
double time_pretransfer;
|
|
double time_starttransfer;
|
|
double time_total;
|
|
fprintf(moo, "IP: %s\n", ipstr);
|
|
curl_easy_getinfo(curl, CURLINFO_NAMELOOKUP_TIME, &time_namelookup);
|
|
curl_easy_getinfo(curl, CURLINFO_CONNECT_TIME, &time_connect);
|
|
curl_easy_getinfo(curl, CURLINFO_PRETRANSFER_TIME, &time_pretransfer);
|
|
curl_easy_getinfo(curl, CURLINFO_STARTTRANSFER_TIME,
|
|
&time_starttransfer);
|
|
curl_easy_getinfo(curl, CURLINFO_TOTAL_TIME, &time_total);
|
|
|
|
/* since the timing will always vary we only compare relative differences
|
|
between these 5 times */
|
|
if(time_namelookup >= time_connect) {
|
|
fprintf(moo, "namelookup vs connect: %f %f\n",
|
|
time_namelookup, time_connect);
|
|
}
|
|
if(time_connect >= time_pretransfer) {
|
|
fprintf(moo, "connect vs pretransfer: %f %f\n",
|
|
time_connect, time_pretransfer);
|
|
}
|
|
if(time_pretransfer >= time_starttransfer) {
|
|
fprintf(moo, "pretransfer vs starttransfer: %f %f\n",
|
|
time_pretransfer, time_starttransfer);
|
|
}
|
|
if(time_starttransfer >= time_total) {
|
|
fprintf(moo, "starttransfer vs total: %f %f\n",
|
|
time_starttransfer, time_total);
|
|
}
|
|
|
|
fclose(moo);
|
|
}
|
|
}
|
|
|
|
test_cleanup:
|
|
|
|
curl_easy_cleanup(curl);
|
|
curl_global_cleanup();
|
|
|
|
return (int)res;
|
|
}
|
|
|