- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] libalpm: const annotate struct pkg_operations
by Emil Velikov 23 Dec '20

23 Dec '20

Signed-off-by: Emil Velikov <emil.l.velikov(a)gmail.com> --- lib/libalpm/be_local.c | 2 +- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 20 ++++++++++++++++++-- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 4 ++-- 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index e73a97bb..9c3c8bb3 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -326,7 +326,7 @@ static int _cache_force_load(alpm_pkg_t *pkg) * lazy accessor methods that handle any backend loading and caching * logic. */ -static struct pkg_operations local_pkg_ops = { +static const struct pkg_operations local_pkg_ops = { .get_base = _cache_get_base, .get_desc = _cache_get_desc, .get_url = _cache_get_url, diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 4dde7167..f855003a 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -138,7 +138,7 @@ static int _package_changelog_close(const alpm_pkg_t UNUSED *pkg, void *fp) * majority of the default_pkg_ops struct and add only a few operations of * our own on top. */ -static struct pkg_operations *get_file_pkg_ops(void) +static const struct pkg_operations *get_file_pkg_ops(void) { static struct pkg_operations file_pkg_ops; static int file_pkg_ops_initialized = 0; diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 225df76d..5356b544 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -281,6 +281,23 @@ static int _sync_get_validation(alpm_pkg_t *pkg) return pkg->validation; } +/** Package sync operations struct accessor. We implement this as a method + * rather than a static struct as in be_files because we want to reuse the + * majority of the default_pkg_ops struct and add only a few operations of + * our own on top. + */ +static const struct pkg_operations *get_sync_pkg_ops(void) +{ + static struct pkg_operations sync_pkg_ops; + static int sync_pkg_ops_initalized = 0; + if(!sync_pkg_ops_initalized) { + sync_pkg_ops = default_pkg_ops; + sync_pkg_ops.get_validation = _sync_get_validation; + sync_pkg_ops_initalized = 1; + } + return &sync_pkg_ops; +} + static alpm_pkg_t *load_pkg_for_entry(alpm_db_t *db, const char *entryname, const char **entry_filename, alpm_pkg_t *likely_pkg) { @@ -321,8 +338,7 @@ static alpm_pkg_t *load_pkg_for_entry(alpm_db_t *db, const char *entryname, pkg->origin = ALPM_PKG_FROM_SYNCDB; pkg->origin_data.db = db; - pkg->ops = &default_pkg_ops; - pkg->ops->get_validation = _sync_get_validation; + pkg->ops = get_sync_pkg_ops(); pkg->handle = db->handle; /* add to the collection */ diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index a4356518..5766c600 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -138,7 +138,7 @@ static int _pkg_force_load(alpm_pkg_t UNUSED *pkg) { return 0; } /** The standard package operations struct. Get fields directly from the * struct itself with no abstraction layer or any type of lazy loading. */ -struct pkg_operations default_pkg_ops = { +const struct pkg_operations default_pkg_ops = { .get_base = _pkg_get_base, .get_desc = _pkg_get_desc, .get_url = _pkg_get_url, diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index c37bd11e..b134ad5a 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -83,7 +83,7 @@ struct pkg_operations { * The actual definition is in package.c so it can have access to the * default accessor functions which are defined there. */ -extern struct pkg_operations default_pkg_ops; +extern const struct pkg_operations default_pkg_ops; struct __alpm_pkg_t { unsigned long name_hash; @@ -121,7 +121,7 @@ struct __alpm_pkg_t { alpm_list_t *removes; /* in transaction targets only */ alpm_pkg_t *oldpkg; /* in transaction targets only */ - struct pkg_operations *ops; + const struct pkg_operations *ops; alpm_filelist_t files; -- 2.29.2

2 2

[pacman-dev] [PATCH 00/23] Docs Docs Docs 2: electric boogaloo
by morganamilo 21 Dec '20

21 Dec '20

Here's a redo of my original docs patch and more. This time it's split in to many commits so it's hopefully easier to review/rebase. Every function, struct and param is now documented. Simply `man libalpm` to get the main page. Then `man libalpm-databases` to see the database section and so on for each section. Also while doing all this, I thought it would make sense to change some function names: I also think alpm_unlock() should be named alpm_db_unlock() and alpm_sync_get_new_version() should be named alpm_pkg_get_new_version() Then the functions could be moved into the db and packages groups repectivley. To be clear I have not actually changed any function names in this patch set. morganamilo (23): doc: remove stray doxygen comment doc: add doc header to alpm.h doc: document error doc: document handle doc: document signatures doc: document depends doc: document callbacks doc: document databases doc: document logging doc: document packages doc: document files and groups doc: document transactions doc: document misc doc: document alpm_list doc: document options doc: move alpm_api group to top of file doc: move top level items into groups doc: configure doxygen doc: update doxyfile doc: rename alpm_api group to alpm doc: add extra documentation to the man page doc: change group names to libalpm_* doc: remove old libalpm man file doc/Doxyfile.in | 83 +- doc/libalpm.3.asciidoc | 37 - doc/meson.build | 1 - lib/libalpm/alpm.h | 2429 +++++++++++++++++++++++++++------------ lib/libalpm/alpm_list.c | 251 ---- lib/libalpm/alpm_list.h | 293 ++++- lib/libalpm/trans.c | 2 - 7 files changed, 2048 insertions(+), 1048 deletions(-) delete mode 100644 doc/libalpm.3.asciidoc -- 2.29.2

4 34

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-23-g95ffdd68
by Allan McRae 21 Dec '20

21 Dec '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 95ffdd68b250af1d37067fe6dd70fc6a6094bc62 (commit) via e67c306f9199fe1fc5e2c82dcaf3ede851a1689c (commit) via ea975c328da8ebae2e13b8ce5c75c319fa3c4ef9 (commit) via 50c9c338fbbdc895484ccaf4043187c56fc8687b (commit) via 6ed82820fe3994c0375c4981be7978c0ba54727a (commit) via 1e8816f13d651997034252d87fba51cd38118f51 (commit) via 2a16434bfd20cc55e554018f5a34870dbca09673 (commit) via 4613527738ce428f2bc8e2b9bc404a1f662d5d99 (commit) via 7b06b5407baffc3895e0861241a048048b6c5788 (commit) via 50d2171ef0a77e0d967195046867adc80ed3efcb (commit) via a321e1f8a539097cf797b21bf69178a71edb9b12 (commit) via 3d60a829e1d3e16116dea1032a3ab1365e471c8c (commit) via 5901ac9cb27595a36edc7b818b94c3fa0271f37e (commit) via af7a1e834f262a24d6ed5eea472ac45830ab1229 (commit) via 55efa43f2305801640f8312e9d494856b8a0a781 (commit) via e9ac13776e7a1aa5899cfdc9a4233d84835c094f (commit) via bf26b6bbf7ee83211c3bcbb5fca05e6aef48b18a (commit) via 5e9635317b46d908f482128e8db63ccdae04aa28 (commit) via ab431f6810ed49045a95fe232cd678d39708fc02 (commit) via 49e33aad7c848c06ca276c71f2db5c057a129178 (commit) via 48c8869339e739b44e0195ded69f1bdc8695b888 (commit) via 48865e7dac673648b8fb96f4cfa2b2994b597983 (commit) from 11e09a23beb89c3b7bf06209a317a4b6ac75ee38 (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 95ffdd68b250af1d37067fe6dd70fc6a6094bc62 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:56 2020 +0000 doc: remove old libalpm man file Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e67c306f9199fe1fc5e2c82dcaf3ede851a1689c Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:54 2020 +0000 doc: add extra documentation to the man page Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ea975c328da8ebae2e13b8ce5c75c319fa3c4ef9 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:53 2020 +0000 doc: rename alpm_api group to alpm Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 50c9c338fbbdc895484ccaf4043187c56fc8687b Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:52 2020 +0000 doc: update doxyfile Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6ed82820fe3994c0375c4981be7978c0ba54727a Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:51 2020 +0000 doc: configure doxygen - only document public alpm items (alpm_*) - hide typedef'd structs (_alpm_pkg_t shows as alpm_pkg_t) - enable inline struct definitions (this stops having a man page for every single struct) Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1e8816f13d651997034252d87fba51cd38118f51 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:50 2020 +0000 doc: move top level items into groups Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2a16434bfd20cc55e554018f5a34870dbca09673 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:49 2020 +0000 doc: move alpm_api group to top of file Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4613527738ce428f2bc8e2b9bc404a1f662d5d99 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:48 2020 +0000 doc: document options Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7b06b5407baffc3895e0861241a048048b6c5788 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:47 2020 +0000 doc: document alpm_list Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 50d2171ef0a77e0d967195046867adc80ed3efcb Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:46 2020 +0000 doc: document misc Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a321e1f8a539097cf797b21bf69178a71edb9b12 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:45 2020 +0000 doc: document transactions Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3d60a829e1d3e16116dea1032a3ab1365e471c8c Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:44 2020 +0000 doc: document files and groups Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5901ac9cb27595a36edc7b818b94c3fa0271f37e Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:43 2020 +0000 doc: document packages Signed-off-by: Allan McRae <allan(a)archlinux.org> commit af7a1e834f262a24d6ed5eea472ac45830ab1229 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:42 2020 +0000 doc: document logging Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 55efa43f2305801640f8312e9d494856b8a0a781 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:41 2020 +0000 doc: document databases Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e9ac13776e7a1aa5899cfdc9a4233d84835c094f Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:40 2020 +0000 doc: document callbacks Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bf26b6bbf7ee83211c3bcbb5fca05e6aef48b18a Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:39 2020 +0000 doc: document depends Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5e9635317b46d908f482128e8db63ccdae04aa28 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:38 2020 +0000 doc: document signatures Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ab431f6810ed49045a95fe232cd678d39708fc02 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:37 2020 +0000 doc: document handle Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 49e33aad7c848c06ca276c71f2db5c057a129178 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:36 2020 +0000 doc: document error Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 48c8869339e739b44e0195ded69f1bdc8695b888 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:35 2020 +0000 doc: add doc header to alpm.h Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 48865e7dac673648b8fb96f4cfa2b2994b597983 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:34 2020 +0000 doc: remove stray doxygen comment Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Doxyfile.in | 83 +- doc/libalpm.3.asciidoc | 37 - doc/meson.build | 1 - lib/libalpm/alpm.h | 2410 +++++++++++++++++++++++++++++++++-------------- lib/libalpm/alpm_list.c | 251 ----- lib/libalpm/alpm_list.h | 306 +++++- lib/libalpm/trans.c | 2 - 7 files changed, 2041 insertions(+), 1049 deletions(-) delete mode 100644 doc/libalpm.3.asciidoc hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Add `build/` to gitignore
by Colin Woodbury 14 Dec '20

14 Dec '20

Since it's a transient directory for build artifacts, nothing in there will ever been committed. Ignoring it also makes IDEs happier during file search. Signed-off-by: Colin Woodbury <colin(a)fosskers.ca> --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 01975fd2..638dfe39 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *~ *.o pacman-*.tar.gz +build/* -- 2.29.2

3 8

[pacman-dev] directory permissions differ
by Ronan Pigott 12 Dec '20

12 Dec '20

Hey guys, I'm wondering if we can remove this embedded newline in the warning message: "directory permissions differ on %s\n" ^^ "filesystem: %o package: %o\n" Going through my pacman logfile, the "filesystem: ..." line is the only one that starts a line without the usual timestamp and caller tags. It makes it slightly more annoying to parse with awk/sed or whatever and doesn't serve much of a purpose afaict. My suggested change would be: "directory permissions differ on %s, " "filesystem: %o package: %o\n" I can submit a patch if you'd like.

1 0

[pacman-dev] Location of the Pacman Home Page source?
by Colin Woodbury 09 Dec '20

09 Dec '20

Hi folks, I see that while a number of Pacman-related pages like the HACKING document are rendered into nice HTML and hosted officially, does anyone know where the source for the Pacman homepage itself is hosted (https://www.archlinux.org/pacman/)? There are some documentation lines I'd like to fix, in particular the ones that still mention configure/make as the way to compile Pacman. Meson should probably also be mentioned in the Pacman README itself, since it is otherwise cited nowhere in that repo. I'd be happy to put forth a PR. Cheers, Colin

2 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-1-g11e09a23
by Allan McRae 09 Dec '20

09 Dec '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 11e09a23beb89c3b7bf06209a317a4b6ac75ee38 (commit) from a4240a55e448ffba15a5edbad1a31cb76f821231 (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 11e09a23beb89c3b7bf06209a317a4b6ac75ee38 Author: Anatol Pomozov <anatol.pomozov(a)gmail.com> Date: Tue Dec 8 11:57:27 2020 -0800 Implement TotalDownload functionality With the recent 'multibar' interface changes TotalDownload has been disabled. Now we have a new UI and we need to find another way to display this information. When 'TotalDownload' config option is enabled we are going to have an extra progress bar at the bottom of the screen that shows how much of the entire download has been completed. Closes FS#68202 Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.conf.5.asciidoc | 6 +- lib/libalpm/sync.c | 5 -- src/pacman/callback.c | 146 ++++++++++++++++++++++++++++++++------------- 3 files changed, 106 insertions(+), 51 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Implement TotalDownload functionality
by Anatol Pomozov 08 Dec '20

08 Dec '20

With the recent 'multibar' interface changes TotalDownload has been disabled. Now we have a new UI and we need to find another way to display this information. When 'TotalDownload' config option is enabled we are going to have an extra progress bar at the bottom of the screen that shows how much of the entire download has been completed. Closes FS#68202 Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- doc/pacman.conf.5.asciidoc | 6 +-- lib/libalpm/sync.c | 5 -- src/pacman/callback.c | 108 ++++++++++++++++++++++++++++++++----- 3 files changed, 96 insertions(+), 23 deletions(-) diff --git a/doc/pacman.conf.5.asciidoc b/doc/pacman.conf.5.asciidoc index dd1d3d5e..32612eb9 100644 --- a/doc/pacman.conf.5.asciidoc +++ b/doc/pacman.conf.5.asciidoc @@ -191,10 +191,8 @@ Options not support escape characters. *TotalDownload*:: - When downloading, display the amount downloaded, download rate, ETA, - and completed percentage of the entire download list rather - than the percent of each individual download target. The progress - bar is still based solely on the current file download. + When downloading, display an extra progress bar with the amount downloaded, + download rate, ETA, and completed percentage of the entire download list. This option won't work if XferCommand is used. *CheckSpace*:: diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 5d8652a5..e25e56d4 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -846,11 +846,6 @@ finish: pkg->download_size = 0; } - /* clear out value to let callback know we are done */ - if(handle->totaldlcb) { - handle->totaldlcb(0); - } - return ret; } diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 12ab952f..49bc3df4 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -40,8 +40,9 @@ #include "conf.h" /* download progress bar */ -static off_t list_xfered = 0.0; +static int total_enabled = 0; static off_t list_total = 0.0; +static struct pacman_progress_bar *totalbar; /* delayed output during progress bar */ static int on_progress = 0; @@ -92,6 +93,10 @@ struct pacman_multibar_ui { struct pacman_multibar_ui multibar_ui = {0}; +static int dload_progressbar_enabled(void); +static void init_total_progressbar(void); +static void update_total_finalstats(void); + void multibar_move_completed_up(bool value) { multibar_ui.move_completed_up = value; } @@ -327,6 +332,10 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_PKG_RETRIEVE_START: colon_printf(_("Retrieving packages...\n")); on_progress = 1; + total_enabled = config->totaldownload && list_total; + if(total_enabled) { + init_total_progressbar(); + } break; case ALPM_EVENT_DISKSPACE_START: if(config->noprogressbar) { @@ -388,6 +397,11 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_PKG_RETRIEVE_DONE: case ALPM_EVENT_PKG_RETRIEVE_FAILED: console_cursor_move_end(); + if(total_enabled && dload_progressbar_enabled()) { + update_total_finalstats(); + printf("\n"); + } + total_enabled = 0; flush_output_list(); on_progress = 0; break; @@ -679,11 +693,6 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent, void cb_dl_total(off_t total) { list_total = total; - /* if we get a 0 value, it means this list has finished downloading, - * so clear out our list_xfered as well */ - if(total == 0) { - list_xfered = 0; - } } static int dload_progressbar_enabled(void) @@ -726,6 +735,16 @@ static bool find_bar_for_filename(const char *filename, int *index, struct pacma return false; } +static void init_total_progressbar(void) +{ + totalbar = calloc(1, sizeof(struct pacman_progress_bar)); + assert(totalbar); + totalbar->filename = "Total progress:"; + totalbar->init_time = get_time_ms(); + totalbar->total_size = list_total; + totalbar->rate = 0.0; +} + static void draw_pacman_progress_bar(struct pacman_progress_bar *bar) { int infolen; @@ -851,10 +870,17 @@ static void dload_init_event(const char *filename, alpm_download_event_init_t *d printf(_(" %s downloading...\n"), filename); multibar_ui.cursor_lineno++; multibar_ui.active_downloads_num++; + + if(total_enabled) { + /* redraw the total download progress bar */ + draw_pacman_progress_bar(totalbar); + printf("\n"); + multibar_ui.cursor_lineno++; + } } -/* Draws download progress */ -static void dload_progress_event(const char *filename, alpm_download_event_progress_t *data) + +static off_t update_file_dload_bar(const char *filename, alpm_download_event_progress_t *data) { int index; struct pacman_progress_bar *bar; @@ -862,10 +888,7 @@ static void dload_progress_event(const char *filename, alpm_download_event_progr double last_chunk_rate; int64_t timediff; bool ok; - - if(!dload_progressbar_enabled()) { - return; - } + off_t last_chunk_amount; ok = find_bar_for_filename(filename, &index, &bar); assert(ok); @@ -875,11 +898,12 @@ static void dload_progress_event(const char *filename, alpm_download_event_progr if(timediff < UPDATE_SPEED_MS) { /* return if the calling interval was too short */ - return; + return 0; } bar->sync_time = curr_time; - last_chunk_rate = (double)(data->downloaded - bar->xfered) / (timediff / 1000.0); + last_chunk_amount = data->downloaded - bar->xfered; + last_chunk_rate = (double)last_chunk_amount * 1000 / timediff; /* average rate to reduce jumpiness */ bar->rate = (last_chunk_rate + 2 * bar->rate) / 3; if(bar->rate > 0.0) { @@ -894,6 +918,62 @@ static void dload_progress_event(const char *filename, alpm_download_event_progr console_cursor_goto_bar(index); draw_pacman_progress_bar(bar); + + return last_chunk_amount; +} + +static void update_total_dload_bar(off_t last_chunk_amount) +{ + int64_t curr_time = get_time_ms(); + int64_t timediff; + double last_chunk_rate; + + timediff = curr_time - totalbar->init_time; + totalbar->xfered += last_chunk_amount; + last_chunk_rate = (double)totalbar->xfered * 1000 / timediff; + totalbar->rate = (last_chunk_rate + 2 * totalbar->rate) / 3; + totalbar->eta = (totalbar->total_size - totalbar->xfered) / totalbar->rate; + + console_cursor_move_end(); + draw_pacman_progress_bar(totalbar); +} + +static void update_total_finalstats(void) +{ + int64_t timediff; + + /* compute final values */ + totalbar->xfered = totalbar->total_size; + timediff = get_time_ms() - totalbar->init_time; + + /* if transfer was too fast, treat it as a 1ms transfer, for the sake + * of the rate calculation */ + if(timediff < 1) + timediff = 1; + + totalbar->rate = (double)totalbar->xfered * 1000 / timediff; + /* round elapsed time (in ms) to the nearest second */ + totalbar->eta = (unsigned int)(timediff + 500) / 1000; + + console_cursor_move_end(); + draw_pacman_progress_bar(totalbar); +} + +/* Handles download progress event */ +static void dload_progress_event(const char *filename, alpm_download_event_progress_t *data) +{ + off_t last_chunk_amount; + + if(!dload_progressbar_enabled()) { + return; + } + + last_chunk_amount = update_file_dload_bar(filename, data); + + if(total_enabled && last_chunk_amount) { + update_total_dload_bar(last_chunk_amount); + } + fflush(stdout); } -- 2.29.2

2 4

[pacman-dev] [PATCH v2] Implement TotalDownload functionality
by Anatol Pomozov 08 Dec '20

08 Dec '20

With the recent 'multibar' interface changes TotalDownload has been disabled. Now we have a new UI and we need to find another way to display this information. When 'TotalDownload' config option is enabled we are going to have an extra progress bar at the bottom of the screen that shows how much of the entire download has been completed. Closes FS#68202 Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- doc/pacman.conf.5.asciidoc | 6 +- lib/libalpm/sync.c | 5 -- src/pacman/callback.c | 146 ++++++++++++++++++++++++++----------- 3 files changed, 106 insertions(+), 51 deletions(-) diff --git a/doc/pacman.conf.5.asciidoc b/doc/pacman.conf.5.asciidoc index dd1d3d5e..32612eb9 100644 --- a/doc/pacman.conf.5.asciidoc +++ b/doc/pacman.conf.5.asciidoc @@ -191,10 +191,8 @@ Options not support escape characters. *TotalDownload*:: - When downloading, display the amount downloaded, download rate, ETA, - and completed percentage of the entire download list rather - than the percent of each individual download target. The progress - bar is still based solely on the current file download. + When downloading, display an extra progress bar with the amount downloaded, + download rate, ETA, and completed percentage of the entire download list. This option won't work if XferCommand is used. *CheckSpace*:: diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 5d8652a5..e25e56d4 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -846,11 +846,6 @@ finish: pkg->download_size = 0; } - /* clear out value to let callback know we are done */ - if(handle->totaldlcb) { - handle->totaldlcb(0); - } - return ret; } diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 12ab952f..9cc7541d 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -40,8 +40,9 @@ #include "conf.h" /* download progress bar */ -static off_t list_xfered = 0.0; +static int total_enabled = 0; static off_t list_total = 0.0; +static struct pacman_progress_bar *totalbar; /* delayed output during progress bar */ static int on_progress = 0; @@ -56,10 +57,12 @@ static alpm_list_t *output = NULL; struct pacman_progress_bar { const char *filename; - off_t xfered; + off_t xfered; /* Current amount of transferred data */ off_t total_size; uint64_t init_time; /* Time when this download started doing any progress */ uint64_t sync_time; /* Last time we updated the bar info */ + off_t sync_xfered; /* Amount of transferred data at the `sync_time` timestamp. It can be + smaller than `xfered` if we did not update bar UI for a while. */ double rate; unsigned int eta; /* ETA in seconds */ bool completed; /* transfer is completed */ @@ -92,6 +95,11 @@ struct pacman_multibar_ui { struct pacman_multibar_ui multibar_ui = {0}; +static int dload_progressbar_enabled(void); +static void init_total_progressbar(void); +static void update_bar_finalstats(struct pacman_progress_bar *bar); +static void draw_pacman_progress_bar(struct pacman_progress_bar *bar); + void multibar_move_completed_up(bool value) { multibar_ui.move_completed_up = value; } @@ -327,6 +335,10 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_PKG_RETRIEVE_START: colon_printf(_("Retrieving packages...\n")); on_progress = 1; + total_enabled = config->totaldownload && list_total; + if(total_enabled) { + init_total_progressbar(); + } break; case ALPM_EVENT_DISKSPACE_START: if(config->noprogressbar) { @@ -388,6 +400,12 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_PKG_RETRIEVE_DONE: case ALPM_EVENT_PKG_RETRIEVE_FAILED: console_cursor_move_end(); + if(total_enabled && dload_progressbar_enabled()) { + update_bar_finalstats(totalbar); + draw_pacman_progress_bar(totalbar); + printf("\n"); + } + total_enabled = 0; flush_output_list(); on_progress = 0; break; @@ -679,11 +697,6 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent, void cb_dl_total(off_t total) { list_total = total; - /* if we get a 0 value, it means this list has finished downloading, - * so clear out our list_xfered as well */ - if(total == 0) { - list_xfered = 0; - } } static int dload_progressbar_enabled(void) @@ -726,6 +739,16 @@ static bool find_bar_for_filename(const char *filename, int *index, struct pacma return false; } +static void init_total_progressbar(void) +{ + totalbar = calloc(1, sizeof(struct pacman_progress_bar)); + assert(totalbar); + totalbar->filename = _("Total:"); + totalbar->init_time = get_time_ms(); + totalbar->total_size = list_total; + totalbar->rate = 0.0; +} + static void draw_pacman_progress_bar(struct pacman_progress_bar *bar) { int infolen; @@ -742,7 +765,7 @@ static void draw_pacman_progress_bar(struct pacman_progress_bar *bar) const unsigned short cols = getcols(); if(bar->total_size) { - file_percent = (bar->xfered * 100) / bar->total_size; + file_percent = (bar->sync_xfered * 100) / bar->total_size; } else { file_percent = 100; } @@ -802,7 +825,7 @@ static void draw_pacman_progress_bar(struct pacman_progress_bar *bar) } rate_human = humanize_size((off_t)bar->rate, '\0', -1, &rate_label); - xfered_human = humanize_size(bar->xfered, '\0', -1, &xfered_label); + xfered_human = humanize_size(bar->sync_xfered, '\0', -1, &xfered_label); printf(" %ls%-*s ", wcfname, padwid, ""); /* We will show 1.62 MiB/s, 11.6 MiB/s, but 116 KiB/s and 1116 KiB/s */ @@ -851,49 +874,100 @@ static void dload_init_event(const char *filename, alpm_download_event_init_t *d printf(_(" %s downloading...\n"), filename); multibar_ui.cursor_lineno++; multibar_ui.active_downloads_num++; + + if(total_enabled) { + /* redraw the total download progress bar */ + draw_pacman_progress_bar(totalbar); + printf("\n"); + multibar_ui.cursor_lineno++; + } } -/* Draws download progress */ -static void dload_progress_event(const char *filename, alpm_download_event_progress_t *data) +/* Update progress bar rate/eta stats. + * Returns true if the bar redraw is required, false otherwise + */ +static bool update_bar_stats(struct pacman_progress_bar *bar) { - int index; - struct pacman_progress_bar *bar; - int64_t curr_time = get_time_ms(); - double last_chunk_rate; int64_t timediff; - bool ok; - - if(!dload_progressbar_enabled()) { - return; - } - - ok = find_bar_for_filename(filename, &index, &bar); - assert(ok); + off_t last_chunk_amount; + double last_chunk_rate; + int64_t curr_time = get_time_ms(); /* compute current average values */ timediff = curr_time - bar->sync_time; if(timediff < UPDATE_SPEED_MS) { /* return if the calling interval was too short */ - return; + return false; } + last_chunk_amount = bar->xfered - bar->sync_xfered; + bar->sync_xfered = bar->xfered; bar->sync_time = curr_time; - last_chunk_rate = (double)(data->downloaded - bar->xfered) / (timediff / 1000.0); + last_chunk_rate = (double)last_chunk_amount * 1000 / timediff; /* average rate to reduce jumpiness */ bar->rate = (last_chunk_rate + 2 * bar->rate) / 3; if(bar->rate > 0.0) { - bar->eta = (data->total - data->downloaded) / bar->rate; + bar->eta = (bar->total_size - bar->sync_xfered) / bar->rate; } else { bar->eta = UINT_MAX; } + return true; +} + +static void update_bar_finalstats(struct pacman_progress_bar *bar) +{ + int64_t timediff; + + /* compute final values */ + bar->xfered = bar->total_size; + bar->sync_xfered = bar->total_size; + timediff = get_time_ms() - bar->init_time; + + /* if transfer was too fast, treat it as a 1ms transfer, for the sake + * of the rate calculation */ + if(timediff < 1) + timediff = 1; + + bar->rate = (double)bar->total_size * 1000 / timediff; + /* round elapsed time (in ms) to the nearest second */ + bar->eta = (unsigned int)(timediff + 500) / 1000; +} + +/* Handles download progress event */ +static void dload_progress_event(const char *filename, alpm_download_event_progress_t *data) +{ + int index; + struct pacman_progress_bar *bar; + bool ok; + off_t last_chunk_amount; + + if(!dload_progressbar_enabled()) { + return; + } + + ok = find_bar_for_filename(filename, &index, &bar); + assert(ok); + /* Total size is received after the download starts. */ - bar->total_size = data->total; + last_chunk_amount = data->downloaded - bar->xfered; bar->xfered = data->downloaded; + bar->total_size = data->total; + + if(update_bar_stats(bar)) { + console_cursor_goto_bar(index); + draw_pacman_progress_bar(bar); + } + + if(total_enabled) { + totalbar->xfered += last_chunk_amount; + if(update_bar_stats(totalbar)) { + console_cursor_move_end(); + draw_pacman_progress_bar(totalbar); + } + } - console_cursor_goto_bar(index); - draw_pacman_progress_bar(bar); fflush(stdout); } @@ -902,7 +976,6 @@ static void dload_complete_event(const char *filename, alpm_download_event_compl { int index; struct pacman_progress_bar *bar; - int64_t timediff; bool ok; if(!dload_progressbar_enabled()) { @@ -923,18 +996,7 @@ static void dload_complete_event(const char *filename, alpm_download_event_compl /* The line contains text from previous status. Erase these leftovers. */ console_erase_line(); } else if(data->result == 0) { - /* compute final values */ - bar->xfered = bar->total_size; - timediff = get_time_ms() - bar->init_time; - - /* if transfer was too fast, treat it as a 1ms transfer, for the sake - * of the rate calculation */ - if(timediff < 1) - timediff = 1; - - bar->rate = (double)bar->xfered / (timediff / 1000.0); - /* round elapsed time (in ms) to the nearest second */ - bar->eta = (unsigned int)(timediff + 500) / 1000; + update_bar_finalstats(bar); if(multibar_ui.move_completed_up && index != 0) { /* If this item completed then move it to the top. -- 2.29.2

1 0

[pacman-dev] Remove skipped warning message for already installed packages when --needed is specified?
by Daan De Meyer 07 Dec '20

07 Dec '20

Hi, I recently added --needed to pacman's invocation in mkosi but noticed that even when --needed is specified, pacman still prints warning messages for packages that it's skipping because they are already installed. My intuition was that by enabling --needed, I was explicitly telling pacman that there might be packages that are already installed in the packages that I'm installing and that I want to skip those and not be warned about them. The skipping works fine but I still get warnings. Would it make sense to remove the skipped warning message for packages that are already installed when --needed is specified since the user is explicitly requesting this behavior? Cheers, Daan

2 2