X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=b25fda3e8f3f264229c1164b5a01b0a29f558535;hb=d7599880d4fc4348bc9dc824b25d0fc109f247f3;hp=606b9d9f64ee0324a301a270f35ebcd74fe4aa24;hpb=ea10597e54150d570125fe5130db88d059f6392e;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 606b9d9f6..b25fda3e8 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -3201,135 +3201,93 @@ int cmd_snapshot_record(struct ltt_session *session,
 		use_tmp_output = 1;
 	}
 
-	if (session->kernel_session) {
-		struct ltt_kernel_session *ksess = session->kernel_session;
+	if (use_tmp_output) {
+		int64_t nb_packets_per_stream;
 
-		if (use_tmp_output) {
-			int64_t nb_packets_per_stream;
+		nb_packets_per_stream = get_session_nb_packets_per_stream(session,
+				tmp_output.max_size);
+		if (nb_packets_per_stream < 0) {
+			ret = LTTNG_ERR_MAX_SIZE_INVALID;
+			goto error;
+		}
 
-			nb_packets_per_stream = get_session_nb_packets_per_stream(session,
-					tmp_output.max_size);
-			if (nb_packets_per_stream < 0) {
-				ret = LTTNG_ERR_MAX_SIZE_INVALID;
+		if (session->kernel_session) {
+			ret = record_kernel_snapshot(session->kernel_session,
+					&tmp_output, session,
+					wait, nb_packets_per_stream);
+			if (ret != LTTNG_OK) {
 				goto error;
 			}
-			ret = record_kernel_snapshot(ksess, &tmp_output, session,
+		}
+
+		if (session->ust_session) {
+			ret = record_ust_snapshot(session->ust_session,
+					&tmp_output, session,
 					wait, nb_packets_per_stream);
 			if (ret != LTTNG_OK) {
 				goto error;
 			}
-			snapshot_success = 1;
-		} else {
-			struct snapshot_output *sout;
-			struct lttng_ht_iter iter;
-
-			rcu_read_lock();
-			cds_lfht_for_each_entry(session->snapshot.output_ht->ht,
-					&iter.iter, sout, node.node) {
-				int64_t nb_packets_per_stream;
-
-				/*
-				 * Make a local copy of the output and assign the possible
-				 * temporary value given by the caller.
-				 */
-				memset(&tmp_output, 0, sizeof(tmp_output));
-				memcpy(&tmp_output, sout, sizeof(tmp_output));
-
-				if (output->max_size != (uint64_t) -1ULL) {
-					tmp_output.max_size = output->max_size;
-				}
+		}
 
-				nb_packets_per_stream = get_session_nb_packets_per_stream(session,
-						tmp_output.max_size);
-				if (nb_packets_per_stream < 0) {
-					ret = LTTNG_ERR_MAX_SIZE_INVALID;
-					goto error;
-				}
+		snapshot_success = 1;
+	} else {
+		struct snapshot_output *sout;
+		struct lttng_ht_iter iter;
 
-				/* Use temporary name. */
-				if (*output->name != '\0') {
-					strncpy(tmp_output.name, output->name,
-							sizeof(tmp_output.name));
-				}
+		rcu_read_lock();
+		cds_lfht_for_each_entry(session->snapshot.output_ht->ht,
+				&iter.iter, sout, node.node) {
+			int64_t nb_packets_per_stream;
 
-				tmp_output.nb_snapshot = session->snapshot.nb_snapshot;
+			/*
+			 * Make a local copy of the output and assign the possible
+			 * temporary value given by the caller.
+			 */
+			memset(&tmp_output, 0, sizeof(tmp_output));
+			memcpy(&tmp_output, sout, sizeof(tmp_output));
 
-				ret = record_kernel_snapshot(ksess, &tmp_output,
-						session, wait, nb_packets_per_stream);
-				if (ret != LTTNG_OK) {
-					rcu_read_unlock();
-					goto error;
-				}
-				snapshot_success = 1;
+			if (output->max_size != (uint64_t) -1ULL) {
+				tmp_output.max_size = output->max_size;
 			}
-			rcu_read_unlock();
-		}
-	}
-
-	if (session->ust_session) {
-		struct ltt_ust_session *usess = session->ust_session;
-
-		if (use_tmp_output) {
-			int64_t nb_packets_per_stream;
 
 			nb_packets_per_stream = get_session_nb_packets_per_stream(session,
 					tmp_output.max_size);
 			if (nb_packets_per_stream < 0) {
 				ret = LTTNG_ERR_MAX_SIZE_INVALID;
+				rcu_read_unlock();
 				goto error;
 			}
-			ret = record_ust_snapshot(usess, &tmp_output, session,
-					wait, nb_packets_per_stream);
-			if (ret != LTTNG_OK) {
-				goto error;
-			}
-			snapshot_success = 1;
-		} else {
-			struct snapshot_output *sout;
-			struct lttng_ht_iter iter;
 
-			rcu_read_lock();
-			cds_lfht_for_each_entry(session->snapshot.output_ht->ht,
-					&iter.iter, sout, node.node) {
-				int64_t nb_packets_per_stream;
-
-				/*
-				 * Make a local copy of the output and assign the possible
-				 * temporary value given by the caller.
-				 */
-				memset(&tmp_output, 0, sizeof(tmp_output));
-				memcpy(&tmp_output, sout, sizeof(tmp_output));
+			/* Use temporary name. */
+			if (*output->name != '\0') {
+				strncpy(tmp_output.name, output->name,
+						sizeof(tmp_output.name));
+			}
 
-				if (output->max_size != (uint64_t) -1ULL) {
-					tmp_output.max_size = output->max_size;
-				}
+			tmp_output.nb_snapshot = session->snapshot.nb_snapshot;
 
-				nb_packets_per_stream = get_session_nb_packets_per_stream(session,
-						tmp_output.max_size);
-				if (nb_packets_per_stream < 0) {
-					ret = LTTNG_ERR_MAX_SIZE_INVALID;
+			if (session->kernel_session) {
+				ret = record_kernel_snapshot(session->kernel_session,
+						&tmp_output, session,
+						wait, nb_packets_per_stream);
+				if (ret != LTTNG_OK) {
 					rcu_read_unlock();
 					goto error;
 				}
+			}
 
-				/* Use temporary name. */
-				if (*output->name != '\0') {
-					strncpy(tmp_output.name, output->name,
-							sizeof(tmp_output.name));
-				}
-
-				tmp_output.nb_snapshot = session->snapshot.nb_snapshot;
-
-				ret = record_ust_snapshot(usess, &tmp_output, session,
+			if (session->ust_session) {
+				ret = record_ust_snapshot(session->ust_session,
+						&tmp_output, session,
 						wait, nb_packets_per_stream);
 				if (ret != LTTNG_OK) {
 					rcu_read_unlock();
 					goto error;
 				}
-				snapshot_success = 1;
 			}
-			rcu_read_unlock();
+			snapshot_success = 1;
 		}
+		rcu_read_unlock();
 	}
 
 	if (snapshot_success) {