mirror of
https://github.com/moparisthebest/curl
synced 2024-11-05 09:05:04 -05:00
5a053ffe80
This commit renames lib/setup.h to lib/curl_setup.h and renames lib/setup_once.h to lib/curl_setup_once.h. Removes the need and usage of a header inclusion guard foreign to libcurl. [1] Removes the need and presence of an alarming notice we carried in old setup_once.h [2] ---------------------------------------- 1 - lib/setup_once.h used __SETUP_ONCE_H macro as header inclusion guard up to commitec691ca3
which changed this to HEADER_CURL_SETUP_ONCE_H, this single inclusion guard is enough to ensure that inclusion of lib/setup_once.h done from lib/setup.h is only done once. Additionally lib/setup.h has always used __SETUP_ONCE_H macro to protect inclusion of setup_once.h even after commitec691ca3
, this was to avoid a circular header inclusion triggered when building a c-ares enabled version with c-ares sources available which also has a setup_once.h header. Commitec691ca3
exposes the real nature of __SETUP_ONCE_H usage in lib/setup.h, it is a header inclusion guard foreign to libcurl belonging to c-ares's setup_once.h The renaming this commit does, fixes the circular header inclusion, and as such removes the need and usage of a header inclusion guard foreign to libcurl. Macro __SETUP_ONCE_H no longer used in libcurl. 2 - Due to the circular interdependency of old lib/setup_once.h and the c-ares setup_once.h header, old file lib/setup_once.h has carried back from 2006 up to now days an alarming and prominent notice about the need of keeping libcurl's and c-ares's setup_once.h in sync. Given that this commit fixes the circular interdependency, the need and presence of mentioned notice is removed. All mentioned interdependencies come back from now old days when the c-ares project lived inside a curl subdirectory. This commit removes last traces of such fact.
138 lines
3.9 KiB
C
138 lines
3.9 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 "curl_setup.h"
|
|
|
|
#include "testutil.h"
|
|
#include "memdebug.h"
|
|
|
|
#if defined(WIN32) && !defined(MSDOS)
|
|
|
|
struct timeval tutil_tvnow(void)
|
|
{
|
|
/*
|
|
** GetTickCount() is available on _all_ Windows versions from W95 up
|
|
** to nowadays. Returns milliseconds elapsed since last system boot,
|
|
** increases monotonically and wraps once 49.7 days have elapsed.
|
|
*/
|
|
struct timeval now;
|
|
DWORD milliseconds = GetTickCount();
|
|
now.tv_sec = milliseconds / 1000;
|
|
now.tv_usec = (milliseconds % 1000) * 1000;
|
|
return now;
|
|
}
|
|
|
|
#elif defined(HAVE_CLOCK_GETTIME_MONOTONIC)
|
|
|
|
struct timeval tutil_tvnow(void)
|
|
{
|
|
/*
|
|
** clock_gettime() is granted to be increased monotonically when the
|
|
** monotonic clock is queried. Time starting point is unspecified, it
|
|
** could be the system start-up time, the Epoch, or something else,
|
|
** in any case the time starting point does not change once that the
|
|
** system has started up.
|
|
*/
|
|
struct timeval now;
|
|
struct timespec tsnow;
|
|
if(0 == clock_gettime(CLOCK_MONOTONIC, &tsnow)) {
|
|
now.tv_sec = tsnow.tv_sec;
|
|
now.tv_usec = tsnow.tv_nsec / 1000;
|
|
}
|
|
/*
|
|
** Even when the configure process has truly detected monotonic clock
|
|
** availability, it might happen that it is not actually available at
|
|
** run-time. When this occurs simply fallback to other time source.
|
|
*/
|
|
#ifdef HAVE_GETTIMEOFDAY
|
|
else
|
|
(void)gettimeofday(&now, NULL);
|
|
#else
|
|
else {
|
|
now.tv_sec = (long)time(NULL);
|
|
now.tv_usec = 0;
|
|
}
|
|
#endif
|
|
return now;
|
|
}
|
|
|
|
#elif defined(HAVE_GETTIMEOFDAY)
|
|
|
|
struct timeval tutil_tvnow(void)
|
|
{
|
|
/*
|
|
** gettimeofday() is not granted to be increased monotonically, due to
|
|
** clock drifting and external source time synchronization it can jump
|
|
** forward or backward in time.
|
|
*/
|
|
struct timeval now;
|
|
(void)gettimeofday(&now, NULL);
|
|
return now;
|
|
}
|
|
|
|
#else
|
|
|
|
struct timeval tutil_tvnow(void)
|
|
{
|
|
/*
|
|
** time() returns the value of time in seconds since the Epoch.
|
|
*/
|
|
struct timeval now;
|
|
now.tv_sec = (long)time(NULL);
|
|
now.tv_usec = 0;
|
|
return now;
|
|
}
|
|
|
|
#endif
|
|
|
|
/*
|
|
* Make sure that the first argument is the more recent time, as otherwise
|
|
* we'll get a weird negative time-diff back...
|
|
*
|
|
* Returns: the time difference in number of milliseconds.
|
|
*/
|
|
long tutil_tvdiff(struct timeval newer, struct timeval older)
|
|
{
|
|
return (newer.tv_sec-older.tv_sec)*1000+
|
|
(newer.tv_usec-older.tv_usec)/1000;
|
|
}
|
|
|
|
/*
|
|
* Same as tutil_tvdiff but with full usec resolution.
|
|
*
|
|
* Returns: the time difference in seconds with subsecond resolution.
|
|
*/
|
|
double tutil_tvdiff_secs(struct timeval newer, struct timeval older)
|
|
{
|
|
if(newer.tv_sec != older.tv_sec)
|
|
return (double)(newer.tv_sec-older.tv_sec)+
|
|
(double)(newer.tv_usec-older.tv_usec)/1000000.0;
|
|
else
|
|
return (double)(newer.tv_usec-older.tv_usec)/1000000.0;
|
|
}
|
|
|
|
/* return the number of seconds in the given input timeval struct */
|
|
long tutil_tvlong(struct timeval t1)
|
|
{
|
|
return t1.tv_sec;
|
|
}
|
|
|