SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: Turn manager unit log fields into unit functions

Browse Source 
There's no need for these to be fields inside the manager struct,
let's turn them into functions in unit.h instead, again to allow
forward declaring the Manager struct in a later commit.
This commit is contained in:
Daan De Meyer
2025-04-23 09:53:53 +02:00
parent 8aa304d313
commit 64fd6ba9ca
6 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/unit.c
+12 -4
View File
@@ -1727,9 +1727,9 @@ static int log_unit_internal(void *userdata, int level, int error, const char *f
va_start(ap, format);
if (u)
r = log_object_internalv(level, error, file, line, func,
u->manager->unit_log_field,
unit_log_field(u),
u->id,
u->manager->invocation_log_field,
unit_invocation_log_field(u),
u->invocation_id_string,
format, ap);
else
@@ -2491,10 +2491,10 @@ static int unit_log_resources(Unit *u) {
if (!set_iovec_string_field(iovec, &n_iovec, "MESSAGE_ID=", SD_MESSAGE_UNIT_RESOURCES_STR))
return log_oom();
if (!set_iovec_string_field(iovec, &n_iovec, u->manager->unit_log_field, u->id))
if (!set_iovec_string_field(iovec, &n_iovec, unit_log_field(u), u->id))
return log_oom();
if (!set_iovec_string_field(iovec, &n_iovec, u->manager->invocation_log_field, u->invocation_id_string))
if (!set_iovec_string_field(iovec, &n_iovec, unit_invocation_log_field(u), u->invocation_id_string))
return log_oom();
log_unit_struct_iovec(u, log_level, iovec, n_iovec);
@@ -6642,6 +6642,14 @@ int unit_compare_priority(Unit *a, Unit *b) {
return strcmp(a->id, b->id);
}
const char* unit_log_field(const Unit *u) {
return MANAGER_IS_SYSTEM(ASSERT_PTR(u)->manager) ? "UNIT=" : "USER_UNIT=";
}
const char* unit_invocation_log_field(const Unit *u) {
return MANAGER_IS_SYSTEM(ASSERT_PTR(u)->manager) ? "INVOCATION_ID=" : "USER_INVOCATION_ID=";
}
const ActivationDetailsVTable * const activation_details_vtable[_UNIT_TYPE_MAX] = {
[UNIT_PATH] = &activation_details_path_vtable,
[UNIT_TIMER] = &activation_details_timer_vtable,