diff options
| author | trz <trz> | 2006-06-23 15:02:21 +0000 |
|---|---|---|
| committer | trz <trz> | 2006-06-23 15:02:21 +0000 |
| commit | 62d546e25d22402904e9922b3a02e50c975a66f8 (patch) | |
| tree | 8f0a265314ce6c7ab62cf8320eb2978cc05927c0 | |
| parent | de24f2f2501350745c69c1807f0fbdf838004aa9 (diff) | |
| download | systemtap-steved-62d546e25d22402904e9922b3a02e50c975a66f8.tar.gz systemtap-steved-62d546e25d22402904e9922b3a02e50c975a66f8.tar.xz systemtap-steved-62d546e25d22402904e9922b3a02e50c975a66f8.zip | |
Part of fix for bug #2532
| -rw-r--r-- | runtime/stpd/ChangeLog | 5 | ||||
| -rw-r--r-- | runtime/stpd/librelay.c | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/runtime/stpd/ChangeLog b/runtime/stpd/ChangeLog index a9405d93..b0e405de 100644 --- a/runtime/stpd/ChangeLog +++ b/runtime/stpd/ChangeLog @@ -1,3 +1,8 @@ +2006-06-23 Tom Zanussi <zanussi@us.ibm.com> + + * librelay.c (cleanup_and_exit): Close relay files even if + not merging. + 2006-06-13 Martin Hunt <hunt@redhat.com> * librelay.c (start_cmd): Rewrite using sigwait() to eliminate diff --git a/runtime/stpd/librelay.c b/runtime/stpd/librelay.c index ae03c200..c3ad77ea 100644 --- a/runtime/stpd/librelay.c +++ b/runtime/stpd/librelay.c @@ -657,10 +657,12 @@ static void cleanup_and_exit (int closed) if (print_totals && verbose) summarize(); - if (transport_mode == STP_TRANSPORT_RELAYFS && merge) { + if (transport_mode == STP_TRANSPORT_RELAYFS) { close_all_relayfs_files(); - merge_output(); - delete_percpu_files(); + if (merge) { + merge_output(); + delete_percpu_files(); + } } dbug("closing control channel\n"); |