From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH v17 05/18] trace-cmd: Add new library API for local CPU count
Date: Tue, 3 Dec 2019 12:35:09 +0200 [thread overview]
Message-ID: <20191203103522.482684-6-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20191203103522.482684-1-tz.stoyanov@gmail.com>
In order to reuse the code, the function detecting the
number of local CPU is moved from trace-cmd application to
libtracecmd. The following new library API is introduced:
int tracecmd_count_cpus(void);
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
include/trace-cmd/trace-cmd.h | 3 +++
lib/trace-cmd/trace-util.c | 40 +++++++++++++++++++++++++++++
tracecmd/include/trace-local.h | 2 --
tracecmd/trace-agent.c | 2 +-
tracecmd/trace-profile.c | 2 +-
tracecmd/trace-record.c | 46 +++-------------------------------
tracecmd/trace-stat.c | 4 +--
7 files changed, 50 insertions(+), 49 deletions(-)
diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h
index 5287d23..5d4292e 100644
--- a/include/trace-cmd/trace-cmd.h
+++ b/include/trace-cmd/trace-cmd.h
@@ -427,6 +427,9 @@ void tracecmd_plog(const char *fmt, ...);
void tracecmd_plog_error(const char *fmt, ...);
int tracecmd_set_logfile(char *logfile);
+/* --- System --- */
+int tracecmd_count_cpus(void);
+
/* --- Hack! --- */
int tracecmd_blk_hack(struct tracecmd_input *handle);
diff --git a/lib/trace-cmd/trace-util.c b/lib/trace-cmd/trace-util.c
index 4c70d9a..e019dce 100644
--- a/lib/trace-cmd/trace-util.c
+++ b/lib/trace-cmd/trace-util.c
@@ -1112,6 +1112,46 @@ int tracecmd_stack_tracer_status(int *status)
return 1; /* full success */
}
+int tracecmd_count_cpus(void)
+{
+ FILE *fp;
+ char buf[1024];
+ int cpus = 0;
+ char *pbuf;
+ size_t *pn;
+ size_t n;
+ int r;
+
+ cpus = sysconf(_SC_NPROCESSORS_CONF);
+ if (cpus > 0)
+ return cpus;
+
+ warning("sysconf could not determine number of CPUS");
+
+ /* Do the hack to figure out # of CPUS */
+ n = 1024;
+ pn = &n;
+ pbuf = buf;
+
+ fp = fopen("/proc/cpuinfo", "r");
+ if (!fp)
+ die("Can not read cpuinfo");
+
+ while ((r = getline(&pbuf, pn, fp)) >= 0) {
+ char *p;
+
+ if (strncmp(buf, "processor", 9) != 0)
+ continue;
+ for (p = buf+9; isspace(*p); p++)
+ ;
+ if (*p == ':')
+ cpus++;
+ }
+ fclose(fp);
+
+ return cpus;
+}
+
/*
* tracecmd_write_file - Write in trace file
* @file: Full name of the trace file.
diff --git a/tracecmd/include/trace-local.h b/tracecmd/include/trace-local.h
index 3a05e9c..a51f0d0 100644
--- a/tracecmd/include/trace-local.h
+++ b/tracecmd/include/trace-local.h
@@ -243,8 +243,6 @@ void update_first_instance(struct buffer_instance *instance, int topt);
void show_instance_file(struct buffer_instance *instance, const char *name);
-int count_cpus(void);
-
/* moved from trace-cmd.h */
void tracecmd_create_top_instance(char *name);
void tracecmd_remove_instances(void);
diff --git a/tracecmd/trace-agent.c b/tracecmd/trace-agent.c
index 93e3edf..1c6e0a3 100644
--- a/tracecmd/trace-agent.c
+++ b/tracecmd/trace-agent.c
@@ -203,7 +203,7 @@ static void agent_serve(unsigned int port)
signal(SIGCHLD, handle_sigchld);
- nr_cpus = count_cpus();
+ nr_cpus = tracecmd_count_cpus();
page_size = getpagesize();
sd = make_vsock(port);
diff --git a/tracecmd/trace-profile.c b/tracecmd/trace-profile.c
index 231e381..cfae2a2 100644
--- a/tracecmd/trace-profile.c
+++ b/tracecmd/trace-profile.c
@@ -1314,7 +1314,7 @@ void trace_init_profile(struct tracecmd_input *handle, struct hook_list *hook,
* system.
*/
if (!h->cpus)
- h->cpus = count_cpus();
+ h->cpus = tracecmd_count_cpus();
list_head_init(&h->migrate_starts);
h->cpu_starts = malloc(sizeof(*h->cpu_starts) * h->cpus);
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index 13a7cda..4459c90 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -2726,46 +2726,6 @@ static void expand_event_list(void)
expand_event_instance(instance);
}
-int count_cpus(void)
-{
- FILE *fp;
- char buf[1024];
- int cpus = 0;
- char *pbuf;
- size_t *pn;
- size_t n;
- int r;
-
- cpus = sysconf(_SC_NPROCESSORS_CONF);
- if (cpus > 0)
- return cpus;
-
- warning("sysconf could not determine number of CPUS");
-
- /* Do the hack to figure out # of CPUS */
- n = 1024;
- pn = &n;
- pbuf = buf;
-
- fp = fopen("/proc/cpuinfo", "r");
- if (!fp)
- die("Can not read cpuinfo");
-
- while ((r = getline(&pbuf, pn, fp)) >= 0) {
- char *p;
-
- if (strncmp(buf, "processor", 9) != 0)
- continue;
- for (p = buf+9; isspace(*p); p++)
- ;
- if (*p == ':')
- cpus++;
- }
- fclose(fp);
-
- return cpus;
-}
-
static void finish(int sig)
{
/* all done */
@@ -4487,7 +4447,7 @@ static void reset_clock(void)
static void reset_cpu_mask(void)
{
struct buffer_instance *instance;
- int cpus = count_cpus();
+ int cpus = tracecmd_count_cpus();
int fullwords = (cpus - 1) / 32;
int bits = (cpus - 1) % 32 + 1;
int len = (fullwords + 1) * 9;
@@ -5043,7 +5003,7 @@ void init_top_instance(void)
{
if (!top_instance.ftrace)
top_instance.ftrace = tracecmd_create_instance(NULL);
- top_instance.cpu_count = count_cpus();
+ top_instance.cpu_count = tracecmd_count_cpus();
top_instance.flags = BUFFER_FL_KEEP;
tracecmd_init_instance(&top_instance);
}
@@ -5240,7 +5200,7 @@ static void init_common_record_context(struct common_record_context *ctx,
memset(ctx, 0, sizeof(*ctx));
ctx->instance = &top_instance;
ctx->curr_cmd = curr_cmd;
- local_cpu_count = count_cpus();
+ local_cpu_count = tracecmd_count_cpus();
init_top_instance();
}
diff --git a/tracecmd/trace-stat.c b/tracecmd/trace-stat.c
index 32aebc5..44ee559 100644
--- a/tracecmd/trace-stat.c
+++ b/tracecmd/trace-stat.c
@@ -737,7 +737,7 @@ static void report_cpumask(struct buffer_instance *instance)
cont = strstrip(str);
/* check to make sure all CPUs on this machine are set */
- cpus = count_cpus();
+ cpus = tracecmd_count_cpus();
for (i = strlen(cont) - 1; i >= 0 && cpus > 0; i--) {
if (cont[i] == ',')
@@ -896,7 +896,7 @@ void trace_stat (int argc, char **argv)
instance = create_instance(optarg);
if (!instance)
die("Failed to create instance");
- add_instance(instance, count_cpus());
+ add_instance(instance, tracecmd_count_cpus());
/* top instance requires direct access */
if (!topt && is_top_instance(first_instance))
first_instance = instance;
--
2.23.0
next prev parent reply other threads:[~2019-12-03 10:35 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-03 10:35 [PATCH v17 00/18]Timestamp synchronization of host - guest tracing session Tzvetomir Stoyanov (VMware)
2019-12-03 10:35 ` [PATCH v17 01/18] trace-cmd: Implement new lib API: tracecmd_local_events_system() Tzvetomir Stoyanov (VMware)
2019-12-03 10:35 ` [PATCH v17 02/18] trace-cmd: Add support for negative time offsets in trace.dat file Tzvetomir Stoyanov (VMware)
2019-12-03 10:35 ` [PATCH v17 03/18] trace-cmd: Add implementations of htonll() and ntohll() Tzvetomir Stoyanov (VMware)
2019-12-20 13:50 ` Steven Rostedt
2020-01-06 14:30 ` Tzvetomir Stoyanov
2019-12-03 10:35 ` [PATCH v17 04/18] trace-cmd: Add new library APIs for ftrace instances Tzvetomir Stoyanov (VMware)
2019-12-04 16:17 ` Steven Rostedt
2019-12-05 14:40 ` Tzvetomir Stoyanov
2019-12-03 10:35 ` Tzvetomir Stoyanov (VMware) [this message]
2019-12-04 20:09 ` [PATCH v17 05/18] trace-cmd: Add new library API for local CPU count Steven Rostedt
2019-12-03 10:35 ` [PATCH v17 06/18] trace-cmd: Add new library API for reading ftrace buffers Tzvetomir Stoyanov (VMware)
2019-12-04 21:10 ` Steven Rostedt
2019-12-03 10:35 ` [PATCH v17 07/18] trace-cmd: Find and store pids of tasks, which run virtual CPUs of given VM Tzvetomir Stoyanov (VMware)
2019-12-04 21:35 ` Steven Rostedt
2019-12-03 10:35 ` [PATCH v17 08/18] trace-cmd: Implement new API tracecmd_add_option_v() Tzvetomir Stoyanov (VMware)
2019-12-04 21:47 ` Steven Rostedt
2019-12-03 10:35 ` [PATCH v17 09/18] trace-cmd: Add new API to generate a unique ID of the tracing session Tzvetomir Stoyanov (VMware)
2019-12-03 10:35 ` [PATCH v17 10/18] trace-cmd: Store the session tracing ID in the trace.dat file Tzvetomir Stoyanov (VMware)
2019-12-03 10:35 ` [PATCH v17 11/18] trace-cmd: Exchange tracing IDs between host and guest Tzvetomir Stoyanov (VMware)
2019-12-04 22:03 ` Steven Rostedt
2019-12-03 10:35 ` [PATCH v17 12/18] trace-cmd: Implement new option in trace.dat file: TRACECMD_OPTION_TIME_SHIFT Tzvetomir Stoyanov (VMware)
2019-12-05 0:46 ` Steven Rostedt
2019-12-05 15:09 ` Tzvetomir Stoyanov
2019-12-03 10:35 ` [PATCH v17 13/18] trace-cmd: Add guest information in host's trace.dat file Tzvetomir Stoyanov (VMware)
2019-12-05 0:59 ` Steven Rostedt
2019-12-03 10:35 ` [PATCH v17 14/18] trace-cmd: Add host trace clock as guest trace argument Tzvetomir Stoyanov (VMware)
2019-12-09 19:31 ` Steven Rostedt
2019-12-10 8:49 ` Tzvetomir Stoyanov
2019-12-10 15:48 ` Steven Rostedt
2019-12-11 8:21 ` Tzvetomir Stoyanov
2019-12-11 15:01 ` Steven Rostedt
2019-12-03 10:35 ` [PATCH v17 15/18] trace-cmd: Refactor few trace-cmd internal functions Tzvetomir Stoyanov (VMware)
2019-12-09 19:32 ` Steven Rostedt
2019-12-03 10:35 ` [PATCH v17 16/18] trace-cmd: Basic infrastructure for host - guest timestamp synchronization Tzvetomir Stoyanov (VMware)
2019-12-10 17:04 ` Steven Rostedt
2019-12-10 18:39 ` Steven Rostedt
2019-12-12 12:34 ` Tzvetomir Stoyanov
2019-12-12 14:54 ` Steven Rostedt
2019-12-12 14:00 ` Tzvetomir Stoyanov
2019-12-03 10:35 ` [PATCH v17 17/18] trace-cmd: [POC] PTP-like algorithm " Tzvetomir Stoyanov (VMware)
2019-12-03 10:35 ` [PATCH v17 18/18] trace-cmd: Debug scripts for " Tzvetomir Stoyanov (VMware)
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=20191203103522.482684-6-tz.stoyanov@gmail.com \
--to=tz.stoyanov@gmail.com \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.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;
as well as URLs for NNTP newsgroup(s).