Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1497338 > unrolled thread

[PATCH 0/3] trace-cmd record: add --cpu-list option

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/3] trace-cmd record: add --cpu-list option Luiz Capitulino <lcapitulino@redhat.com> - 2016-10-07 18:50 +0200
    [PATCH 3/3] trace-cmd record: add --cpu-list option Luiz Capitulino <lcapitulino@redhat.com> - 2016-10-07 18:50 +0200
    [PATCH 2/3] trace-cmd record: refactor set_mask() Luiz Capitulino <lcapitulino@redhat.com> - 2016-10-07 18:50 +0200

#1497338 — [PATCH 0/3] trace-cmd record: add --cpu-list option

This series adds support for a --cpu-list option, which is
much more human friendly than -M:

  # trace-cmd record --cpu-list 1,4,10-15 [...]

The first two patches are refactorings needed to make
--cpu-list support fit nicely. The third patch adds the
new option.

Luiz Capitulino (3):
  cpu.h: use standard types instead of glib's
  trace-cmd record: refactor set_mask()
  trace-cmd record: add --cpu-list option

 Documentation/trace-cmd-record.1.txt |   4 +
 cpu.h                                |  47 +++++----
 trace-local.h                        |   2 +-
 trace-record.c                       | 191 +++++++++++++++++++++++++++++++----
 4 files changed, 201 insertions(+), 43 deletions(-)

-- 
2.5.5

[toc] | [next] | [standalone]

#1497347 — [PATCH 3/3] trace-cmd record: add --cpu-list option

With --cpu-list you can do:

  # trace-cmd record --cpu-list 1,4,10-15 [...]

Which is much more human friendly than -M.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 Documentation/trace-cmd-record.1.txt |   4 +
 trace-record.c                       | 138 +++++++++++++++++++++++++++++++++++
 2 files changed, 142 insertions(+)

diff --git a/Documentation/trace-cmd-record.1.txt b/Documentation/trace-cmd-record.1.txt
index b80520e..d7e806a 100644
--- a/Documentation/trace-cmd-record.1.txt
+++ b/Documentation/trace-cmd-record.1.txt
@@ -304,6 +304,10 @@ OPTIONS
     executed will not be changed. This is useful if you want to monitor the
     output of the command being executed, but not see the output from trace-cmd.
 
+*--cpu-list list*::
+    List of CPUs to be traced. The "list" argument can be comma separated
+    (eg. 1,2,4,5), a range (eg. 1-10) or a mix of the two (eg. 1,2,10-15).
+
 EXAMPLES
 --------
 
diff --git a/trace-record.c b/trace-record.c
index b042993..4452979 100644
--- a/trace-record.c
+++ b/trace-record.c
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <getopt.h>
+#include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
@@ -47,6 +48,7 @@
 
 #include "trace-local.h"
 #include "trace-msg.h"
+#include "cpu.h"
 
 #define _STR(x) #x
 #define STR(x) _STR(x)
@@ -179,6 +181,118 @@ static struct tracecmd_recorder *recorder;
 
 static int ignore_event_not_found = 0;
 
+static int read_cpu_nr(const char *str, int *ret)
+{
+	char *endptr;
+	int val;
+
+	errno = 0;
+	val = strtol(str, &endptr, 10);
+
+	if ((errno == ERANGE && (val == LONG_MAX || val == LONG_MIN))
+			|| (errno != 0 && val == 0))
+				return -1;
+
+	if (endptr == str)
+		return -1;
+
+	if (*endptr != '\0')
+		return -1;
+
+	*ret = val;
+	return 0;
+}
+
+static int set_single_cpu(const char *str, uint64_t *ret_mask)
+{
+	int cpu, err;
+
+	err = read_cpu_nr(str, &cpu);
+	if (err || cpu < 0)
+		return -1;
+
+	cpu_set(ret_mask, cpu);
+	return 0;
+}
+
+static int parse_one(char *str, char **saveptr)
+{
+	int err, cpu;
+	char *p;
+
+	p = strtok_r(str, "-", saveptr);
+	if (!p)
+		return -1;
+
+	err = read_cpu_nr(p, &cpu);
+	if (err)
+		return -1;
+
+	return cpu;
+}
+
+static int set_range_cpu(const char *str, uint64_t *ret_mask)
+{
+	int i, begin, end, err = -1;
+	char *saveptr, *range;
+
+	range = strdup(str);
+	if (!range)
+		return -1;
+
+	begin = parse_one(range, &saveptr);
+	if (begin < 0)
+		goto out;
+
+	end = parse_one(NULL, &saveptr);
+	if (begin < 0)
+		goto out;
+
+	if (begin > end)
+		goto out;
+
+	for (i = begin; i <= end; i++)
+		cpu_set(ret_mask, i);
+
+	err = 0;
+
+out:
+	free(range);
+	return err;
+}
+
+static int has_range(const char *str)
+{
+	return strchr(str, '-') != NULL;
+}
+
+static int parse_cpumask_str(const char *cpumask_str, uint64_t *ret_mask)
+{
+	char *saveptr, *str, *p;
+	int err = 0;
+
+	str = strdup(cpumask_str);
+	if (!str)
+		return -1;
+
+	*ret_mask = 0;
+
+	p = strtok_r(str, ",", &saveptr);
+	while (p) {
+		if (has_range(p))
+			err = set_range_cpu(p, ret_mask);
+		else
+			err = set_single_cpu(p, ret_mask);
+		if (err)
+			goto out;
+		p = strtok_r(NULL, ",", &saveptr);
+	}
+
+out:
+	free(str);
+	return err;
+}
+
 static inline int is_top_instance(struct buffer_instance *instance)
 {
 	return instance == &top_instance;
@@ -2114,6 +2228,25 @@ static char *alloc_mask_from_hex(const char *str)
 	return cpumask;
 }
 
+static char *alloc_mask_from_list(const char *cpu_list)
+{
+	char *cpumask_str;
+	uint64_t cpumask;
+	int ret;
+
+	ret = parse_cpumask_str(cpu_list, &cpumask);
+	if (ret < 0)
+		die("can't parse cpumask");
+
+	cpumask_str = malloc(MASK_STR_MAX);
+	if (!cpumask_str)
+		die("can't allocate cpumask");
+
+	snprintf(cpumask_str, MASK_STR_MAX-1, "%lx", cpumask);
+	return cpumask_str;
+}
+
+
 static void set_mask(struct buffer_instance *instance)
 {
 	struct stat st;
@@ -4136,6 +4269,7 @@ enum {
 	OPT_nosplice		= 253,
 	OPT_funcstack		= 254,
 	OPT_date		= 255,
+	OPT_cpulist			= 256,
 };
 
 void trace_record (int argc, char **argv)
@@ -4337,6 +4471,7 @@ void trace_record (int argc, char **argv)
 			{"stderr", no_argument, NULL, OPT_stderr},
 			{"by-comm", no_argument, NULL, OPT_bycomm},
 			{"ts-offset", required_argument, NULL, OPT_tsoffset},
+			{"cpu-list", required_argument, NULL, OPT_cpulist},
 			{"max-graph-depth", required_argument, NULL, OPT_max_graph_depth},
 			{"debug", no_argument, NULL, OPT_debug},
 			{"help", no_argument, NULL, '?'},
@@ -4545,6 +4680,9 @@ void trace_record (int argc, char **argv)
 		case 'M':
 			instance->cpumask = alloc_mask_from_hex(optarg);
 			break;
+		case OPT_cpulist:
+			instance->cpumask = alloc_mask_from_list(optarg);
+			break;
 		case 't':
 			if (extract)
 				topt = 1; /* Extract top instance also */
-- 
2.5.5

[toc] | [prev] | [next] | [standalone]

#1497348 — [PATCH 2/3] trace-cmd record: refactor set_mask()

This commit does the following:

 1. Move the code that treats "-M -1" out of set_mask()
 2. Drop uneeded checks from set_mask()
 3. Make instance->cpumask point to dynamic memory

This is a preparation for supporting the "--cpu-list"
option in the next commit.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 trace-local.h  |  2 +-
 trace-record.c | 53 +++++++++++++++++++++++++++++++++--------------------
 2 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/trace-local.h b/trace-local.h
index 62363d0..0ac39bf 100644
--- a/trace-local.h
+++ b/trace-local.h
@@ -143,7 +143,7 @@ struct func_list {
 struct buffer_instance {
 	struct buffer_instance	*next;
 	const char		*name;
-	const char		*cpumask;
+	char			*cpumask;
 	struct event_list	*events;
 	struct event_list	**event_next;
 
diff --git a/trace-record.c b/trace-record.c
index 22b6835..b042993 100644
--- a/trace-record.c
+++ b/trace-record.c
@@ -2078,27 +2078,25 @@ static void update_pid_event_filters(struct buffer_instance *instance)
 	update_event_filters(instance);
 }
 
-static void set_mask(struct buffer_instance *instance)
-{
-	const char *mask = instance->cpumask;
-	struct stat st;
-	char cpumask[4096]; /* Don't expect more than 32768 CPUS */
-	char *path;
-	int fd;
-	int ret;
+#define MASK_STR_MAX 4096 /* Don't expect more than 32768 CPUS */
 
-	if (!mask)
-		return;
+static char *alloc_mask_from_hex(const char *str)
+{
+	char *cpumask;
 
-	if (strcmp(mask, "-1") == 0) {
+	if (strcmp(str, "-1") == 0) {
 		/* set all CPUs */
 		int bytes = (cpu_count + 7) / 8;
 		int last = cpu_count % 8;
 		int i;
 
-		if (bytes > 4095) {
+		cpumask = malloc(MASK_STR_MAX);
+		if (!cpumask)
+			die("can't allocate cpumask");
+
+		if (bytes > (MASK_STR_MAX-1)) {
 			warning("cpumask can't handle more than 32768 CPUS!");
-			bytes = 4095;
+			bytes = MASK_STR_MAX-1;
 		}
 
 		sprintf(cpumask, "%x", (1 << last) - 1);
@@ -2107,18 +2105,32 @@ static void set_mask(struct buffer_instance *instance)
 			cpumask[i] = 'f';
 
 		cpumask[i+1] = 0;
-
-		mask = cpumask;
+	} else {
+		cpumask = strdup(str);
+		if (!cpumask)
+			die("can't allocate cpumask");
 	}
 
+	return cpumask;
+}
+
+static void set_mask(struct buffer_instance *instance)
+{
+	struct stat st;
+	char *path;
+	int fd;
+	int ret;
+
+	if (!instance->cpumask)
+		return;
+
 	path = get_instance_file(instance, "tracing_cpumask");
 	if (!path)
 		die("could not allocate path");
 
 	ret = stat(path, &st);
 	if (ret < 0) {
-		if (mask)
-			warning("%s not found", path);
+		warning("%s not found", path);
 		goto out;
 	}
 
@@ -2126,12 +2138,13 @@ static void set_mask(struct buffer_instance *instance)
 	if (fd < 0)
 		die("could not open %s\n", path);
 
-	if (mask)
-		write(fd, mask, strlen(mask));
+	write(fd, instance->cpumask, strlen(instance->cpumask));
 	
 	close(fd);
  out:
 	tracecmd_put_tracing_file(path);
+	free(instance->cpumask);
+	instance->cpumask = NULL;
 }
 
 static void enable_events(struct buffer_instance *instance)
@@ -4530,7 +4543,7 @@ void trace_record (int argc, char **argv)
 			max_kb = atoi(optarg);
 			break;
 		case 'M':
-			instance->cpumask = optarg;
+			instance->cpumask = alloc_mask_from_hex(optarg);
 			break;
 		case 't':
 			if (extract)
-- 
2.5.5

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web