mirror of
https://github.com/moparisthebest/curl
synced 2024-11-10 03:25: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 commit ec691ca3 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 commit ec691ca3, 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. Commit ec691ca3 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.
75 lines
2.6 KiB
C
75 lines
2.6 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2011, 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 <curl/curl.h>
|
|
#include "urldata.h"
|
|
#include "sendf.h"
|
|
#include "multiif.h"
|
|
#include "speedcheck.h"
|
|
|
|
void Curl_speedinit(struct SessionHandle *data)
|
|
{
|
|
memset(&data->state.keeps_speed, 0, sizeof(struct timeval));
|
|
}
|
|
|
|
CURLcode Curl_speedcheck(struct SessionHandle *data,
|
|
struct timeval now)
|
|
{
|
|
if((data->progress.current_speed >= 0) &&
|
|
data->set.low_speed_time &&
|
|
(Curl_tvlong(data->state.keeps_speed) != 0) &&
|
|
(data->progress.current_speed < data->set.low_speed_limit)) {
|
|
long howlong = Curl_tvdiff(now, data->state.keeps_speed);
|
|
long nextcheck = (data->set.low_speed_time * 1000) - howlong;
|
|
|
|
/* We are now below the "low speed limit". If we are below it
|
|
for "low speed time" seconds we consider that enough reason
|
|
to abort the download. */
|
|
if(nextcheck <= 0) {
|
|
/* we have been this slow for long enough, now die */
|
|
failf(data,
|
|
"Operation too slow. "
|
|
"Less than %ld bytes/sec transferred the last %ld seconds",
|
|
data->set.low_speed_limit,
|
|
data->set.low_speed_time);
|
|
return CURLE_OPERATION_TIMEDOUT;
|
|
}
|
|
else {
|
|
/* wait complete low_speed_time */
|
|
Curl_expire(data, nextcheck);
|
|
}
|
|
}
|
|
else {
|
|
/* we keep up the required speed all right */
|
|
data->state.keeps_speed = now;
|
|
|
|
if(data->set.low_speed_limit)
|
|
/* if there is a low speed limit enabled, we set the expire timer to
|
|
make this connection's speed get checked again no later than when
|
|
this time is up */
|
|
Curl_expire(data, data->set.low_speed_time*1000);
|
|
}
|
|
return CURLE_OK;
|
|
}
|