summaryrefslogtreecommitdiffstats
path: root/runtime/stpd/librelay.c
diff options
context:
space:
mode:
authortrz <trz>2006-06-23 15:02:21 +0000
committertrz <trz>2006-06-23 15:02:21 +0000
commit62d546e25d22402904e9922b3a02e50c975a66f8 (patch)
tree8f0a265314ce6c7ab62cf8320eb2978cc05927c0 /runtime/stpd/librelay.c
parentde24f2f2501350745c69c1807f0fbdf838004aa9 (diff)
downloadsystemtap-steved-62d546e25d22402904e9922b3a02e50c975a66f8.tar.gz
systemtap-steved-62d546e25d22402904e9922b3a02e50c975a66f8.tar.xz
systemtap-steved-62d546e25d22402904e9922b3a02e50c975a66f8.zip
Part of fix for bug #2532
Diffstat (limited to 'runtime/stpd/librelay.c')
-rw-r--r--runtime/stpd/librelay.c8
1 files changed, 5 insertions, 3 deletions
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");