X-Git-Url: https://git.lttng.org/?p=ltt-control.git;a=blobdiff_plain;f=lttctl%2Flttctl.c;h=afa55b67cc85bede5a51b44692d32a05c542d78c;hp=3011a96f34c88117f237d89b60f47ab3d4079e5e;hb=0d45cf3dcfdab3f2eaad91d1a384d83fc6219868;hpb=e4ef128f48af4e918d0eb3442f74091d850f9d2e

diff --git a/lttctl/lttctl.c b/lttctl/lttctl.c
index 3011a96..afa55b6 100644
--- 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) {