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

log: rearrange log function naming

Browse Source 
- Rename log_meta() → log_internal(), to follow naming scheme of most
  other log functions that are usually invoked through macros, but never
  directly.

- Rename log_info_object() to log_object_info(), simply because the
  object should be before any other parameters, to follow OO-style
  programming style.
This commit is contained in:
Lennart Poettering
2014-11-27 22:05:24 +01:00
parent e09ca588d2
commit 79008bddf6
51 changed files with 669 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/timer.c
+15 -15
View File
@@ -86,7 +86,7 @@ static int timer_verify(Timer *t) {
return 0;
if (!t->values) {
log_error_unit(UNIT(t)->id, "%s lacks value setting. Refusing.", UNIT(t)->id);
log_unit_error(UNIT(t)->id, "%s lacks value setting. Refusing.", UNIT(t)->id);
return -EINVAL;
}
@@ -260,7 +260,7 @@ static void timer_set_state(Timer *t, TimerState state) {
}
if (state != old_state)
log_debug_unit(UNIT(t)->id,
log_unit_debug(UNIT(t)->id,
"%s changed %s -> %s", UNIT(t)->id,
timer_state_to_string(old_state),
timer_state_to_string(state));
@@ -419,7 +419,7 @@ static void timer_enter_waiting(Timer *t, bool initial) {
}
if (!found_monotonic && !found_realtime) {
log_debug_unit(UNIT(t)->id, "%s: Timer is elapsed.", UNIT(t)->id);
log_unit_debug(UNIT(t)->id, "%s: Timer is elapsed.", UNIT(t)->id);
timer_set_state(t, TIMER_ELAPSED);
return;
}
@@ -427,7 +427,7 @@ static void timer_enter_waiting(Timer *t, bool initial) {
if (found_monotonic) {
char buf[FORMAT_TIMESPAN_MAX];
log_debug_unit(UNIT(t)->id, "%s: Monotonic timer elapses in %s.",
log_unit_debug(UNIT(t)->id, "%s: Monotonic timer elapses in %s.",
UNIT(t)->id,
format_timespan(buf, sizeof(buf), t->next_elapse_monotonic_or_boottime > ts_monotonic ? t->next_elapse_monotonic_or_boottime - ts_monotonic : 0, 0));
@@ -456,7 +456,7 @@ static void timer_enter_waiting(Timer *t, bool initial) {
if (found_realtime) {
char buf[FORMAT_TIMESTAMP_MAX];
log_debug_unit(UNIT(t)->id, "%s: Realtime timer elapses at %s.", UNIT(t)->id, format_timestamp(buf, sizeof(buf), t->next_elapse_realtime));
log_unit_debug(UNIT(t)->id, "%s: Realtime timer elapses at %s.", UNIT(t)->id, format_timestamp(buf, sizeof(buf), t->next_elapse_realtime));
if (t->realtime_event_source) {
r = sd_event_source_set_time(t->realtime_event_source, t->next_elapse_realtime);
@@ -485,7 +485,7 @@ static void timer_enter_waiting(Timer *t, bool initial) {
return;
fail:
log_warning_unit(UNIT(t)->id, "%s failed to enter waiting state: %s", UNIT(t)->id, strerror(-r));
log_unit_warning(UNIT(t)->id, "%s failed to enter waiting state: %s", UNIT(t)->id, strerror(-r));
timer_enter_dead(t, TIMER_FAILURE_RESOURCES);
}
@@ -513,7 +513,7 @@ static void timer_enter_running(Timer *t) {
return;
fail:
log_warning_unit(UNIT(t)->id,
log_unit_warning(UNIT(t)->id,
"%s failed to queue unit startup job: %s",
UNIT(t)->id, bus_error_message(&error, r));
timer_enter_dead(t, TIMER_FAILURE_RESOURCES);
@@ -596,7 +596,7 @@ static int timer_deserialize_item(Unit *u, const char *key, const char *value, F
state = timer_state_from_string(value);
if (state < 0)
log_debug_unit(u->id, "Failed to parse state value %s", value);
log_unit_debug(u->id, "Failed to parse state value %s", value);
else
t->deserialized_state = state;
} else if (streq(key, "result")) {
@@ -604,23 +604,23 @@ static int timer_deserialize_item(Unit *u, const char *key, const char *value, F
f = timer_result_from_string(value);
if (f < 0)
log_debug_unit(u->id, "Failed to parse result value %s", value);
log_unit_debug(u->id, "Failed to parse result value %s", value);
else if (f != TIMER_SUCCESS)
t->result = f;
} else if (streq(key, "last-trigger-realtime")) {
r = safe_atou64(value, &t->last_trigger.realtime);
if (r < 0)
log_debug_unit(u->id, "Failed to parse last-trigger-realtime value %s", value);
log_unit_debug(u->id, "Failed to parse last-trigger-realtime value %s", value);
} else if (streq(key, "last-trigger-monotonic")) {
r = safe_atou64(value, &t->last_trigger.monotonic);
if (r < 0)
log_debug_unit(u->id, "Failed to parse last-trigger-monotonic value %s", value);
log_unit_debug(u->id, "Failed to parse last-trigger-monotonic value %s", value);
} else
log_debug_unit(u->id, "Unknown serialization key '%s'", key);
log_unit_debug(u->id, "Unknown serialization key '%s'", key);
return 0;
}
@@ -645,7 +645,7 @@ static int timer_dispatch(sd_event_source *s, uint64_t usec, void *userdata) {
if (t->state != TIMER_WAITING)
return 0;
log_debug_unit(UNIT(t)->id, "Timer elapsed on %s", UNIT(t)->id);
log_unit_debug(UNIT(t)->id, "Timer elapsed on %s", UNIT(t)->id);
timer_enter_running(t);
return 0;
}
@@ -678,7 +678,7 @@ static void timer_trigger_notify(Unit *u, Unit *other) {
case TIMER_RUNNING:
if (UNIT_IS_INACTIVE_OR_FAILED(unit_active_state(other))) {
log_debug_unit(UNIT(t)->id, "%s got notified about unit deactivation.", UNIT(t)->id);
log_unit_debug(UNIT(t)->id, "%s got notified about unit deactivation.", UNIT(t)->id);
timer_enter_waiting(t, false);
}
break;
@@ -711,7 +711,7 @@ static void timer_time_change(Unit *u) {
if (t->state != TIMER_WAITING)
return;
log_debug_unit(u->id, "%s: time change, recalculating next elapse.", u->id);
log_unit_debug(u->id, "%s: time change, recalculating next elapse.", u->id);
timer_enter_waiting(t, false);
}