Messages in this thread Patch in this message | | | From | Jiri Olsa <> | Subject | [PATCH 16/22] perf daemon: Add up time for daemon/session list | Date | Sat, 2 Jan 2021 23:04:35 +0100 |
| |
Display up time for both daemon and sessions.
Example:
# cat ~/.perfconfig [daemon] base=/opt/perfdata
[session-cycles] run = -m 10M -e cycles --overwrite --switch-output -a
[session-sched] run = -m 20M -e sched:* --overwrite --switch-output -a
Starting the daemon:
# perf daemon start
Get the details with up time:
# perf daemon -v [778315:daemon] base: /opt/perfdata output: /opt/perfdata/output lock: /opt/perfdata/lock up: 15 minutes [778316:cycles] perf record -m 20M -e cycles --overwrite --switch-output -a base: /opt/perfdata/session-cycles output: /opt/perfdata/session-cycles/output control: /opt/perfdata/session-cycles/control ack: /opt/perfdata/session-cycles/ack up: 10 minutes [778317:sched] perf record -m 20M -e sched:* --overwrite --switch-output -a base: /opt/perfdata/session-sched output: /opt/perfdata/session-sched/output control: /opt/perfdata/session-sched/control ack: /opt/perfdata/session-sched/ack up: 2 minutes
Signed-off-by: Jiri Olsa <jolsa@kernel.org> --- tools/perf/builtin-daemon.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
diff --git a/tools/perf/builtin-daemon.c b/tools/perf/builtin-daemon.c index e45a1acaad18..d99aee2a59da 100644 --- a/tools/perf/builtin-daemon.c +++ b/tools/perf/builtin-daemon.c @@ -24,6 +24,7 @@ #include <fcntl.h> #include <sys/inotify.h> #include <libgen.h> +#include <time.h> #include "builtin.h" #include "perf.h" #include "debug.h" @@ -52,6 +53,7 @@ struct session { int pid; struct list_head list; enum session_state state; + time_t start; }; struct daemon { @@ -64,6 +66,7 @@ struct daemon { FILE *out; char perf[PATH_MAX]; int signal_fd; + time_t start; }; static struct daemon __daemon = { @@ -255,6 +258,8 @@ static int session__run(struct session *session, struct daemon *daemon) return -1; } + session->start = time(NULL); + session->pid = fork(); if (session->pid < 0) return -1; @@ -690,6 +695,7 @@ static int cmd_session_list(struct daemon *daemon, union cmd *cmd, FILE *out) { char csv_sep = cmd->list.csv_sep; struct session *session; + time_t curr = time(NULL); if (csv_sep) { fprintf(out, "%d%c%s%c%s%c%s/%s", @@ -704,6 +710,10 @@ static int cmd_session_list(struct daemon *daemon, union cmd *cmd, FILE *out) /* lock */ csv_sep, daemon->base, "lock"); + fprintf(out, "%c%lu", + /* session up time */ + csv_sep, (curr - daemon->start) / 60); + fprintf(out, "\n"); } else { fprintf(out, "[%d:daemon] base: %s\n", getpid(), daemon->base); @@ -712,6 +722,8 @@ static int cmd_session_list(struct daemon *daemon, union cmd *cmd, FILE *out) daemon->base, SESSION_OUTPUT); fprintf(out, " lock: %s/lock\n", daemon->base); + fprintf(out, " up: %lu minutes\n", + (curr - daemon->start) / 60); } } @@ -737,6 +749,10 @@ static int cmd_session_list(struct daemon *daemon, union cmd *cmd, FILE *out) /* session ack */ csv_sep, session->base, SESSION_ACK); + fprintf(out, "%c%lu", + /* session up time */ + csv_sep, (curr - session->start) / 60); + fprintf(out, "\n"); } else { fprintf(out, "[%d:%s] perf record %s\n", @@ -751,6 +767,8 @@ static int cmd_session_list(struct daemon *daemon, union cmd *cmd, FILE *out) session->base, SESSION_CONTROL); fprintf(out, " ack: %s/%s\n", session->base, SESSION_ACK); + fprintf(out, " up: %lu minutes\n", + (curr - session->start) / 60); } } @@ -1072,6 +1090,8 @@ static int __cmd_start(struct daemon *daemon, struct option parent_options[], if (argc) usage_with_options(daemon_usage, start_options); + daemon->start = time(NULL); + if (setup_config(daemon)) { pr_err("failed: config not found\n"); return -1; -- 2.26.2
| |