diff options
| author | hunt <hunt> | 2005-06-27 23:28:48 +0000 |
|---|---|---|
| committer | hunt <hunt> | 2005-06-27 23:28:48 +0000 |
| commit | 63e9752cb5df26bc1a195feff92ad09f6d07482a (patch) | |
| tree | 1d4a2c338b50c5cba3e0cd92b2d3cfe3387d551e /runtime/stpd/stpd.c | |
| parent | 6f7d62667fe95bf7df0c40ad7f8ba7c34cc4a1f1 (diff) | |
| download | systemtap-steved-63e9752cb5df26bc1a195feff92ad09f6d07482a.tar.gz systemtap-steved-63e9752cb5df26bc1a195feff92ad09f6d07482a.tar.xz systemtap-steved-63e9752cb5df26bc1a195feff92ad09f6d07482a.zip | |
2005-06-27 Martin Hunt <hunt@redhat.com>
* stpd.c (main): Add new command line arg, "-m"
to disable the per-cpu merging.
* librelay.c (merge_output): Replacement for sort_output().
Efficiently merges per-cpu streams.
Diffstat (limited to 'runtime/stpd/stpd.c')
| -rw-r--r-- | runtime/stpd/stpd.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/runtime/stpd/stpd.c b/runtime/stpd/stpd.c index c31019d7..8fb1700e 100644 --- a/runtime/stpd/stpd.c +++ b/runtime/stpd/stpd.c @@ -31,7 +31,7 @@ extern int optind; int print_only = 0; int quiet = 0; -int transport_mode = 0; +int merge = 1; /* relayfs base file name */ static char stpd_filebase[1024]; @@ -39,6 +39,7 @@ static char stpd_filebase[1024]; static void usage(char *prog) { fprintf(stderr, "%s [-p] [-q] kmod-name\n", prog); + fprintf(stderr, "-m Don't merge per-cpu files.\n"); fprintf(stderr, "-p Print only. Don't log to files.\n"); fprintf(stderr, "-q Quiet. Don't display trace to stdout.\n"); exit(1); @@ -49,9 +50,12 @@ int main(int argc, char **argv) int c; char *modname = NULL; - while ((c = getopt(argc, argv, "pq")) != EOF) + while ((c = getopt(argc, argv, "mpq")) != EOF) { switch (c) { + case 'm': + merge = 0; + break; case 'p': print_only = 1; break; |