diff options
| author | trz <trz> | 2006-10-10 19:24:23 +0000 |
|---|---|---|
| committer | trz <trz> | 2006-10-10 19:24:23 +0000 |
| commit | f8b4d848c0a1fa54ffcd8c7df6c375506b26c4b6 (patch) | |
| tree | 45b4c4fc8a6f7e299d1a59e278fd8eda77290844 | |
| parent | da641cd3e8aa2792ab99a0ac41b4a657a94dccfa (diff) | |
| download | systemtap-steved-f8b4d848c0a1fa54ffcd8c7df6c375506b26c4b6.tar.gz systemtap-steved-f8b4d848c0a1fa54ffcd8c7df6c375506b26c4b6.tar.xz systemtap-steved-f8b4d848c0a1fa54ffcd8c7df6c375506b26c4b6.zip | |
fix for transport test failure in nightly testsuite
| -rw-r--r-- | runtime/stpd/ChangeLog | 5 | ||||
| -rw-r--r-- | runtime/stpd/librelay.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/runtime/stpd/ChangeLog b/runtime/stpd/ChangeLog index 05cdc779..964f9018 100644 --- a/runtime/stpd/ChangeLog +++ b/runtime/stpd/ChangeLog @@ -1,3 +1,8 @@ +2006-10-10 Tom Zanussi <zanussi@us.ibm.com> + + * librelay.c (merge_output): Add check for min when writing + output, otherwise last write happens twice. + 2006-09-26 David Smith <dsmith@redhat.com> * Makefile: Changed 'stpd' references to 'staprun'. diff --git a/runtime/stpd/librelay.c b/runtime/stpd/librelay.c index f39b0785..0a5040c2 100644 --- a/runtime/stpd/librelay.c +++ b/runtime/stpd/librelay.c @@ -624,9 +624,9 @@ static int merge_output(void) } } - if (!quiet) + if (min && !quiet) fwrite_unlocked (buf[j]+TIMESTAMP_SIZE, length[j], 1, stdout); - if (!print_only) + if (min && !print_only) fwrite_unlocked (buf[j]+TIMESTAMP_SIZE, length[j], 1, ofp); if (min && ++count != min) { |