@@ -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);
@@ -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.
@@ -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);
@@ -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);
@@ -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);
@@ -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();
}
@@ -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;
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(-)