mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Ingo Molnar <mingo@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Namhyung Kim <namhyung@kernel.org>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Michael Petlan <mpetlan@redhat.com>,
	Ian Rogers <irogers@google.com>,
	Alexei Budankov <abudankov@huawei.com>
Subject: [PATCH 17/24] perf daemon: Add up time for daemon/session list
Date: Mon,  8 Feb 2021 21:09:01 +0100	[thread overview]
Message-ID: <20210208200908.1019149-18-jolsa@kernel.org> (raw)
In-Reply-To: <20210208200908.1019149-1-jolsa@kernel.org>

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 11f9fac4cf12..90ef14353804 100644
--- a/tools/perf/builtin-daemon.c
+++ b/tools/perf/builtin-daemon.c
@@ -25,6 +25,7 @@
 #include <sys/wait.h>
 #include <poll.h>
 #include <sys/stat.h>
+#include <time.h>
 #include "builtin.h"
 #include "perf.h"
 #include "debug.h"
@@ -80,6 +81,7 @@ struct daemon_session {
 	int				 pid;
 	struct list_head		 list;
 	enum daemon_session_state	 state;
+	time_t				 start;
 };
 
 struct daemon {
@@ -93,6 +95,7 @@ struct daemon {
 	FILE			*out;
 	char			 perf[PATH_MAX];
 	int			 signal_fd;
+	time_t			 start;
 };
 
 static struct daemon __daemon = {
@@ -335,6 +338,8 @@ static int daemon_session__run(struct daemon_session *session,
 		return -1;
 	}
 
+	session->start = time(NULL);
+
 	session->pid = fork();
 	if (session->pid < 0)
 		return -1;
@@ -666,6 +671,7 @@ static int cmd_session_list(struct daemon *daemon, union cmd *cmd, FILE *out)
 {
 	char csv_sep = cmd->list.csv_sep;
 	struct daemon_session *session;
+	time_t curr = time(NULL);
 
 	if (csv_sep) {
 		fprintf(out, "%d%c%s%c%s%c%s/%s",
@@ -680,6 +686,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);
@@ -688,6 +698,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);
 		}
 	}
 
@@ -713,6 +725,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",
@@ -727,6 +743,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);
 		}
 	}
 
@@ -1226,6 +1244,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.29.2


  parent reply	other threads:[~2021-02-08 21:17 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-08 20:08 [PATCHv4 00/24] perf tools: Add daemon command Jiri Olsa
2021-02-08 20:08 ` [PATCH 01/24] perf daemon: " Jiri Olsa
2021-02-08 20:08 ` [PATCH 02/24] perf daemon: Add config option Jiri Olsa
2021-02-08 20:08 ` [PATCH 03/24] perf daemon: Add base option Jiri Olsa
2021-02-08 20:08 ` [PATCH 04/24] perf daemon: Add server socket support Jiri Olsa
2021-02-08 20:08 ` [PATCH 05/24] perf daemon: Add client " Jiri Olsa
2021-02-11 12:52   ` Arnaldo Carvalho de Melo
2021-02-11 16:35     ` Jiri Olsa
2021-02-08 20:08 ` [PATCH 06/24] perf daemon: Add config file support Jiri Olsa
2021-02-11  6:01   ` Namhyung Kim
2021-02-11 16:45     ` Jiri Olsa
2021-02-11 17:10       ` Arnaldo Carvalho de Melo
2021-02-11 22:52         ` Jiri Olsa
2021-02-08 20:08 ` [PATCH 07/24] perf daemon: Add config file change check Jiri Olsa
2021-02-08 20:08 ` [PATCH 08/24] perf daemon: Add background support Jiri Olsa
2021-02-08 20:08 ` [PATCH 09/24] perf daemon: Add signalfd support Jiri Olsa
2021-02-08 20:08 ` [PATCH 10/24] perf daemon: Add list command Jiri Olsa
2021-02-08 20:08 ` [PATCH 11/24] perf daemon: Add signal command Jiri Olsa
2021-02-08 20:08 ` [PATCH 12/24] perf daemon: Add stop command Jiri Olsa
2021-02-08 20:08 ` [PATCH 13/24] perf daemon: Allow only one daemon over base directory Jiri Olsa
2021-02-11 13:20   ` Arnaldo Carvalho de Melo
2021-02-11 16:35     ` Jiri Olsa
2021-02-08 20:08 ` [PATCH 14/24] perf daemon: Set control fifo for session Jiri Olsa
2021-02-08 20:08 ` [PATCH 15/24] perf daemon: Add ping command Jiri Olsa
2021-02-10 12:51   ` Arnaldo Carvalho de Melo
2021-02-10 13:27     ` Jiri Olsa
2021-02-08 20:09 ` [PATCH 16/24] perf daemon: Use control to stop session Jiri Olsa
2021-02-08 20:09 ` Jiri Olsa [this message]
2021-02-08 20:09 ` [PATCH 18/24] perf daemon: Add examples to man page Jiri Olsa
2021-02-08 20:09 ` [PATCH 19/24] perf tests: Add daemon list command test Jiri Olsa
2021-02-08 20:09 ` [PATCH 20/24] perf tests: Add daemon reconfig test Jiri Olsa
2021-02-08 20:09 ` [PATCH 21/24] perf tests: Add daemon stop command test Jiri Olsa
2021-02-08 20:09 ` [PATCH 22/24] perf tests: Add daemon signal " Jiri Olsa
2021-02-08 20:09 ` [PATCH 23/24] perf tests: Add daemon ping " Jiri Olsa
2021-02-08 20:09 ` [PATCH 24/24] perf tests: Add daemon lock test Jiri Olsa
     [not found] <20210129134855.195810-1-jolsa@redhat.com>
2021-01-30 23:48 ` [PATCHv3 00/24] perf tools: Add daemon command Jiri Olsa
2021-01-30 23:48   ` [PATCH 17/24] perf daemon: Add up time for daemon/session list Jiri Olsa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210208200908.1019149-18-jolsa@kernel.org \
    --to=jolsa@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=abudankov@huawei.com \
    --cc=acme@kernel.org \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=irogers@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mingo@kernel.org \
    --cc=mpetlan@redhat.com \
    --cc=namhyung@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome