diff options
| author | hunt <hunt> | 2006-09-18 16:49:03 +0000 |
|---|---|---|
| committer | hunt <hunt> | 2006-09-18 16:49:03 +0000 |
| commit | 8857a715a1c9e504919e9702ee42ced4a8f5dcac (patch) | |
| tree | 2bb67c13bcaa8a9702cb83332a628d047eba9738 /runtime/stpd/stpd.c | |
| parent | ddcd4a1d43f7b3bc6edb5c431d4fd29bc72fa471 (diff) | |
| download | systemtap-steved-8857a715a1c9e504919e9702ee42ced4a8f5dcac.tar.gz systemtap-steved-8857a715a1c9e504919e9702ee42ced4a8f5dcac.tar.xz systemtap-steved-8857a715a1c9e504919e9702ee42ced4a8f5dcac.zip | |
2006-09-18 Martin Hunt <hunt@redhat.com>
* stpd.c (usage): Remove "-m" option.
(main): Print warning if "-m" is used.
* librelay.c (merge_output): Rewrite to handle
new format that support binary.
(stp_main_loop): Read merge option from the
transport info message.
Diffstat (limited to 'runtime/stpd/stpd.c')
| -rw-r--r-- | runtime/stpd/stpd.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/runtime/stpd/stpd.c b/runtime/stpd/stpd.c index 96710b08..a815d5be 100644 --- a/runtime/stpd/stpd.c +++ b/runtime/stpd/stpd.c @@ -33,7 +33,6 @@ extern int optind; int print_only = 0; int quiet = 0; -int merge = 1; int verbose = 0; int target_pid = 0; int driver_pid = 0; @@ -52,7 +51,6 @@ static void usage(char *prog) { fprintf(stderr, "\n%s [-m] [-p] [-q] [-r] [-c cmd ] [-t pid]\n" "\t[-b bufsize] [-o FILE] kmod-name [kmod-options]\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"); fprintf(stderr, "-c cmd. Command \'cmd\' will be run and stpd will exit when it does.\n"); @@ -76,7 +74,7 @@ int main(int argc, char **argv) { switch (c) { case 'm': - merge = 0; + fprintf(stderr, "Warning: -m option deprecated. Ignoring...\n"); break; case 'p': print_only = 1; |