X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=5511575ec20630156c313084d1e923c42b4a0d74;hb=031e8f9c64f62c9d0fa0ac68f94606266c9a3912;hp=ff61166d735190754a6315130270b9428c42bf9d;hpb=74c0a111f8f316cdcc99946ad99cf74a359a5f6e;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index ff61166d7..5511575ec 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -2144,7 +2144,15 @@ int cmd_stop_trace(struct ltt_session *session)
 	if (ksession && ksession->active) {
 		DBG("Stop kernel tracing");
 
-		/* Flush metadata if exist */
+		ret = kernel_stop_session(ksession);
+		if (ret < 0) {
+			ret = LTTNG_ERR_KERN_STOP_FAIL;
+			goto error;
+		}
+
+		kernel_wait_quiescent(kernel_tracer_fd);
+
+		/* Flush metadata after stopping (if exists) */
 		if (ksession->metadata_stream_fd >= 0) {
 			ret = kernel_metadata_flush_buffer(ksession->metadata_stream_fd);
 			if (ret < 0) {
@@ -2152,7 +2160,7 @@ int cmd_stop_trace(struct ltt_session *session)
 			}
 		}
 
-		/* Flush all buffers before stopping */
+		/* Flush all buffers after stopping */
 		cds_list_for_each_entry(kchan, &ksession->channel_list.head, list) {
 			ret = kernel_flush_buffer(kchan);
 			if (ret < 0) {
@@ -2160,14 +2168,6 @@ int cmd_stop_trace(struct ltt_session *session)
 			}
 		}
 
-		ret = kernel_stop_session(ksession);
-		if (ret < 0) {
-			ret = LTTNG_ERR_KERN_STOP_FAIL;
-			goto error;
-		}
-
-		kernel_wait_quiescent(kernel_tracer_fd);
-
 		ksession->active = 0;
 	}