summaryrefslogtreecommitdiff
path: root/lib/libalpm
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2015-12-14 15:48:44 +1000
committerAllan McRae <allan@archlinux.org>2015-12-15 20:12:23 +1000
commit760bea543211673884c254b7e0c44e0f70fe2257 (patch)
tree6ac940877290cc5a62919a4f92f9fdc715c0d066 /lib/libalpm
parent8d3bd4ec13940da70f946e6e63d59a05c89cbb50 (diff)
downloadpacman-760bea543211673884c254b7e0c44e0f70fe2257.tar.xz
Show progress processing hooks
Introduces the ALPM_EVENT_HOOK_RUN_{START,DONE} events that are triggered at the start and end of running an individual hook. Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm')
-rw-r--r--lib/libalpm/alpm.h18
-rw-r--r--lib/libalpm/hook.c17
2 files changed, 32 insertions, 3 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 8fcdfdfc..337104e0 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -461,7 +461,11 @@ typedef enum _alpm_event_type_t {
/** Processing hooks will be started. */
ALPM_EVENT_HOOK_START,
/** Processing hooks is finished. */
- ALPM_EVENT_HOOK_DONE
+ ALPM_EVENT_HOOK_DONE,
+ /** A hook is starting */
+ ALPM_EVENT_HOOK_RUN_START,
+ /** A hook has finnished runnning */
+ ALPM_EVENT_HOOK_RUN_DONE
} alpm_event_type_t;
typedef struct _alpm_event_any_t {
@@ -559,6 +563,17 @@ typedef struct _alpm_event_hook_t {
alpm_hook_when_t when;
} alpm_event_hook_t;
+typedef struct _alpm_event_hook_run_t {
+ /** Type of event.*/
+ alpm_event_type_t type;
+ /** Name of hook */
+ const char *name;
+ /** position of hook being run */
+ size_t position;
+ /** total hooks being run */
+ size_t total;
+} alpm_event_hook_run_t;
+
/** Events.
* This is an union passed to the callback, that allows the frontend to know
* which type of event was triggered (via type). It is then possible to
@@ -576,6 +591,7 @@ typedef union _alpm_event_t {
alpm_event_pacnew_created_t pacnew_created;
alpm_event_pacsave_created_t pacsave_created;
alpm_event_hook_t hook;
+ alpm_event_hook_run_t hook_run;
} alpm_event_t;
/** Event callback. */
diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c
index 9f73ecc6..804cfa57 100644
--- a/lib/libalpm/hook.c
+++ b/lib/libalpm/hook.c
@@ -611,9 +611,10 @@ static int _alpm_hook_run_hook(alpm_handle_t *handle, struct _alpm_hook_t *hook)
int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when)
{
alpm_event_hook_t event = { .when = when };
+ alpm_event_hook_run_t hook_event;
alpm_list_t *i, *hooks = NULL, *hooks_triggered = NULL;
const char *suffix = ".hook";
- size_t suflen = strlen(suffix);
+ size_t suflen = strlen(suffix), triggered = 0;
int ret = 0;
for(i = alpm_list_last(handle->hookdirs); i; i = alpm_list_previous(i)) {
@@ -714,6 +715,7 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when)
struct _alpm_hook_t *hook = i->data;
if(hook && hook->when == when && _alpm_hook_triggered(handle, hook)) {
hooks_triggered = alpm_list_add(hooks_triggered, hook);
+ triggered++;
}
}
@@ -721,12 +723,23 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when)
event.type = ALPM_EVENT_HOOK_START;
EVENT(handle, &event);
- for(i = hooks_triggered; i; i = i->next) {
+ hook_event.position = 1;
+ hook_event.total = triggered;
+
+ for(i = hooks_triggered; i; i = i->next, hook_event.position++) {
struct _alpm_hook_t *hook = i->data;
_alpm_log(handle, ALPM_LOG_DEBUG, "running hook %s\n", hook->name);
+
+ hook_event.type = ALPM_EVENT_HOOK_RUN_START;
+ hook_event.name = hook->name;
+ EVENT(handle, &hook_event);
+
if(_alpm_hook_run_hook(handle, hook) != 0 && hook->abort_on_fail) {
ret = -1;
}
+
+ hook_event.type = ALPM_EVENT_HOOK_RUN_DONE;
+ EVENT(handle, &hook_event);
}
alpm_list_free(hooks_triggered);