shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-10 01:17:44 +03:00
Code

Merge pull request #25035 from keszybz/manager-method-names

Browse Source 
Manager method names
This commit is contained in:
Luca Boccassi 2022-10-17 23:11:13 +02:00 committed by GitHub
commit 6a0907b8a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
man/org.freedesktop.systemd1.xml
View File

@ -2442,7 +2442,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
will be a pair of empty strings.</para>
<para><varname>Transient</varname> contains a boolean that indicates whether the unit was created as a
transient unit (i.e. via <function>CreateTransientUnit()</function> on the manager object).</para>
transient unit (i.e. via <function>StartTransientUnit()</function> on the manager object).</para>
<para><varname>ActivationDetails</varname> contains a list of string pairs, key and value, that
describe the event that caused the unit to be activated, if any. The key describes the information

58
src/core/manager.c
View File

@ -2116,15 +2116,13 @@ int manager_load_unit_prepare(
const char *name,
const char *path,
sd_bus_error *e,
Unit **_ret) {
Unit **ret) {
_cleanup_(unit_freep) Unit *cleanup_ret = NULL;
Unit *ret;
UnitType t;
_cleanup_(unit_freep) Unit *cleanup_unit = NULL;
int r;
assert(m);
assert(_ret);
assert(ret);
/* This will prepare the unit for loading, but not actually load anything from disk. */
@ -2139,7 +2137,7 @@ int manager_load_unit_prepare(
name = basename(path);
}
t = unit_name_to_type(name);
UnitType t = unit_name_to_type(name);
if (t == _UNIT_TYPE_INVALID || !unit_name_is_valid(name, UNIT_NAME_PLAIN|UNIT_NAME_INSTANCE)) {
if (unit_name_is_valid(name, UNIT_NAME_TEMPLATE))
@ -2148,8 +2146,8 @@ int manager_load_unit_prepare(
return sd_bus_error_setf(e, SD_BUS_ERROR_INVALID_ARGS, "Unit name %s is not valid.", name);
}
ret = manager_get_unit(m, name);
if (ret) {
Unit *unit = manager_get_unit(m, name);
if (unit) {
/* The time-based cache allows to start new units without daemon-reload,
* but if they are already referenced (because of dependencies or ordering)
* then we have to force a load of the fragment. As an optimization, check
@ -2159,36 +2157,36 @@ int manager_load_unit_prepare(
* we need to try again — even if the cache is current, it might have been
* updated in a different context before we had a chance to retry loading
* this particular unit. */
if (manager_unit_cache_should_retry_load(ret))
ret->load_state = UNIT_STUB;
if (manager_unit_cache_should_retry_load(unit))
unit->load_state = UNIT_STUB;
else {
*_ret = ret;
return 1;
*ret = unit;
return 0; /* The unit was already loaded */
}
} else {
ret = cleanup_ret = unit_new(m, unit_vtable[t]->object_size);
if (!ret)
unit = cleanup_unit = unit_new(m, unit_vtable[t]->object_size);
if (!unit)
return -ENOMEM;
}
if (path) {
r = free_and_strdup(&ret->fragment_path, path);
r = free_and_strdup(&unit->fragment_path, path);
if (r < 0)
return r;
}
r = unit_add_name(ret, name);
r = unit_add_name(unit, name);
if (r < 0)
return r;
unit_add_to_load_queue(ret);
unit_add_to_dbus_queue(ret);
unit_add_to_gc_queue(ret);
unit_add_to_load_queue(unit);
unit_add_to_dbus_queue(unit);
unit_add_to_gc_queue(unit);
*_ret = ret;
cleanup_ret = NULL;
*ret = unit;
TAKE_PTR(cleanup_unit);
return 0;
return 1; /* The unit was added the load queue */
}
int manager_load_unit(
@ -2196,23 +2194,21 @@ int manager_load_unit(
const char *name,
const char *path,
sd_bus_error *e,
Unit **_ret) {
Unit **ret) {
int r;
assert(m);
assert(_ret);
assert(ret);
/* This will load the service information files, but not actually
* start any services or anything. */
/* This will load the unit config, but not actually start any services or anything. */
r = manager_load_unit_prepare(m, name, path, e, _ret);
if (r != 0)
r = manager_load_unit_prepare(m, name, path, e, ret);
if (r <= 0)
return r;
/* Unit was newly loaded */
manager_dispatch_load_queue(m);
*_ret = unit_follow_merge(*_ret);
*ret = unit_follow_merge(*ret);
return 0;
}

4
src/core/manager.h
View File

@ -494,8 +494,8 @@ Unit *manager_get_unit(Manager *m, const char *name);
int manager_get_job_from_dbus_path(Manager *m, const char *s, Job **_j);
bool manager_unit_cache_should_retry_load(Unit *u);
int manager_load_unit_prepare(Manager *m, const char *name, const char *path, sd_bus_error *e, Unit **_ret);
int manager_load_unit(Manager *m, const char *name, const char *path, sd_bus_error *e, Unit **_ret);
int manager_load_unit_prepare(Manager *m, const char *name, const char *path, sd_bus_error *e, Unit **ret);
int manager_load_unit(Manager *m, const char *name, const char *path, sd_bus_error *e, Unit **ret);
int manager_load_startable_unit_or_warn(Manager *m, const char *name, const char *path, Unit **ret);
int manager_load_unit_from_dbus_path(Manager *m, const char *s, sd_bus_error *e, Unit **_u);