|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v3 2/2] xentrace: Implement cpu mask range parsing of human values (-c).
Instead of just using -c 0x<some hex value> we can
also use -c <starting cpu>-<end cpu> or -c <cpu1>,<cpu2>
or a combination of them.
That should make it easier to trace the right CPU if
using this along with 'xl vcpu-list'.
The code has been lifted from the Linux kernel, see file
lib/bitmap.c, function __bitmap_parselist.
To make the old behavior and the new function work, we check
to see if the arguments have '0x' in them. If they do
we use the old style parsing (limited to 32 CPUs). If that
does not exist we use the new parsing.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
---
tools/xentrace/xentrace.8 | 22 ++++++-
tools/xentrace/xentrace.c | 144 +++++++++++++++++++++++++++++++++++++++++----
2 files changed, 149 insertions(+), 17 deletions(-)
diff --git a/tools/xentrace/xentrace.8 b/tools/xentrace/xentrace.8
index c176a96..7604597 100644
--- a/tools/xentrace/xentrace.8
+++ b/tools/xentrace/xentrace.8
@@ -36,10 +36,24 @@ all new records to the output
set the time, p, (in milliseconds) to sleep between polling the buffers
for new data.
.TP
-.B -c, --cpu-mask=c
-set bitmask of CPUs to trace. It is limited to 32-bits.
-If not specified, the cpu-mask of all of the available CPUs will be
-constructed.
+.B -c, --cpu-mask=[\fIc\fP|\fICPU-LIST\fP]
+This can either be a hex value (of the form 0xNNNN...), or a set of cpu
+ranges as described below. Hex values are limited to 32 bits. If not
+specified, the cpu-mask of all of the available CPUs will be
+constructed. If using the \fICPU-LIST\fP it expects decimal numbers, which
+may be specified as follows:
+
+.RS 4
+.ie n .IP """0-3""" 4
+.el .IP "``0-3''" 4
+.IX Item "0-3"
+Trace only on CPUs 0 through 3
+.ie n .IP """0,2,5-7""" 4
+.el .IP "``0,2,5-7''" 4
+.IX Item "0,2,5-7"
+Trace only on CPUs 0, 2, and 5 through 7.
+.RE
+.Sp
.TP
.B -e, --evt-mask=e
diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c
index ee1d021..ba58693 100644
--- a/tools/xentrace/xentrace.c
+++ b/tools/xentrace/xentrace.c
@@ -23,6 +23,7 @@
#include <string.h>
#include <getopt.h>
#include <assert.h>
+#include <ctype.h>
#include <sys/poll.h>
#include <sys/statvfs.h>
@@ -30,6 +31,7 @@
#include <xen/trace.h>
#include <xenctrl.h>
+#include "xc_bitops.h" /* for set_bit */
#define PERROR(_m, _a...) \
do { \
@@ -53,6 +55,7 @@ typedef struct settings_st {
unsigned long poll_sleep; /* milliseconds to sleep between polls */
uint32_t evt_mask;
xc_cpumap_t cpu_mask;
+ char *cpu_mask_str;
unsigned long tbuf_size;
unsigned long disk_rsvd;
unsigned long timeout;
@@ -817,7 +820,7 @@ static void usage(void)
"Usage: xentrace [OPTION...] [output file]\n" \
"Tool to capture Xen trace buffer data\n" \
"\n" \
-" -c, --cpu-mask=c Set cpu-mask\n" \
+" -c, --cpu-mask=c Set cpu-mask, using either hex or CPU ranges\n" \
" -e, --evt-mask=e Set evt-mask\n" \
" -s, --poll-sleep=p Set sleep time, p, in milliseconds between\n" \
" polling the trace buffer for new data\n" \
@@ -966,6 +969,129 @@ static int parse_cpumask(const char *arg)
return 0;
}
+#define ZERO_DIGIT '0'
+
+static int parse_cpumask_range(const char *arg)
+{
+ xc_cpumap_t map;
+ unsigned int a, b, buflen = strlen(arg);
+ int c, c_old, totaldigits, nmaskbits;
+ int in_range;
+ const char *s;
+
+ if ( !buflen )
+ {
+ fprintf(stderr, "Invalid option argument: %s\n", arg);
+ return EINVAL;
+ }
+ nmaskbits = xc_get_max_cpus(xc_handle);
+ if ( nmaskbits <= 0 )
+ {
+ fprintf(stderr, "Failed to get max number of CPUs! rc: %d\n",
nmaskbits);
+ return -ENOSPC;
+ }
+ map = xc_cpumap_alloc(xc_handle);
+ if ( !map )
+ {
+ fprintf(stderr, "Out of memory!\n");
+ return -ENOMEM;
+ }
+ c = c_old = totaldigits = 0;
+ s = arg;
+ do {
+ in_range = 0;
+ a = b = 0;
+ while ( buflen )
+ {
+ c_old = c;
+ c = *s++;
+ buflen--;
+
+ if ( isspace(c) )
+ continue;
+
+ if ( totaldigits && c && isspace(c_old) )
+ {
+ fprintf(stderr, "No embedded whitespaces allowed in: %s\n",
arg);
+ goto err_out;
+ }
+
+ /* A '\0' or a ',' signal the end of a cpu# or range */
+ if ( c == '\0' || c == ',' )
+ break;
+
+ if ( c == '-' )
+ {
+ if ( in_range )
+ goto err_out;
+ b = 0;
+ in_range = 1;
+ continue;
+ }
+ if ( !isdigit(c) )
+ {
+ fprintf(stderr, "Only digits allowed in: %s\n", arg);
+ goto err_out;
+ }
+ b = b * 10 + (c - ZERO_DIGIT);
+ if ( !in_range )
+ a = b;
+ totaldigits++;
+ }
+ if ( !(a <= b) )
+ {
+ fprintf(stderr, "Wrong order of %d and %d\n", a, b);
+ goto err_out;
+ }
+ if ( b >= nmaskbits )
+ {
+ fprintf(stderr, "Specified higher value then there are CPUS!\n");
+ goto err_out;
+ }
+ while ( a <= b )
+ {
+ set_bit(a, (unsigned long *) map);
+ a++;
+ }
+ } while ( buflen && c == ',' );
+
+ opts.cpu_mask = map;
+ return 0;
+ err_out:
+ free(map);
+ return -EINVAL;
+}
+
+/**
+ * Figure out which of the CPU types the user has provided - either the hex
+ * variant or the cpu-list. Once done set the CPU mask.
+ */
+static int figure_cpu_mask(void)
+{
+ int ret = 0;
+ int buflen;
+
+ if ( opts.cpu_mask_str )
+ {
+ buflen = strlen(opts.cpu_mask_str);
+ if ( buflen < 2 )
+ goto out;
+
+ if ( strncmp("0x", opts.cpu_mask_str, 2) == 0 )
+ ret = parse_cpumask(opts.cpu_mask_str);
+ else
+ ret = parse_cpumask_range(opts.cpu_mask_str);
+ }
+ if ( !ret )
+ set_cpu_mask(opts.cpu_mask);
+ out:
+ /* We don't use it pass this point. */
+ free(opts.cpu_mask_str);
+ if ( ret )
+ usage(); /* Does not return. */
+ return ret;
+}
+
/* parse command line arguments */
static void parse_args(int argc, char **argv)
{
@@ -996,15 +1122,9 @@ static void parse_args(int argc, char **argv)
opts.poll_sleep = argtol(optarg, 0);
break;
- case 'c': /* set new cpu mask for filtering*/
- /* Set opts.cpu_mask later as we don't have 'xch' set yet. */
- if ( parse_cpumask(optarg) )
- {
- perror("Not enough memory!");
- exit(EXIT_FAILURE);
- }
+ case 'c': /* set new cpu mask for filtering (when xch is set). */
+ opts.cpu_mask_str = strdup(optarg);
break;
-
case 'e': /* set new event mask for filtering*/
parse_evtmask(optarg);
break;
@@ -1068,6 +1188,7 @@ int main(int argc, char **argv)
opts.poll_sleep = POLL_SLEEP_MILLIS;
opts.evt_mask = 0;
opts.cpu_mask = NULL;
+ opts.cpu_mask_str = NULL;
opts.disk_rsvd = 0;
opts.disable_tracing = 1;
opts.start_disabled = 0;
@@ -1085,10 +1206,7 @@ int main(int argc, char **argv)
if ( opts.evt_mask != 0 )
set_evt_mask(opts.evt_mask);
-
- set_cpu_mask(opts.cpu_mask);
- /* We don't use it pass this point. */
- free(opts.cpu_mask);
+ figure_cpu_mask();
if ( opts.timeout != 0 )
alarm(opts.timeout);
--
1.7.7.6
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |