From f8fd91c9f0f1f7feabf8567bdad61f57fe922011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 14 Mar 2015 21:46:59 -0400 Subject: [PATCH] sysv-generator: initialize LookupPaths just once With debugging on, sysv-generator would print the full set of lookup paths for *every* sysv script. While at it, pass LookupPaths as a pointer in sysv-generator, and constify it everywhere. (cherry picked from commit a8ffe6fbcbfdba39aef8dce8b298b3e0cb377c0e) --- src/shared/install.c | 55 +++++++++++++++++------------ src/shared/install.h | 11 +++++- src/shared/path-lookup.c | 1 + src/shared/path-lookup.h | 3 +- src/sysv-generator/sysv-generator.c | 14 ++++---- 5 files changed, 53 insertions(+), 31 deletions(-) diff --git a/src/shared/install.c b/src/shared/install.c index 65f1c245c6..92b8d6e8ef 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -1084,7 +1084,7 @@ static int unit_file_load( static int unit_file_search( InstallContext *c, InstallInfo *info, - LookupPaths *paths, + const LookupPaths *paths, const char *root_dir, bool allow_symlink, bool load, @@ -1153,7 +1153,7 @@ static int unit_file_search( } static int unit_file_can_install( - LookupPaths *paths, + const LookupPaths *paths, const char *root_dir, const char *name, bool allow_symlink, @@ -1317,7 +1317,7 @@ static int install_info_symlink_wants( static int install_info_symlink_link( InstallInfo *i, - LookupPaths *paths, + const LookupPaths *paths, const char *config_path, const char *root_dir, bool force, @@ -1345,7 +1345,7 @@ static int install_info_symlink_link( static int install_info_apply( InstallInfo *i, - LookupPaths *paths, + const LookupPaths *paths, const char *config_path, const char *root_dir, bool force, @@ -1377,7 +1377,7 @@ static int install_info_apply( static int install_context_apply( InstallContext *c, - LookupPaths *paths, + const LookupPaths *paths, const char *config_path, const char *root_dir, bool force, @@ -1424,7 +1424,7 @@ static int install_context_apply( static int install_context_mark_for_removal( InstallContext *c, - LookupPaths *paths, + const LookupPaths *paths, Set **remove_symlinks_to, const char *config_path, const char *root_dir) { @@ -1785,39 +1785,28 @@ int unit_file_get_default( return -ENOENT; } -UnitFileState unit_file_get_state( +UnitFileState unit_file_lookup_state( UnitFileScope scope, const char *root_dir, + const LookupPaths *paths, const char *name) { - _cleanup_lookup_paths_free_ LookupPaths paths = {}; UnitFileState state = _UNIT_FILE_STATE_INVALID; char **i; _cleanup_free_ char *path = NULL; int r; - assert(scope >= 0); - assert(scope < _UNIT_FILE_SCOPE_MAX); - assert(name); - - if (root_dir && scope != UNIT_FILE_SYSTEM) - return -EINVAL; + assert(paths); if (!unit_name_is_valid(name, TEMPLATE_VALID)) return -EINVAL; - r = lookup_paths_init_from_scope(&paths, scope, root_dir); - if (r < 0) - return r; - - STRV_FOREACH(i, paths.unit_path) { + STRV_FOREACH(i, paths->unit_path) { struct stat st; char *partial; bool also = false; free(path); - path = NULL; - path = path_join(root_dir, *i, name); if (!path) return -ENOMEM; @@ -1858,7 +1847,7 @@ UnitFileState unit_file_get_state( else if (r > 0) return state; - r = unit_file_can_install(&paths, root_dir, partial, true, &also); + r = unit_file_can_install(paths, root_dir, partial, true, &also); if (r < 0 && errno != ENOENT) return r; else if (r > 0) @@ -1873,6 +1862,28 @@ UnitFileState unit_file_get_state( return r < 0 ? r : state; } +UnitFileState unit_file_get_state( + UnitFileScope scope, + const char *root_dir, + const char *name) { + + _cleanup_lookup_paths_free_ LookupPaths paths = {}; + int r; + + assert(scope >= 0); + assert(scope < _UNIT_FILE_SCOPE_MAX); + assert(name); + + if (root_dir && scope != UNIT_FILE_SYSTEM) + return -EINVAL; + + r = lookup_paths_init_from_scope(&paths, scope, root_dir); + if (r < 0) + return r; + + return unit_file_lookup_state(scope, root_dir, &paths, name); +} + int unit_file_query_preset(UnitFileScope scope, const char *root_dir, const char *name) { _cleanup_strv_free_ char **files = NULL; char **p; diff --git a/src/shared/install.h b/src/shared/install.h index 357be0f92d..3ca39397e6 100644 --- a/src/shared/install.h +++ b/src/shared/install.h @@ -23,6 +23,7 @@ #include "hashmap.h" #include "unit-name.h" +#include "path-lookup.h" typedef enum UnitFileScope { UNIT_FILE_SYSTEM, @@ -98,7 +99,15 @@ int unit_file_set_default(UnitFileScope scope, const char *root_dir, const char int unit_file_get_default(UnitFileScope scope, const char *root_dir, char **name); int unit_file_add_dependency(UnitFileScope scope, bool runtime, const char *root_dir, char **files, char *target, UnitDependency dep, bool force, UnitFileChange **changes, unsigned *n_changes); -UnitFileState unit_file_get_state(UnitFileScope scope, const char *root_dir, const char *filename); +UnitFileState unit_file_lookup_state( + UnitFileScope scope, + const char *root_dir, + const LookupPaths *paths, + const char *name); +UnitFileState unit_file_get_state( + UnitFileScope scope, + const char *root_dir, + const char *filename); int unit_file_get_list(UnitFileScope scope, const char *root_dir, Hashmap *h); diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c index 291a2f4054..812730be1c 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c @@ -31,6 +31,7 @@ #include "strv.h" #include "path-util.h" #include "path-lookup.h" +#include "install.h" int user_config_home(char **config_home) { const char *e; diff --git a/src/shared/path-lookup.h b/src/shared/path-lookup.h index 2ec888da81..f1925eef69 100644 --- a/src/shared/path-lookup.h +++ b/src/shared/path-lookup.h @@ -22,7 +22,8 @@ ***/ #include "macro.h" -#include "install.h" + +typedef enum UnitFileScope UnitFileScope; typedef struct LookupPaths { char **unit_path; diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index 6e39b449eb..0125ca27d9 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -723,10 +723,10 @@ static int fix_order(SysvStub *s, Hashmap *all_services) { return 0; } -static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) { +static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) { char **path; - STRV_FOREACH(path, lp.sysvinit_path) { + STRV_FOREACH(path, lp->sysvinit_path) { _cleanup_closedir_ DIR *d = NULL; struct dirent *de; @@ -768,7 +768,7 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) { if (!fpath) return log_oom(); - if (unit_file_get_state(UNIT_FILE_SYSTEM, NULL, name) >= 0) { + if (unit_file_lookup_state(UNIT_FILE_SYSTEM, NULL, lp, name) >= 0) { log_debug("Native unit for %s already exists, skipping", name); continue; } @@ -793,7 +793,7 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) { return 0; } -static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) { +static int set_dependencies_from_rcnd(const LookupPaths *lp, Hashmap *all_services) { char **p; unsigned i; _cleanup_closedir_ DIR *d = NULL; @@ -804,7 +804,7 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) { _cleanup_set_free_ Set *shutdown_services = NULL; int r = 0; - STRV_FOREACH(p, lp.sysvrcnd_path) + STRV_FOREACH(p, lp->sysvrcnd_path) for (i = 0; i < ELEMENTSOF(rcnd_table); i ++) { struct dirent *de; @@ -954,13 +954,13 @@ int main(int argc, char *argv[]) { return EXIT_FAILURE; } - r = enumerate_sysv(lp, all_services); + r = enumerate_sysv(&lp, all_services); if (r < 0) { log_error("Failed to generate units for all init scripts."); return EXIT_FAILURE; } - r = set_dependencies_from_rcnd(lp, all_services); + r = set_dependencies_from_rcnd(&lp, all_services); if (r < 0) { log_error("Failed to read runlevels from rcnd links."); return EXIT_FAILURE;