lttctl: wait for lttd to complete in overwrite mode

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/configure.in b/configure.in
index 67b4584939abe9bba3b3800dfd7a165c573b076c..0970b7e6bc5eb855e00464a6bc005afc464857e7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -23,7 +23,7 @@
 AC_PREREQ(2.57)
 AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
 #AC_WITH_LTDL  # not needed ?
-AM_INIT_AUTOMAKE(ltt-control,0.81-26032010)
+AM_INIT_AUTOMAKE(ltt-control,0.82-02042010)
 AM_CONFIG_HEADER(config.h)
 AM_PROG_LIBTOOL
 

diff --git a/lttctl/lttctl.c b/lttctl/lttctl.c
index 3011a96f34c88117f237d89b60f47ab3d4079e5e..afa55b67cc85bede5a51b44692d32a05c542d78c 100644 (file)
--- a/lttctl/lttctl.c
+++ b/lttctl/lttctl.c
@@ -696,10 +696,13 @@ setup_trace_fail:
 }
 
 /*
- * Start a lttd daemon to write trace datas
+ * Start a lttd daemon to write trace data
  * Dump overwrite channels on overwrite!=0
  * Dump normal(non-overwrite) channels on overwrite=0
  *
+ * When called for overwrite mode, wait for lttd to return, so we are sure that
+ * trace session teardown is not executed before lttd can grab the buffer data.
+ *
  * ret: 0 on success
  *      !0 on fail
  */
@@ -760,8 +763,10 @@ static int lttctl_daemon(int overwrite)
                }
 
                /* -d option */
-               argv[argc] = "-d";
-               argc++;
+               if (!overwrite) {
+                       argv[argc] = "-d";
+                       argc++;
+               }
 
                /* overwrite option */
                if (overwrite) {