- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] Add config option to specify amount of concurrent download streams
by Anatol Pomozov 06 Mar '20

06 Mar '20

It includes pacman.conf new 'ConcurrentDownloadStreams' option that specifies how many concurrent downloads curl starts in parallel. The value is set to '5' by default. Setting it to '0' removes upper limit on number of concurrent downloads. Add alpm_option_set_concurrent_download_streams() ALPM function that allows to set this config option programmatically. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- doc/pacman.conf.5.asciidoc | 5 +++++ etc/pacman.conf.in | 1 + lib/libalpm/alpm.h | 1 + lib/libalpm/handle.c | 12 ++++++++++++ lib/libalpm/handle.h | 1 + src/pacman/conf.c | 6 ++++++ src/pacman/conf.h | 2 ++ 7 files changed, 28 insertions(+) diff --git a/doc/pacman.conf.5.asciidoc b/doc/pacman.conf.5.asciidoc index b297e332..fb00ad18 100644 --- a/doc/pacman.conf.5.asciidoc +++ b/doc/pacman.conf.5.asciidoc @@ -205,6 +205,11 @@ Options Disable defaults for low speed limit and timeout on downloads. Use this if you have issues downloading files with proxy and/or security gateway. +*ConcurrentDownloadStreams*:: + Specifies number of concurrent download streams. This value is set to 5 + by default. Setting this value to 0 removes upper limit of concurrent + streams i.e. all files start downloading in parallel. + Repository Sections ------------------- diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 7446944f..0a857ef2 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -34,6 +34,7 @@ Architecture = auto #TotalDownload CheckSpace #VerbosePkgLists +#ConcurrentDownloadStreams = 5 # PGP signature checking #SigLevel = Optional diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index c2a069ad..1e488847 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -902,6 +902,7 @@ int alpm_option_get_remote_file_siglevel(alpm_handle_t *handle); int alpm_option_set_remote_file_siglevel(alpm_handle_t *handle, int level); int alpm_option_set_disable_dl_timeout(alpm_handle_t *handle, unsigned short disable_dl_timeout); +int alpm_option_set_concurrent_download_streams(alpm_handle_t *handle, unsigned int streams_num); /** @} */ diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index fc7c1faf..a74086d9 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -856,3 +856,15 @@ int SYMEXPORT alpm_option_set_disable_dl_timeout(alpm_handle_t *handle, #endif return 0; } + +int SYMEXPORT alpm_option_set_concurrent_download_streams(alpm_handle_t *handle, + unsigned int streams_num) +{ + CHECK_HANDLE(handle, return -1); +#ifdef HAVE_LIBCURL + handle->concurrent_download_streams = streams_num; +#else + (void)streams_num; /* silence unused variable warnings */ +#endif + return 0; +} \ No newline at end of file diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index c343f6e0..d6fe435c 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -61,6 +61,7 @@ struct __alpm_handle_t { /* libcurl handle */ CURL *curl; /* reusable curl_easy handle */ unsigned short disable_dl_timeout; + unsigned int concurrent_download_streams; /* Number of parallel downloads, 0 - no limit */ #endif #ifdef HAVE_LIBGPGME diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f9de386f..1b224eb6 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -110,6 +110,8 @@ config_t *config_new(void) newconfig->localfilesiglevel = ALPM_SIG_USE_DEFAULT; newconfig->remotefilesiglevel = ALPM_SIG_USE_DEFAULT; } + /* By default use 5 concurrent download streams */ + newconfig->concurrent_download_streams = 5; newconfig->colstr.colon = ":: "; newconfig->colstr.title = ""; @@ -677,6 +679,9 @@ static int _parse_options(const char *key, char *value, return 1; } FREELIST(values); + } else if(strcmp(key, "ConcurrentDownloadStreams") == 0) { + /* TODO: what is the best way to handle int conversion errors? */ + config->concurrent_download_streams = atoi(value); } else { pm_printf(ALPM_LOG_WARNING, _("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"), @@ -845,6 +850,7 @@ static int setup_libalpm(void) alpm_option_set_noextracts(handle, config->noextract); alpm_option_set_disable_dl_timeout(handle, config->disable_dl_timeout); + alpm_option_set_concurrent_download_streams(handle, config->concurrent_download_streams); for(i = config->assumeinstalled; i; i = i->next) { char *entry = i->data; diff --git a/src/pacman/conf.h b/src/pacman/conf.h index d954e637..33773efd 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -115,6 +115,8 @@ typedef struct __config_t { /* When downloading, display the amount downloaded, rate, ETA, and percent * downloaded of the total download list */ unsigned short totaldownload; + /* Number of concurrent download streams, 0 - no limit */ + unsigned int concurrent_download_streams; /* select -Sc behavior */ unsigned short cleanmethod; alpm_list_t *holdpkg; -- 2.25.1

3 10

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-49-ge578903b
by Allan McRae 05 Mar '20

05 Mar '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via e578903b60081bb8a7ddd094ed67946d5e48b719 (commit) from aff69f43b1bd9cf602dd5bf2c0b6d1bbe5e336f2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e578903b60081bb8a7ddd094ed67946d5e48b719 Author: Anatol Pomozov <anatol.pomozov(a)gmail.com> Date: Thu Mar 5 15:09:14 2020 -0800 Move flushing 'output' list into separate function 'output' is a list of messages that pacman received but delayed printing to avoid messing with UI. Such functionality is useful for the upcoming multi-line progress bar UI. Let's move it to a separate function. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: src/pacman/callback.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-48-gaff69f43
by Allan McRae 05 Mar '20

05 Mar '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via aff69f43b1bd9cf602dd5bf2c0b6d1bbe5e336f2 (commit) from 130db5cc9eb5c58681cbdf76d18ab383b14edebe (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit aff69f43b1bd9cf602dd5bf2c0b6d1bbe5e336f2 Author: Anatol Pomozov <anatol.pomozov(a)gmail.com> Date: Wed Mar 4 13:25:32 2020 -0800 Do not download files if find_dl_candidates() fails One reason why the function returns an error is some repo does not have any servers. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH v2] Move flushing 'output' list into separate function
by Anatol Pomozov 05 Mar '20

05 Mar '20

'output' is a list of messages that pacman received but delayed printing to avoid messing with UI. Such functionality is useful for the upcoming multi-line progress bar UI. Let's move it to a separate function. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- src/pacman/callback.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 548e2df2..8fb89b39 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -160,6 +160,16 @@ static void fill_progress(const int bar_percent, const int disp_percent, fflush(stdout); } +static void flush_output_list(void) { + alpm_list_t *i = NULL; + fflush(stdout); + for(i = output; i; i = i->next) { + fputs((const char *)i->data, stderr); + } + fflush(stderr); + FREELIST(output); +} + static int number_length(size_t n) { int digits = 1; @@ -610,14 +620,8 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent, fill_progress(percent, percent, cols - infolen); if(percent == 100) { - alpm_list_t *i = NULL; + flush_output_list(); on_progress = 0; - fflush(stdout); - for(i = output; i; i = i->next) { - fputs((const char *)i->data, stderr); - } - fflush(stderr); - FREELIST(output); } else { on_progress = 1; } -- 2.25.1

1 0

[pacman-dev] [PATCH] Do not download files if find_dl_candidates() fails
by Anatol Pomozov 05 Mar '20

05 Mar '20

One reason why the function returns an error is some repo does not have any servers. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- lib/libalpm/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 89cc7867..50b21b54 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -787,7 +787,7 @@ static int download_files(alpm_handle_t *handle) errors += find_dl_candidates(handle, &files); - if(files) { + if(files && !errors) { /* check for necessary disk space for download */ if(handle->checkspace) { off_t *file_sizes; -- 2.25.1

2 1

[pacman-dev] [PATCH] Hide cursor while pacman is running
by Anatol Pomozov 05 Mar '20

05 Mar '20

Use ASCII control codes to hide cursor at the pacman start and then show the cursor when pacman finishes. It helps to avoid annoying blinking when progress bars are re-drawn. Cursor is reenabled if pacman expects user's input. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- src/common/util-common.c | 15 +++++++++++++++ src/common/util-common.h | 3 +++ src/pacman/pacman.c | 2 ++ src/pacman/sighandler.c | 5 +++++ 4 files changed, 25 insertions(+) diff --git a/src/common/util-common.c b/src/common/util-common.c index 7d43ac0d..ad2a8ad1 100644 --- a/src/common/util-common.c +++ b/src/common/util-common.c @@ -21,6 +21,7 @@ #include <errno.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> #include "util-common.h" @@ -104,6 +105,18 @@ int llstat(char *path, struct stat *buf) return ret; } +void console_hide_cursor(void) { + if(isatty(fileno(stdout))) { + printf("\e[?25l"); + } +} + +void console_show_cursor(void) { + if(isatty(fileno(stdout))) { + printf("\e[?25h"); + } +} + /** Wrapper around fgets() which properly handles EINTR * @param s string to read into * @param size maximum length to read @@ -114,6 +127,7 @@ char *safe_fgets(char *s, int size, FILE *stream) { char *ret; int errno_save = errno, ferror_save = ferror(stream); + console_show_cursor(); while((ret = fgets(s, size, stream)) == NULL && !feof(stream)) { if(errno == EINTR) { /* clear any errors we set and try again */ @@ -125,6 +139,7 @@ char *safe_fgets(char *s, int size, FILE *stream) break; } } + console_hide_cursor(); return ret; } diff --git a/src/common/util-common.h b/src/common/util-common.h index 483d5da4..8eacde7e 100644 --- a/src/common/util-common.h +++ b/src/common/util-common.h @@ -28,6 +28,9 @@ char *mdirname(const char *path); int llstat(char *path, struct stat *buf); +void console_hide_cursor(void); +void console_show_cursor(void); + char *safe_fgets(char *s, int size, FILE *stream); void wordsplit_free(char **ws); diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index d58c428a..aafd9e63 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -300,6 +300,7 @@ static void cleanup(int ret) /* free memory */ FREELIST(pm_targets); + console_show_cursor(); exit(ret); } @@ -1084,6 +1085,7 @@ int main(int argc, char *argv[]) int ret = 0; uid_t myuid = getuid(); + console_hide_cursor(); install_segv_handler(); /* i18n init */ diff --git a/src/pacman/sighandler.c b/src/pacman/sighandler.c index 46e6481f..adad411a 100644 --- a/src/pacman/sighandler.c +++ b/src/pacman/sighandler.c @@ -27,6 +27,9 @@ #include "sighandler.h" #include "util.h" +/* the same ANSI sequence as used in console_show_cursor */ +#define SHOW_CURSOR_ANSI "\e[?25h" + /** Write function that correctly handles EINTR. */ static ssize_t xwrite(int fd, const void *buf, size_t count) @@ -60,6 +63,7 @@ static void soft_interrupt_handler(int signum) const char msg[] = "\nHangup signal received\n"; xwrite(STDERR_FILENO, msg, ARRAYSIZE(msg) - 1); } + xwrite(STDOUT_FILENO, SHOW_CURSOR_ANSI, sizeof(SHOW_CURSOR_ANSI) - 1); if(alpm_trans_interrupt(config->handle) == 0) { /* a transaction is being interrupted, don't exit pacman yet. */ return; @@ -95,6 +99,7 @@ static void segv_handler(int signum) const char msg[] = "\nerror: segmentation fault\n" "Please submit a full bug report with --debug if appropriate.\n"; xwrite(STDERR_FILENO, msg, sizeof(msg) - 1); + xwrite(STDOUT_FILENO, SHOW_CURSOR_ANSI, sizeof(SHOW_CURSOR_ANSI) - 1); /* restore the default handler */ _reset_handler(signum); -- 2.25.1

2 1

[pacman-dev] [PATCH] makepkg: Include more source files in debug packages.
by Austin Lund 02 Mar '20

02 Mar '20

Currently only the file pointed to by the DW_AT_name is included as a source file in debug packages. This means many files that are useful for debugging are not included. For example, no header files are included but yet these may by referenced in the .debug_line section. This sed script converts into shell variables the debug dump information from readelf about compilation units, directory tables and file tables. This can be used to get the full path of all the source files from within the package being compiled that are referenced in the debugging information. Also, placeholder symbols (e.g. <builtin>) and paths outside the current source (e.g. linked libraries) will be more consistently ignored from inclusion in the debug packages. Signed-off-by: Austin Lund <austin.lund(a)gmail.com> --- scripts/libmakepkg/tidy/strip.sh.in | 46 +++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 2b6f732d..2598d606 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -35,9 +35,51 @@ build_id() { LANG=C readelf -n "$1" | sed -n '/Build ID/ { s/.*: //p; q; }' } +_source_files_sedscript='1 { a \ +declare -A COMPDIR +} +/^Contents of the .debug_info section:$/,/^[^[:space:]]/ { +/^ <0>.*$DW_TAG_compile_unit$$/,/^ {0,3}[^[:space:]]/{ + /^ <0>.*$DW_TAG_compile_unit$$/{h;d} + /^ {0,3}[^[:space:]]/{ + x + s/(.*)/\n&\n/ + s/.*DW_AT_comp_dir[^\n]*: ([^\n]*)\n.*/'\''\1'\''&/ + s/.*DW_AT_stmt_list[^\n]*: ([^\n]*)\n.*/COMPDIR\[\1\]=&/ + P;d + } + H + d +} +} +/^Raw dump of debug contents of section .debug_line:$/,/^[^[:space:]]/ { +/^ Offset:/,/^ Line Number Statements:$/ { + /^ Offset:/ { + a \ +unset DIRTABLE\ +unset FILETABLE + + s/.*(0x[[:xdigit:]]+)$/OFFSET=\1/; p; d } + /^ The Directory Table/,/^$/ { + /^ [[:digit:]]+\t[^/.]/ { + s/^ ([[:digit:]]+)\t(.*)/DIRTABLE[\1]=\$\{COMPDIR\[\$OFFSET]\}\/\2/ + p; d + } + d + } + /^ The File Name Table/,/^$/ { + /^ [[:digit:]]+\t[1-9]/ { + s/^ [[:digit:]]+\t([[:digit:]]+)\t.*\t(.*)$/\[\[ -v DIRTABLE\[\1\] \]\] \&\& echo \$\{DIRTABLE\[\1\]\}\/\2/ + p; d + } + d + } +} +}' + source_files() { LANG=C readelf "$1" --debug-dump | \ - awk '/DW_AT_name +:/{name=$8}/DW_AT_comp_dir +:/{{if (name == "<artificial>") next}{if (name !~ /^[<\/]/) {printf "%s/", $8}}{print name}}' + sed -n -E -e "${_source_files_sedscript}" | /bin/bash } strip_file() { @@ -60,7 +102,7 @@ strip_file() { while IFS= read -r t; do f=${t/${dbgsrcdir}/"$srcdir"} mkdir -p "${dbgsrc/"$dbgsrcdir"/}${t%/*}" - cp -- "$f" "${dbgsrc/"$dbgsrcdir"/}$t" + cp -n -- "$f" "${dbgsrc/"$dbgsrcdir"/}$t" done < <(source_files "$binary") # copy debug symbols to debug directory -- 2.25.0

3 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-47-g130db5cc
by Allan McRae 24 Feb '20

24 Feb '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 130db5cc9eb5c58681cbdf76d18ab383b14edebe (commit) from 4246a4cc4f0f87642cbbb6b375524b2e4c713412 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 130db5cc9eb5c58681cbdf76d18ab383b14edebe Author: Anatol Pomozov <anatol.pomozov(a)gmail.com> Date: Wed Feb 19 17:40:45 2020 -0800 Simplify construction of payloads in download_files Currently, download_files() creates payloads for all packages then iterates over them, calling download_single_file. This can be simplified by looping over packages and constructing the payload as needed. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/sync.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Simplify construction of payloads in download_files
by Anatol Pomozov 24 Feb '20

24 Feb '20

Currently, download_files() creates payloads for all packages then iterates over them, calling download_single_file. This can be simplified by looping over packages and constructing the payload as needed. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- lib/libalpm/sync.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 9b1e1197..89cc7867 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -693,18 +693,6 @@ static int prompt_to_delete(alpm_handle_t *handle, const char *filepath, return question.remove; } -static struct dload_payload *build_payload(alpm_handle_t *handle, - const char *filename, size_t size, alpm_list_t *servers) -{ - struct dload_payload *payload; - - CALLOC(payload, 1, sizeof(*payload), RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); - STRDUP(payload->remote_name, filename, FREE(payload); RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); - payload->max_size = size; - payload->servers = servers; - return payload; -} - static int find_dl_candidates(alpm_handle_t *handle, alpm_list_t **files) { for(alpm_list_t *i = handle->trans->add; i; i = i->next) { @@ -729,10 +717,7 @@ static int find_dl_candidates(alpm_handle_t *handle, alpm_list_t **files) } if(spkg->download_size != 0 || !fpath) { - struct dload_payload *payload; - payload = build_payload(handle, spkg->filename, spkg->size, repo->servers); - ASSERT(payload, return -1); - *files = alpm_list_add(*files, payload); + *files = alpm_list_add(*files, spkg); } FREE(fpath); @@ -815,8 +800,8 @@ static int download_files(alpm_handle_t *handle) CALLOC(file_sizes, num_files, sizeof(off_t), goto finish); for(i = files, idx = 0; i; i = i->next, idx++) { - const struct dload_payload *payload = i->data; - file_sizes[idx] = payload->max_size; + const alpm_pkg_t *pkg = i->data; + file_sizes[idx] = pkg->size; } ret = _alpm_check_downloadspace(handle, cachedir, num_files, file_sizes); @@ -832,19 +817,26 @@ static int download_files(alpm_handle_t *handle) EVENT(handle, &event); event.type = ALPM_EVENT_RETRIEVE_DONE; for(i = files; i; i = i->next) { - if(download_single_file(handle, i->data, cachedir) == -1) { + const alpm_pkg_t *pkg = i->data; + struct dload_payload payload = {0}; + + STRDUP(payload.remote_name, pkg->filename, handle->pm_errno = ALPM_ERR_MEMORY; goto finish); + payload.servers = pkg->origin_data.db->servers; + payload.max_size = pkg->size; + + if(download_single_file(handle, &payload, cachedir) == -1) { errors++; event.type = ALPM_EVENT_RETRIEVE_FAILED; _alpm_log(handle, ALPM_LOG_WARNING, _("failed to retrieve some files\n")); } + _alpm_dload_payload_reset(&payload); } EVENT(handle, &event); } finish: if(files) { - alpm_list_free_inner(files, (alpm_list_fn_free)_alpm_dload_payload_reset); - FREELIST(files); + alpm_list_free(files); } for(i = handle->trans->add; i; i = i->next) { -- 2.25.1

2 1

[pacman-dev] [PATCH] Convert payload structs from heap allocated to stack allocated
by Anatol Pomozov 20 Feb '20

20 Feb '20

download_files() dynamically allocates a payload object for each package. Then iterates over these payloads and calls download_single_file() for it. This code can be simplified to iterate over package list itself. payload struct can be stack allocated in this case. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- lib/libalpm/sync.c | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 4d93f41f..cd9db641 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -693,18 +693,6 @@ static int prompt_to_delete(alpm_handle_t *handle, const char *filepath, return question.remove; } -static struct dload_payload *build_payload(alpm_handle_t *handle, - const char *filename, size_t size, alpm_list_t *servers) -{ - struct dload_payload *payload; - - CALLOC(payload, 1, sizeof(*payload), RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); - STRDUP(payload->remote_name, filename, FREE(payload); RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); - payload->max_size = size; - payload->servers = servers; - return payload; -} - static int find_dl_candidates(alpm_handle_t *handle, alpm_list_t **files) { for(alpm_list_t *i = handle->trans->add; i; i = i->next) { @@ -729,10 +717,7 @@ static int find_dl_candidates(alpm_handle_t *handle, alpm_list_t **files) } if(spkg->download_size != 0 || !fpath) { - struct dload_payload *payload; - payload = build_payload(handle, spkg->filename, spkg->size, repo->servers); - ASSERT(payload, return -1); - *files = alpm_list_add(*files, payload); + *files = alpm_list_add(*files, spkg); } FREE(fpath); @@ -815,8 +800,8 @@ static int download_files(alpm_handle_t *handle) CALLOC(file_sizes, num_files, sizeof(off_t), goto finish); for(i = files, idx = 0; i; i = i->next, idx++) { - const struct dload_payload *payload = i->data; - file_sizes[idx] = payload->max_size; + const alpm_pkg_t *pkg = i->data; + file_sizes[idx] = pkg->size; } ret = _alpm_check_downloadspace(handle, cachedir, num_files, file_sizes); @@ -832,20 +817,26 @@ static int download_files(alpm_handle_t *handle) EVENT(handle, &event); event.type = ALPM_EVENT_RETRIEVE_DONE; for(i = files; i; i = i->next) { - if(download_single_file(handle, i->data, cachedir) == -1) { + const alpm_pkg_t *pkg = i->data; + struct dload_payload payload = {0}; + + STRDUP(payload.remote_name, pkg->filename, handle->pm_errno = ALPM_ERR_MEMORY; goto finish); + payload.servers = pkg->origin_data.db->servers; + payload.max_size = pkg->size; + + if(download_single_file(handle, &payload, cachedir) == -1) { errors++; event.type = ALPM_EVENT_RETRIEVE_FAILED; _alpm_log(handle, ALPM_LOG_WARNING, _("failed to retrieve some files\n")); } + _alpm_dload_payload_reset(&payload); } EVENT(handle, &event); } finish: - if(files) { - alpm_list_free_inner(files, (alpm_list_fn_free)_alpm_dload_payload_reset); - FREELIST(files); - } + if(files) + alpm_list_free(files); for(i = handle->trans->add; i; i = i->next) { alpm_pkg_t *pkg = i->data; -- 2.25.0

2 2