X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Ffrontend_api.h;h=56dbef2aa4326c8a4067ecc96ada66b887358afd;hb=refs%2Fheads%2Fstable-2.5;hp=d5a2f2a043cb892a0ef020bfd7ef9b137978debb;hpb=aae88c703374f4b1fbb8a5e7e95591bf8ce3e837;p=lttng-ust.git

diff --git a/libringbuffer/frontend_api.h b/libringbuffer/frontend_api.h
index d5a2f2a0..56dbef2a 100644
--- a/libringbuffer/frontend_api.h
+++ b/libringbuffer/frontend_api.h
@@ -1,20 +1,33 @@
-#ifndef _LINUX_RING_BUFFER_FRONTEND_API_H
-#define _LINUX_RING_BUFFER_FRONTEND_API_H
+#ifndef _LTTNG_RING_BUFFER_FRONTEND_API_H
+#define _LTTNG_RING_BUFFER_FRONTEND_API_H
 
 /*
- * linux/ringbuffer/frontend_api.h
+ * libringbuffer/frontend_api.h
  *
- * (C) Copyright 2005-2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2005-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; only
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  * Ring Buffer Library Synchronization Header (buffer write API).
  *
  * Author:
- *	Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * See ring_buffer_frontend.c for more information on wait-free algorithms.
- * See linux/ringbuffer/frontend.h for channel allocation and read-side API.
- *
- * Dual LGPL v2.1/GPL v2 license.
+ * See ring_buffer_frontend.c for more information on wait-free
+ * algorithms.
+ * See frontend.h for channel allocation and read-side API.
  */
 
 #include "frontend.h"
@@ -42,12 +55,12 @@ int lib_ring_buffer_get_cpu(const struct lttng_ust_lib_ring_buffer_config *confi
 
 	rcu_read_lock();
 	cpu = lttng_ust_get_cpu();
-	nesting = ++lib_ring_buffer_nesting;	/* TLS */
+	nesting = ++URCU_TLS(lib_ring_buffer_nesting);
 	cmm_barrier();
 
 	if (caa_unlikely(nesting > 4)) {
 		WARN_ON_ONCE(1);
-		lib_ring_buffer_nesting--;	/* TLS */
+		URCU_TLS(lib_ring_buffer_nesting)--;
 		rcu_read_unlock();
 		return -EPERM;
 	} else
@@ -61,7 +74,7 @@ static inline
 void lib_ring_buffer_put_cpu(const struct lttng_ust_lib_ring_buffer_config *config)
 {
 	cmm_barrier();
-	lib_ring_buffer_nesting--;		/* TLS */
+	URCU_TLS(lib_ring_buffer_nesting)--;		/* TLS */
 	rcu_read_unlock();
 }
 
@@ -93,18 +106,8 @@ int lib_ring_buffer_try_reserve(const struct lttng_ust_lib_ring_buffer_config *c
 	 */
 	//prefetch(&buf->commit_hot[subbuf_index(*o_begin, chan)]);
 
-	/*
-	 * Because we don't use any timer in the application, we
-	 * currently cannot guarantee that we have frequent
-	 * events that let us detect 27-bit overflows.
-	 * Therefore, for now, we force event headers
-	 * to contain 64-bit timestamps.
-	 */
-	ctx->rflags |= RING_BUFFER_RFLAG_FULL_TSC;
-#if 0
 	if (last_tsc_overflow(config, buf, ctx->tsc))
 		ctx->rflags |= RING_BUFFER_RFLAG_FULL_TSC;
-#endif //0
 
 	if (caa_unlikely(subbuf_offset(*o_begin, chan) == 0))
 		return 1;
@@ -285,14 +288,13 @@ void lib_ring_buffer_commit(const struct lttng_ust_lib_ring_buffer_config *confi
 	commit_count = v_read(config, &shmp_index(handle, buf->commit_hot, endidx)->cc);
 
 	lib_ring_buffer_check_deliver(config, buf, chan, offset_end - 1,
-				      commit_count, endidx, handle);
+				      commit_count, endidx, handle, ctx->tsc);
 	/*
 	 * Update used size at each commit. It's needed only for extracting
 	 * ring_buffer buffers from vmcore, after crash.
 	 */
 	lib_ring_buffer_write_commit_counter(config, buf, chan, endidx,
-					     ctx->buf_offset, commit_count,
-					     ctx->slot_size, handle);
+			offset_end, commit_count, handle);
 }
 
 /**
@@ -361,4 +363,4 @@ void lib_ring_buffer_record_enable(const struct lttng_ust_lib_ring_buffer_config
 	uatomic_dec(&buf->record_disabled);
 }
 
-#endif /* _LINUX_RING_BUFFER_FRONTEND_API_H */
+#endif /* _LTTNG_RING_BUFFER_FRONTEND_API_H */