summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/alpm.c
diff options
context:
space:
mode:
authorAnatol Pomozov <anatol.pomozov@gmail.com>2020-03-09 23:23:12 +0100
committerAllan McRae <allan@archlinux.org>2020-05-09 03:58:21 +0200
commitdc98d0ea09f3632cd28a12099f3f09d466dcad1d (patch)
treeb98d0d579b2f214b2c5989e0bd5149dc38ebee2f /lib/libalpm/alpm.c
parenta8a1a1bb3ec98a8471cb5cd13d096f39a267f789 (diff)
downloadpacman-dc98d0ea09f3632cd28a12099f3f09d466dcad1d.tar.gz
pacman-dc98d0ea09f3632cd28a12099f3f09d466dcad1d.tar.xz
Add multi_curl handle to ALPM global context
To be able to run multiple download in parallel efficiently we need to use curl_multi interface [1]. It introduces a set of APIs over new type of handler 'CURLM'. Create CURLM object at the application start and set it to global ALPM context. The 'single-download' CURL handle moves to payload struct. A new CURL handle is created for each payload with intention to be processed by CURLM. Note that curl_download_internal() is not ported to CURLM interface due to the fact that the function will go away soon. [1] https://curl.haxx.se/libcurl/c/libcurl-multi.html Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm/alpm.c')
-rw-r--r--lib/libalpm/alpm.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c
index d1265214..34c5b4b2 100644
--- a/lib/libalpm/alpm.c
+++ b/lib/libalpm/alpm.c
@@ -70,6 +70,11 @@ alpm_handle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath,
goto cleanup;
}
+#ifdef HAVE_LIBCURL
+ curl_global_init(CURL_GLOBAL_ALL);
+ myhandle->curlm = curl_multi_init();
+#endif
+
#ifdef ENABLE_NLS
bindtextdomain("libalpm", LOCALEDIR);
#endif
@@ -104,13 +109,14 @@ int SYMEXPORT alpm_release(alpm_handle_t *myhandle)
ret = -1;
}
- _alpm_handle_unlock(myhandle);
- _alpm_handle_free(myhandle);
-
#ifdef HAVE_LIBCURL
+ curl_multi_cleanup(myhandle->curlm);
curl_global_cleanup();
#endif
+ _alpm_handle_unlock(myhandle);
+ _alpm_handle_free(myhandle);
+
return ret;
}