mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-22 13:33:56 +03:00
util: rename parse_usec() to parse_sec() sinds the default unit is seconds
Internally we store all time values in usec_t, however parse_usec() actually was used mostly to parse values in seconds (unless explicit units were specified to define a different unit). Hence, be clear about this and name the function about what we pass into it, not what we get out of it.
This commit is contained in:
parent
574d5f2dfc
commit
7f602784de
@ -102,7 +102,7 @@ static int parse_argv(int argc, char *argv[]) {
|
||||
break;
|
||||
|
||||
case ARG_TIMEOUT:
|
||||
if (parse_usec(optarg, &arg_timeout) < 0) {
|
||||
if (parse_sec(optarg, &arg_timeout) < 0) {
|
||||
log_error("Failed to parse --timeout parameter %s", optarg);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
@ -629,7 +629,7 @@ static int parse_argv(int argc, char *argv[]) {
|
||||
break;
|
||||
|
||||
case 'd':
|
||||
r = parse_usec(optarg, &arg_delay);
|
||||
r = parse_sec(optarg, &arg_delay);
|
||||
if (r < 0 || arg_delay <= 0) {
|
||||
log_error("Failed to parse delay parameter.");
|
||||
return -EINVAL;
|
||||
|
@ -90,7 +90,7 @@ $1.ControlGroupModify, config_parse_bool, 0,
|
||||
$1.ControlGroupPersistent, config_parse_tristate, 0, offsetof($1, exec_context.control_group_persistent)'
|
||||
)m4_dnl
|
||||
m4_define(`KILL_CONTEXT_CONFIG_ITEMS',
|
||||
`$1.SendSIGKILL, config_parse_bool, 0, offsetof($1, kill_context.send_sigkill)
|
||||
`$1.SendSIGKILL, config_parse_bool, 0, offsetof($1, kill_context.send_sigkill)
|
||||
$1.KillMode, config_parse_kill_mode, 0, offsetof($1, kill_context.kill_mode)
|
||||
$1.KillSignal, config_parse_kill_signal, 0, offsetof($1, kill_context.kill_signal)'
|
||||
)m4_dnl
|
||||
@ -122,7 +122,7 @@ Unit.DefaultDependencies, config_parse_bool, 0,
|
||||
Unit.OnFailureIsolate, config_parse_bool, 0, offsetof(Unit, on_failure_isolate)
|
||||
Unit.IgnoreOnIsolate, config_parse_bool, 0, offsetof(Unit, ignore_on_isolate)
|
||||
Unit.IgnoreOnSnapshot, config_parse_bool, 0, offsetof(Unit, ignore_on_snapshot)
|
||||
Unit.JobTimeoutSec, config_parse_usec, 0, offsetof(Unit, job_timeout)
|
||||
Unit.JobTimeoutSec, config_parse_sec, 0, offsetof(Unit, job_timeout)
|
||||
Unit.ConditionPathExists, config_parse_unit_condition_path, CONDITION_PATH_EXISTS, 0
|
||||
Unit.ConditionPathExistsGlob, config_parse_unit_condition_path, CONDITION_PATH_EXISTS_GLOB, 0
|
||||
Unit.ConditionPathIsDirectory, config_parse_unit_condition_path, CONDITION_PATH_IS_DIRECTORY, 0
|
||||
@ -147,12 +147,12 @@ Service.ExecStartPost, config_parse_exec, SERVICE_EXE
|
||||
Service.ExecReload, config_parse_exec, SERVICE_EXEC_RELOAD, offsetof(Service, exec_command)
|
||||
Service.ExecStop, config_parse_exec, SERVICE_EXEC_STOP, offsetof(Service, exec_command)
|
||||
Service.ExecStopPost, config_parse_exec, SERVICE_EXEC_STOP_POST, offsetof(Service, exec_command)
|
||||
Service.RestartSec, config_parse_usec, 0, offsetof(Service, restart_usec)
|
||||
Service.RestartSec, config_parse_sec, 0, offsetof(Service, restart_usec)
|
||||
Service.TimeoutSec, config_parse_service_timeout, 0, offsetof(Service, timeout_start_usec)
|
||||
Service.TimeoutStartSec, config_parse_service_timeout, 0, offsetof(Service, timeout_start_usec)
|
||||
Service.TimeoutStopSec, config_parse_service_timeout, 0, offsetof(Service, timeout_stop_usec)
|
||||
Service.WatchdogSec, config_parse_usec, 0, offsetof(Service, watchdog_usec)
|
||||
Service.StartLimitInterval, config_parse_usec, 0, offsetof(Service, start_limit.interval)
|
||||
Service.WatchdogSec, config_parse_sec, 0, offsetof(Service, watchdog_usec)
|
||||
Service.StartLimitInterval, config_parse_sec, 0, offsetof(Service, start_limit.interval)
|
||||
Service.StartLimitBurst, config_parse_unsigned, 0, offsetof(Service, start_limit.burst)
|
||||
Service.StartLimitAction, config_parse_start_limit_action, 0, offsetof(Service, start_limit_action)
|
||||
Service.Type, config_parse_service_type, 0, offsetof(Service, type)
|
||||
@ -188,7 +188,7 @@ Socket.ExecStartPre, config_parse_exec, SOCKET_EXEC
|
||||
Socket.ExecStartPost, config_parse_exec, SOCKET_EXEC_START_POST, offsetof(Socket, exec_command)
|
||||
Socket.ExecStopPre, config_parse_exec, SOCKET_EXEC_STOP_PRE, offsetof(Socket, exec_command)
|
||||
Socket.ExecStopPost, config_parse_exec, SOCKET_EXEC_STOP_POST, offsetof(Socket, exec_command)
|
||||
Socket.TimeoutSec, config_parse_usec, 0, offsetof(Socket, timeout_usec)
|
||||
Socket.TimeoutSec, config_parse_sec, 0, offsetof(Socket, timeout_usec)
|
||||
Socket.DirectoryMode, config_parse_mode, 0, offsetof(Socket, directory_mode)
|
||||
Socket.SocketMode, config_parse_mode, 0, offsetof(Socket, socket_mode)
|
||||
Socket.Accept, config_parse_bool, 0, offsetof(Socket, accept)
|
||||
@ -221,7 +221,7 @@ Mount.Where, config_parse_path, 0,
|
||||
Mount.Options, config_parse_string, 0, offsetof(Mount, parameters_fragment.options)
|
||||
Mount.Type, config_parse_string, 0, offsetof(Mount, parameters_fragment.fstype)
|
||||
Mount.FsckPassNo, config_parse_fsck_passno, 0, offsetof(Mount, parameters_fragment.passno)
|
||||
Mount.TimeoutSec, config_parse_usec, 0, offsetof(Mount, timeout_usec)
|
||||
Mount.TimeoutSec, config_parse_sec, 0, offsetof(Mount, timeout_usec)
|
||||
Mount.DirectoryMode, config_parse_mode, 0, offsetof(Mount, directory_mode)
|
||||
EXEC_CONTEXT_CONFIG_ITEMS(Mount)m4_dnl
|
||||
KILL_CONTEXT_CONFIG_ITEMS(Mount)m4_dnl
|
||||
@ -231,7 +231,7 @@ Automount.DirectoryMode, config_parse_mode, 0,
|
||||
m4_dnl
|
||||
Swap.What, config_parse_path, 0, offsetof(Swap, parameters_fragment.what)
|
||||
Swap.Priority, config_parse_int, 0, offsetof(Swap, parameters_fragment.priority)
|
||||
Swap.TimeoutSec, config_parse_usec, 0, offsetof(Swap, timeout_usec)
|
||||
Swap.TimeoutSec, config_parse_sec, 0, offsetof(Swap, timeout_usec)
|
||||
EXEC_CONTEXT_CONFIG_ITEMS(Swap)m4_dnl
|
||||
KILL_CONTEXT_CONFIG_ITEMS(Swap)m4_dnl
|
||||
m4_dnl
|
||||
|
@ -1186,7 +1186,7 @@ int config_parse_timer(
|
||||
|
||||
id = CLOCK_REALTIME;
|
||||
} else {
|
||||
if (parse_usec(rvalue, &u) < 0) {
|
||||
if (parse_sec(rvalue, &u) < 0) {
|
||||
log_error("[%s:%u] Failed to parse timer value, ignoring: %s", filename, line, rvalue);
|
||||
return 0;
|
||||
}
|
||||
@ -1471,7 +1471,7 @@ int config_parse_service_timeout(
|
||||
assert(rvalue);
|
||||
assert(s);
|
||||
|
||||
r = config_parse_usec(filename, line, section, lvalue, ltype, rvalue, data, userdata);
|
||||
r = config_parse_sec(filename, line, section, lvalue, ltype, rvalue, data, userdata);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
@ -2395,7 +2395,7 @@ void unit_dump_config_items(FILE *f) {
|
||||
{ config_parse_socket_listen, "SOCKET [...]" },
|
||||
{ config_parse_socket_bind, "SOCKETBIND" },
|
||||
{ config_parse_socket_bindtodevice, "NETWORKINTERFACE" },
|
||||
{ config_parse_usec, "SECONDS" },
|
||||
{ config_parse_sec, "SECONDS" },
|
||||
{ config_parse_nsec, "NANOSECONDS" },
|
||||
{ config_parse_path_strv, "PATH [...]" },
|
||||
{ config_parse_unit_requires_mounts_for, "PATH [...]" },
|
||||
|
@ -684,8 +684,8 @@ static int parse_config_file(void) {
|
||||
{ "Manager", "DefaultStandardOutput", config_parse_output, 0, &arg_default_std_output },
|
||||
{ "Manager", "DefaultStandardError", config_parse_output, 0, &arg_default_std_error },
|
||||
{ "Manager", "JoinControllers", config_parse_join_controllers, 0, &arg_join_controllers },
|
||||
{ "Manager", "RuntimeWatchdogSec", config_parse_usec, 0, &arg_runtime_watchdog },
|
||||
{ "Manager", "ShutdownWatchdogSec", config_parse_usec, 0, &arg_shutdown_watchdog },
|
||||
{ "Manager", "RuntimeWatchdogSec", config_parse_sec, 0, &arg_runtime_watchdog },
|
||||
{ "Manager", "ShutdownWatchdogSec", config_parse_sec, 0, &arg_shutdown_watchdog },
|
||||
{ "Manager", "CapabilityBoundingSet", config_parse_bounding_set, 0, &arg_capability_bounding_set_drop },
|
||||
{ "Manager", "TimerSlackNSec", config_parse_nsec, 0, &arg_timer_slack_nsec },
|
||||
{ "Manager", "DefaultLimitCPU", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_CPU]},
|
||||
|
@ -520,7 +520,7 @@ static int mount_fix_timeouts(Mount *m) {
|
||||
if (!t)
|
||||
return -ENOMEM;
|
||||
|
||||
r = parse_usec(t, &u);
|
||||
r = parse_sec(t, &u);
|
||||
free(t);
|
||||
|
||||
if (r < 0) {
|
||||
|
@ -127,7 +127,7 @@ static int parse_one_option(const char *option) {
|
||||
opt_type = CRYPT_PLAIN;
|
||||
else if (startswith(option, "timeout=")) {
|
||||
|
||||
if (parse_usec(option+8, &opt_timeout) < 0) {
|
||||
if (parse_sec(option+8, &opt_timeout) < 0) {
|
||||
log_error("timeout= parse failure, ignoring.");
|
||||
return 0;
|
||||
}
|
||||
|
@ -355,7 +355,7 @@ static int parse_argv(int argc, char *argv[]) {
|
||||
break;
|
||||
|
||||
case ARG_INTERVAL:
|
||||
r = parse_usec(optarg, &arg_interval);
|
||||
r = parse_sec(optarg, &arg_interval);
|
||||
if (r < 0 || arg_interval <= 0) {
|
||||
log_error("Failed to parse sealing key change interval: %s", optarg);
|
||||
return -EINVAL;
|
||||
|
@ -18,8 +18,8 @@ struct ConfigPerfItem;
|
||||
Journal.Storage, config_parse_storage, 0, offsetof(Server, storage)
|
||||
Journal.Compress, config_parse_bool, 0, offsetof(Server, compress)
|
||||
Journal.Seal, config_parse_bool, 0, offsetof(Server, seal)
|
||||
Journal.SyncIntervalSec, config_parse_usec, 0, offsetof(Server, sync_interval_usec)
|
||||
Journal.RateLimitInterval, config_parse_usec, 0, offsetof(Server, rate_limit_interval)
|
||||
Journal.SyncIntervalSec, config_parse_sec, 0, offsetof(Server, sync_interval_usec)
|
||||
Journal.RateLimitInterval, config_parse_sec, 0, offsetof(Server, rate_limit_interval)
|
||||
Journal.RateLimitBurst, config_parse_unsigned, 0, offsetof(Server, rate_limit_burst)
|
||||
Journal.SystemMaxUse, config_parse_bytes_off, 0, offsetof(Server, system_metrics.max_use)
|
||||
Journal.SystemMaxFileSize, config_parse_bytes_off, 0, offsetof(Server, system_metrics.max_size)
|
||||
@ -27,8 +27,8 @@ Journal.SystemKeepFree, config_parse_bytes_off, 0, offsetof(Server, system_m
|
||||
Journal.RuntimeMaxUse, config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.max_use)
|
||||
Journal.RuntimeMaxFileSize, config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.max_size)
|
||||
Journal.RuntimeKeepFree, config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.keep_free)
|
||||
Journal.MaxRetentionSec, config_parse_usec, 0, offsetof(Server, max_retention_usec)
|
||||
Journal.MaxFileSec, config_parse_usec, 0, offsetof(Server, max_file_usec)
|
||||
Journal.MaxRetentionSec, config_parse_sec, 0, offsetof(Server, max_retention_usec)
|
||||
Journal.MaxFileSec, config_parse_sec, 0, offsetof(Server, max_file_usec)
|
||||
Journal.ForwardToSyslog, config_parse_bool, 0, offsetof(Server, forward_to_syslog)
|
||||
Journal.ForwardToKMsg, config_parse_bool, 0, offsetof(Server, forward_to_kmsg)
|
||||
Journal.ForwardToConsole, config_parse_bool, 0, offsetof(Server, forward_to_console)
|
||||
|
@ -21,7 +21,7 @@ Login.KillOnlyUsers, config_parse_strv, 0, offsetof(Manag
|
||||
Login.KillExcludeUsers, config_parse_strv, 0, offsetof(Manager, kill_exclude_users)
|
||||
Login.Controllers, config_parse_strv, 0, offsetof(Manager, controllers)
|
||||
Login.ResetControllers, config_parse_strv, 0, offsetof(Manager, reset_controllers)
|
||||
Login.InhibitDelayMaxSec, config_parse_usec, 0, offsetof(Manager, inhibit_delay_max)
|
||||
Login.InhibitDelayMaxSec, config_parse_sec, 0, offsetof(Manager, inhibit_delay_max)
|
||||
Login.HandlePowerKey, config_parse_handle_action, 0, offsetof(Manager, handle_power_key)
|
||||
Login.HandleSuspendKey, config_parse_handle_action, 0, offsetof(Manager, handle_suspend_key)
|
||||
Login.HandleHibernateKey, config_parse_handle_action, 0, offsetof(Manager, handle_hibernate_key)
|
||||
@ -31,4 +31,4 @@ Login.SuspendKeyIgnoreInhibited, config_parse_bool, 0, offsetof(Manag
|
||||
Login.HibernateKeyIgnoreInhibited, config_parse_bool, 0, offsetof(Manager, hibernate_key_ignore_inhibited)
|
||||
Login.LidSwitchIgnoreInhibited, config_parse_bool, 0, offsetof(Manager, lid_switch_ignore_inhibited)
|
||||
Login.IdleAction, config_parse_handle_action, 0, offsetof(Manager, idle_action)
|
||||
Login.IdleActionSec, config_parse_usec, 0, offsetof(Manager, idle_action_usec)
|
||||
Login.IdleActionSec, config_parse_sec, 0, offsetof(Manager, idle_action_usec)
|
||||
|
@ -108,7 +108,7 @@ static int parse_argv(int argc, char *argv[]) {
|
||||
}
|
||||
|
||||
case ARG_TIMEOUT:
|
||||
if (parse_usec(optarg, &arg_timeout) < 0 || arg_timeout <= 0) {
|
||||
if (parse_sec(optarg, &arg_timeout) < 0 || arg_timeout <= 0) {
|
||||
log_error("Failed to parse timeout %s.", optarg);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
@ -792,7 +792,7 @@ int config_parse_path_strv(
|
||||
return 0;
|
||||
}
|
||||
|
||||
int config_parse_usec(
|
||||
int config_parse_sec(
|
||||
const char *filename,
|
||||
unsigned line,
|
||||
const char *section,
|
||||
@ -809,7 +809,7 @@ int config_parse_usec(
|
||||
assert(rvalue);
|
||||
assert(data);
|
||||
|
||||
if (parse_usec(rvalue, usec) < 0) {
|
||||
if (parse_sec(rvalue, usec) < 0) {
|
||||
log_error("[%s:%u] Failed to parse time value, ignoring: %s", filename, line, rvalue);
|
||||
return 0;
|
||||
}
|
||||
|
@ -101,7 +101,7 @@ int config_parse_string(const char *filename, unsigned line, const char *section
|
||||
int config_parse_path(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
|
||||
int config_parse_strv(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
|
||||
int config_parse_path_strv(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
|
||||
int config_parse_usec(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
|
||||
int config_parse_sec(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
|
||||
int config_parse_nsec(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
|
||||
int config_parse_mode(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
|
||||
int config_parse_facility(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
|
||||
|
@ -256,7 +256,7 @@ char *format_timespan(char *buf, size_t l, usec_t t) {
|
||||
return p;
|
||||
}
|
||||
|
||||
/* The result of this function can be parsed with parse_usec */
|
||||
/* The result of this function can be parsed with parse_sec */
|
||||
|
||||
for (i = 0; i < ELEMENTSOF(table); i++) {
|
||||
int k;
|
||||
@ -382,14 +382,14 @@ int parse_timestamp(const char *t, usec_t *usec) {
|
||||
|
||||
} else if (t[0] == '+') {
|
||||
|
||||
r = parse_usec(t+1, &plus);
|
||||
r = parse_sec(t+1, &plus);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
goto finish;
|
||||
} else if (t[0] == '-') {
|
||||
|
||||
r = parse_usec(t+1, &minus);
|
||||
r = parse_sec(t+1, &minus);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
@ -402,7 +402,7 @@ int parse_timestamp(const char *t, usec_t *usec) {
|
||||
if (!z)
|
||||
return -ENOMEM;
|
||||
|
||||
r = parse_usec(z, &minus);
|
||||
r = parse_sec(z, &minus);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
@ -497,7 +497,7 @@ finish:
|
||||
return 0;
|
||||
}
|
||||
|
||||
int parse_usec(const char *t, usec_t *usec) {
|
||||
int parse_sec(const char *t, usec_t *usec) {
|
||||
static const struct {
|
||||
const char *suffix;
|
||||
usec_t usec;
|
||||
|
@ -80,5 +80,5 @@ void dual_timestamp_deserialize(const char *value, dual_timestamp *t);
|
||||
|
||||
int parse_timestamp(const char *t, usec_t *usec);
|
||||
|
||||
int parse_usec(const char *t, usec_t *usec);
|
||||
int parse_sec(const char *t, usec_t *usec);
|
||||
int parse_nsec(const char *t, nsec_t *nsec);
|
||||
|
@ -1171,7 +1171,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
|
||||
a++;
|
||||
}
|
||||
|
||||
if (parse_usec(a, &i->age) < 0) {
|
||||
if (parse_sec(a, &i->age) < 0) {
|
||||
log_error("[%s:%u] Invalid age '%s'.", fname, line, age);
|
||||
return -EBADMSG;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user