X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-events.c;h=992ba58f2a96200650924dd6d0856b513b6eb529;hb=refs%2Fheads%2Fstable-2.7;hp=4b76ea03d72c5f7d31aadf975b2667072a07e857;hpb=4598b13be45c88c336a38c44265cb844da291193;p=lttng-modules.git

diff --git a/lttng-events.c b/lttng-events.c
index 4b76ea03..992ba58f 100644
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -50,7 +50,10 @@
 #include "lttng-events.h"
 #include "lttng-tracer.h"
 #include "lttng-abi-old.h"
+#include "lttng-endian.h"
 #include "wrapper/vzalloc.h"
+#include "wrapper/ringbuffer/backend.h"
+#include "wrapper/ringbuffer/frontend.h"
 
 #define METADATA_CACHE_DEFAULT_SIZE 4096
 
@@ -236,6 +239,12 @@ int lttng_session_enable(struct lttng_session *session)
 	/* We need to sync enablers with session before activation. */
 	lttng_session_sync_enablers(session);
 
+	/* Clear each stream's quiescent state. */
+	list_for_each_entry(chan, &session->chan, list) {
+		if (chan->channel_type != METADATA_CHANNEL)
+			lib_ring_buffer_clear_quiescent_channel(chan->chan);
+	}
+
 	ACCESS_ONCE(session->active) = 1;
 	ACCESS_ONCE(session->been_active) = 1;
 	ret = _lttng_session_metadata_statedump(session);
@@ -254,6 +263,7 @@ end:
 int lttng_session_disable(struct lttng_session *session)
 {
 	int ret = 0;
+	struct lttng_channel *chan;
 
 	mutex_lock(&sessions_mutex);
 	if (!session->active) {
@@ -265,6 +275,12 @@ int lttng_session_disable(struct lttng_session *session)
 	/* Set transient enabler state to "disabled" */
 	session->tstate = 0;
 	lttng_session_sync_enablers(session);
+
+	/* Set each stream's quiescent state. */
+	list_for_each_entry(chan, &session->chan, list) {
+		if (chan->channel_type != METADATA_CHANNEL)
+			lib_ring_buffer_set_quiescent_channel(chan->chan);
+	}
 end:
 	mutex_unlock(&sessions_mutex);
 	return ret;
@@ -1043,17 +1059,22 @@ int lttng_session_list_tracker_pids(struct lttng_session *session)
 		ret = PTR_ERR(tracker_pids_list_file);
 		goto file_error;
 	}
+	if (atomic_long_add_unless(&session->file->f_count,
+		1, INT_MAX) == INT_MAX) {
+		goto refcount_error;
+	}
 	ret = lttng_tracker_pids_list_fops.open(NULL, tracker_pids_list_file);
 	if (ret < 0)
 		goto open_error;
 	m = tracker_pids_list_file->private_data;
 	m->private = session;
 	fd_install(file_fd, tracker_pids_list_file);
-	atomic_long_inc(&session->file->f_count);
 
 	return file_fd;
 
 open_error:
+	atomic_long_dec(&session->file->f_count);
+refcount_error:
 	fput(tracker_pids_list_file);
 file_error:
 	put_unused_fd(file_fd);
@@ -1631,7 +1652,7 @@ int _lttng_field_statedump(struct lttng_session *session,
 					? "UTF8"
 					: "ASCII",
 			field->type.u.basic.integer.base,
-#ifdef __BIG_ENDIAN
+#if __BYTE_ORDER == __BIG_ENDIAN
 			field->type.u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
 #else
 			field->type.u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
@@ -1660,7 +1681,7 @@ int _lttng_field_statedump(struct lttng_session *session,
 					? "UTF8"
 					: "ASCII",
 			elem_type->u.basic.integer.base,
-#ifdef __BIG_ENDIAN
+#if __BYTE_ORDER == __BIG_ENDIAN
 			elem_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
 #else
 			elem_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
@@ -1686,7 +1707,7 @@ int _lttng_field_statedump(struct lttng_session *session,
 					? "UTF8"
 					: "ASCII"),
 			length_type->u.basic.integer.base,
-#ifdef __BIG_ENDIAN
+#if __BYTE_ORDER == __BIG_ENDIAN
 			length_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
 #else
 			length_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
@@ -1706,7 +1727,7 @@ int _lttng_field_statedump(struct lttng_session *session,
 					? "UTF8"
 					: "ASCII"),
 			elem_type->u.basic.integer.base,
-#ifdef __BIG_ENDIAN
+#if __BYTE_ORDER == __BIG_ENDIAN
 			elem_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
 #else
 			elem_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
@@ -1955,11 +1976,14 @@ int _lttng_event_header_declare(struct lttng_session *session)
  * taken at start of trace.
  * Yes, this is only an approximation. Yes, we can (and will) do better
  * in future versions.
+ * Return 0 if offset is negative. It may happen if the system sets
+ * the REALTIME clock to 0 after boot.
  */
 static
 uint64_t measure_clock_offset(void)
 {
-	uint64_t offset, monotonic[2], realtime;
+	uint64_t monotonic_avg, monotonic[2], realtime;
+	int64_t offset;
 	struct timespec rts = { 0, 0 };
 	unsigned long flags;
 
@@ -1970,10 +1994,12 @@ uint64_t measure_clock_offset(void)
 	monotonic[1] = trace_clock_read64();
 	local_irq_restore(flags);
 
-	offset = (monotonic[0] + monotonic[1]) >> 1;
+	monotonic_avg = (monotonic[0] + monotonic[1]) >> 1;
 	realtime = (uint64_t) rts.tv_sec * NSEC_PER_SEC;
 	realtime += rts.tv_nsec;
-	offset = realtime - offset;
+	offset = (int64_t) realtime - monotonic_avg;
+	if (offset < 0)
+		return 0;
 	return offset;
 }
 
@@ -2031,7 +2057,7 @@ int _lttng_session_metadata_statedump(struct lttng_session *session)
 		CTF_SPEC_MAJOR,
 		CTF_SPEC_MINOR,
 		uuid_s,
-#ifdef __BIG_ENDIAN
+#if __BYTE_ORDER == __BIG_ENDIAN
 		"be"
 #else
 		"le"
@@ -2185,6 +2211,9 @@ static int __init lttng_events_init(void)
 	if (ret)
 		return ret;
 	ret = wrapper_get_pfnblock_flags_mask_init();
+	if (ret)
+		return ret;
+	ret = wrapper_get_pageblock_flags_mask_init();
 	if (ret)
 		return ret;
 	ret = lttng_context_init();