picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

install, cgtop: adjust hashmap_move_one() callers for -ENOMEM possibility

Browse source 
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.
This commit is contained in:
Michal Schmidt 2014-10-04 21:29:10 +02:00
parent 8f88aed740
commit 2d5c93c7af
2 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cgtop/cgtop.c
View file

@ -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;
}
}

44
src/shared/install.c
View file

@ -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);
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;
}
r = 0;
while ((i = ordered_hashmap_first(c->will_install))) {
q = ordered_hashmap_ensure_allocated(&c->have_installed, &string_hash_ops);
if (q < 0)
return q;
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 */
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;
}
r = 0;
while ((i = ordered_hashmap_first(c->will_install))) {
q = ordered_hashmap_ensure_allocated(&c->have_installed, &string_hash_ops);
if (q < 0)
return q;
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);