emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add defs for default fetch cache connection limits and use them in

Browse Source 
xbps_fetch_cache_connection() if 0 is passed as argument.

xbps-bin: enable fetch cached connection when downloading binpkgs.

--HG--
extra : convert_revision : xtraeme%40gmail.com-20100124153156-4updprik11nwi7c1
This commit is contained in:
Juan RP 2010-01-24 16:31:56 +01:00
parent 801785cbab
commit 088baa7699
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/xbps-bin/install.c
View File

@ -102,6 +102,9 @@ download_package_list(prop_object_iterator_t iter)
if (cachedir == NULL) if (cachedir == NULL)
return EINVAL; return EINVAL;
/* Set default limit of global and per-host cached connections */
xbps_fetch_set_cache_connection(0, 0);
while ((obj = prop_object_iterator_next(iter)) != NULL) { while ((obj = prop_object_iterator_next(iter)) != NULL) {
found_binpkg = false; found_binpkg = false;
if (!prop_dictionary_get_cstring_nocopy(obj, if (!prop_dictionary_get_cstring_nocopy(obj,

20
include/xbps_api.h
View File

@ -217,6 +217,20 @@ int xbps_cmpver(const char *pkg1, const char *pkg2);
/** @addtogroup download */ /** @addtogroup download */
/*@{*/ /*@{*/
/**
* @def XBPS_FETCH_CACHECONN
*
* Default (global) limit of cached connections used in libfetch.
*/
#define XBPS_FETCH_CACHECONN 8
/**
* @def XBPS_FETCH_CACHECONN_HOST
*
* Default (per host) limit of cached connections used in libfetch.
*/
#define XBPS_FETCH_CACHECONN_HOST 16
/** /**
* Download a file from a remote URL. * Download a file from a remote URL.
* *
@ -237,8 +251,10 @@ int xbps_fetch_file(const char *uri,
/** /**
* Sets the libfetch's cache connection limits. * Sets the libfetch's cache connection limits.
* *
* @param[in] global Number of global cached connections, by default 8. * @param[in] global Number of global cached connections, if set to 0
* @param[in] per_host Number of per host cached connections, by default 16. * by default it's set to XBPS_FETCH_CACHECONN.
* @param[in] per_host Number of per host cached connections, if set to 0
* by default it's set to XBPS_FETCH_CACHECONN_HOST.
*/ */
void xbps_fetch_set_cache_connection(int global, int per_host); void xbps_fetch_set_cache_connection(int global, int per_host);

7
lib/download.c
View File

@ -58,9 +58,6 @@ struct xferstat {
const char *name; const char *name;
}; };
static int cache_connections = 8;
static int cache_connections_host = 16;
/* /*
* Compute and display ETA * Compute and display ETA
*/ */
@ -197,9 +194,9 @@ void
xbps_fetch_set_cache_connection(int global, int per_host) xbps_fetch_set_cache_connection(int global, int per_host)
{ {
if (global == 0) if (global == 0)
global = cache_connections; global = XBPS_FETCH_CACHECONN;
if (per_host == 0) if (per_host == 0)
per_host = cache_connections_host; per_host = XBPS_FETCH_CACHECONN_HOST;
fetchConnectionCacheInit(global, per_host); fetchConnectionCacheInit(global, per_host);
} }