diff options
| author | Michal Schmidt <mschmidt@redhat.com> | 2014-10-04 21:29:10 +0200 |
|---|---|---|
| committer | Michal Schmidt <mschmidt@redhat.com> | 2014-10-23 17:38:02 +0200 |
| commit | 2d5c93c7af05bfa25cad85909acdb7b0bfc3f4e1 (patch) | |
| tree | d0413c10f0e323cb9d3e338a9e15770c95e2c856 | |
| parent | 8f88aed740ded77af443bb1b7c79bb229b50f8f8 (diff) | |
install, cgtop: adjust hashmap_move_one() callers for -ENOMEM possibility
That hashmap_move_one() currently cannot fail with -ENOMEM is an
implementation detail, which is not possible to guarantee in general.
Hashmap implementations based on anything else than chaining of
individual entries may have to allocate.
hashmap_move_one will not fail with -ENOMEM if a proper reservation has
been made beforehand. Use reservations in install.c.
In cgtop.c simply propagate the error instead of asserting.
| -rw-r--r-- | src/cgtop/cgtop.c | 4 | ||||
| -rw-r--r-- | src/shared/install.c | 40 |
2 files changed, 32 insertions, 12 deletions
diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c index ab8c4cfda..932a7ba7c 100644 --- a/src/cgtop/cgtop.c +++ b/src/cgtop/cgtop.c @@ -126,7 +126,9 @@ static int process(const char *controller, const char *path, Hashmap *a, Hashmap return r; } } else { - assert_se(hashmap_move_one(a, b, path) == 0); + r = hashmap_move_one(a, b, path); + if (r < 0) + return r; g->cpu_valid = g->memory_valid = g->io_valid = g->n_tasks_valid = false; } } diff --git a/src/shared/install.c b/src/shared/install.c index 4ef7dc8d9..0d7c30e29 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -1395,18 +1395,24 @@ static int install_context_apply( unsigned *n_changes) { InstallInfo *i; - int r = 0, q; + int r, q; assert(c); assert(paths); assert(config_path); - while ((i = ordered_hashmap_first(c->will_install))) { + if (!ordered_hashmap_isempty(c->will_install)) { + r = ordered_hashmap_ensure_allocated(&c->have_installed, &string_hash_ops); + if (r < 0) + return r; - q = ordered_hashmap_ensure_allocated(&c->have_installed, &string_hash_ops); - if (q < 0) - return q; + r = ordered_hashmap_reserve(c->have_installed, ordered_hashmap_size(c->will_install)); + if (r < 0) + return r; + } + r = 0; + while ((i = ordered_hashmap_first(c->will_install))) { assert_se(ordered_hashmap_move_one(c->have_installed, c->will_install, i->name) == 0); q = unit_file_search(c, i, paths, root_dir, false, true); @@ -1434,7 +1440,7 @@ static int install_context_mark_for_removal( const char *root_dir) { InstallInfo *i; - int r = 0, q; + int r, q; assert(c); assert(paths); @@ -1442,12 +1448,18 @@ static int install_context_mark_for_removal( /* Marks all items for removal */ - while ((i = ordered_hashmap_first(c->will_install))) { + if (!ordered_hashmap_isempty(c->will_install)) { + r = ordered_hashmap_ensure_allocated(&c->have_installed, &string_hash_ops); + if (r < 0) + return r; - q = ordered_hashmap_ensure_allocated(&c->have_installed, &string_hash_ops); - if (q < 0) - return q; + r = ordered_hashmap_reserve(c->have_installed, ordered_hashmap_size(c->will_install)); + if (r < 0) + return r; + } + r = 0; + while ((i = ordered_hashmap_first(c->will_install))) { assert_se(ordered_hashmap_move_one(c->have_installed, c->will_install, i->name) == 0); q = unit_file_search(c, i, paths, root_dir, false, true); @@ -1544,11 +1556,17 @@ int unit_file_add_dependency( return r; } - while ((info = ordered_hashmap_first(c.will_install))) { + if (!ordered_hashmap_isempty(c.will_install)) { r = ordered_hashmap_ensure_allocated(&c.have_installed, &string_hash_ops); if (r < 0) return r; + r = ordered_hashmap_reserve(c.have_installed, ordered_hashmap_size(c.will_install)); + if (r < 0) + return r; + } + + while ((info = ordered_hashmap_first(c.will_install))) { assert_se(ordered_hashmap_move_one(c.have_installed, c.will_install, info->name) == 0); r = unit_file_search(&c, info, &paths, root_dir, false, false); |