581fef8d56
When we would iterate over the lookup paths for each unit, making the list as short as possible was important for performance. With the current cache, it doesn't matter much. Two classes of paths were being removed: - paths which don't exist in the filesystem - paths which symlink to a path earlier in the search list Both of those points cause problems with the caching code: - if a user creates a directory that didn't exist before and puts units there, now we will notice the new mtime an properly load the unit. When the path was removed from list, we wouldn't. - we now properly detect whether a unit path is on the path or not. Before, if e.g. /lib/systemd/system, /usr/lib/systemd/systemd were both on the path, and /lib was a symlink to /usr/lib, the second directory would be pruned from the path. Then, the code would think that a symlink /etc/systemd/system/foo.service→/lib/systemd/system/foo.service is an alias, but /etc/systemd/system/foo.service→/usr/lib/systemd/system/foo.service would be considered a link (in the systemctl link sense). Removing the pruning has a slight negative performance impact in case of usr-merge systems which have systemd compiled with non-usr-merge paths. Non-usr-merge systems are deprecated, and this impact should be very small, so I think it's OK. If it turns out to be an issue, the loop in function that builds the cache could be improved to skip over "duplicate" directories with same logic that the cache pruning did before. I didn't want to add this, becuase it complicates the code to improve a corner case. Fixes #13272.
75 lines
2.8 KiB
C
75 lines
2.8 KiB
C
/* SPDX-License-Identifier: LGPL-2.1+ */
|
|
#pragma once
|
|
|
|
#include <stdbool.h>
|
|
|
|
typedef struct LookupPaths LookupPaths;
|
|
|
|
#include "unit-file.h"
|
|
#include "macro.h"
|
|
|
|
typedef enum LookupPathsFlags {
|
|
LOOKUP_PATHS_EXCLUDE_GENERATED = 1 << 0,
|
|
LOOKUP_PATHS_TEMPORARY_GENERATED = 1 << 1,
|
|
LOOKUP_PATHS_SPLIT_USR = 1 << 2,
|
|
} LookupPathsFlags;
|
|
|
|
struct LookupPaths {
|
|
/* Where we look for unit files. This includes the individual special paths below, but also any vendor
|
|
* supplied, static unit file paths. */
|
|
char **search_path;
|
|
|
|
/* Where we shall create or remove our installation symlinks, aka "configuration", and where the user/admin
|
|
* shall place his own unit files. */
|
|
char *persistent_config;
|
|
char *runtime_config;
|
|
|
|
/* Where units from a portable service image shall be placed. */
|
|
char *persistent_attached;
|
|
char *runtime_attached;
|
|
|
|
/* Where to place generated unit files (i.e. those a "generator" tool generated). Note the special semantics of
|
|
* this directory: the generators are flushed each time a "systemctl daemon-reload" is issued. The user should
|
|
* not alter these directories directly. */
|
|
char *generator;
|
|
char *generator_early;
|
|
char *generator_late;
|
|
|
|
/* Where to place transient unit files (i.e. those created dynamically via the bus API). Note the special
|
|
* semantics of this directory: all units created transiently have their unit files removed as the transient
|
|
* unit is unloaded. The user should not alter this directory directly. */
|
|
char *transient;
|
|
|
|
/* Where the snippets created by "systemctl set-property" are placed. Note that for transient units, the
|
|
* snippets are placed in the transient directory though (see above). The user should not alter this directory
|
|
* directly. */
|
|
char *persistent_control;
|
|
char *runtime_control;
|
|
|
|
/* The root directory prepended to all items above, or NULL */
|
|
char *root_dir;
|
|
|
|
/* A temporary directory when running in test mode, to be nuked */
|
|
char *temporary_dir;
|
|
};
|
|
|
|
int lookup_paths_init(LookupPaths *p, UnitFileScope scope, LookupPathsFlags flags, const char *root_dir);
|
|
|
|
int xdg_user_dirs(char ***ret_config_dirs, char ***ret_data_dirs);
|
|
int xdg_user_runtime_dir(char **ret, const char *suffix);
|
|
int xdg_user_config_dir(char **ret, const char *suffix);
|
|
int xdg_user_data_dir(char **ret, const char *suffix);
|
|
|
|
bool path_is_user_data_dir(const char *path);
|
|
bool path_is_user_config_dir(const char *path);
|
|
|
|
void lookup_paths_log(LookupPaths *p);
|
|
|
|
int lookup_paths_mkdir_generator(LookupPaths *p);
|
|
void lookup_paths_trim_generator(LookupPaths *p);
|
|
void lookup_paths_flush_generator(LookupPaths *p);
|
|
|
|
void lookup_paths_free(LookupPaths *p);
|
|
|
|
char **generator_binary_paths(UnitFileScope scope);
|