X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-vtid.c;h=5cefe9538486a38ffba957fe06b8601b907ff744;hb=5de7c318804a7b1edce8562d4891b4c74aac0677;hp=f9abadbb8f58eb1f05ee5bc22a3a49a509776b88;hpb=b2cc986adb1aa11116ace6129dc2ec7e5c9737b1;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-vtid.c b/liblttng-ust/lttng-context-vtid.c
index f9abadbb..5cefe953 100644
--- a/liblttng-ust/lttng-context-vtid.c
+++ b/liblttng-ust/lttng-context-vtid.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#define _LGPL_SOURCE
 #include <sys/types.h>
 #include <unistd.h>
 #include <lttng/ust-events.h>
@@ -42,11 +43,11 @@ static DEFINE_URCU_TLS(pid_t, cached_vtid);
  */
 void lttng_context_vtid_reset(void)
 {
-	URCU_TLS(cached_vtid) = 0;
+	CMM_STORE_SHARED(URCU_TLS(cached_vtid), 0);
 }
 
 static
-size_t vtid_get_size(size_t offset)
+size_t vtid_get_size(struct lttng_ctx_field *field, size_t offset)
 {
 	size_t size = 0;
 
@@ -55,25 +56,35 @@ size_t vtid_get_size(size_t offset)
 	return size;
 }
 
+static inline
+pid_t wrapper_getvtid(void)
+{
+	pid_t vtid;
+
+	vtid = CMM_LOAD_SHARED(URCU_TLS(cached_vtid));
+	if (caa_unlikely(!vtid)) {
+		vtid = getpid();
+		CMM_STORE_SHARED(URCU_TLS(cached_vtid), vtid);
+	}
+	return vtid;
+}
+
 static
 void vtid_record(struct lttng_ctx_field *field,
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
 		 struct lttng_channel *chan)
 {
-	if (caa_unlikely(!URCU_TLS(cached_vtid)))
-		URCU_TLS(cached_vtid) = gettid();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(URCU_TLS(cached_vtid)));
-	chan->ops->event_write(ctx, &URCU_TLS(cached_vtid),
-		sizeof(URCU_TLS(cached_vtid)));
+	pid_t vtid = wrapper_getvtid();
+
+	lib_ring_buffer_align_ctx(ctx, lttng_alignof(vtid));
+	chan->ops->event_write(ctx, &vtid, sizeof(vtid));
 }
 
 static
 void vtid_get_value(struct lttng_ctx_field *field,
-		union lttng_ctx_value *value)
+		struct lttng_ctx_value *value)
 {
-	if (caa_unlikely(!URCU_TLS(cached_vtid)))
-		URCU_TLS(cached_vtid) = gettid();
-	value->s64 = URCU_TLS(cached_vtid);
+	value->u.s64 = wrapper_getvtid();
 }
 
 int lttng_add_vtid_to_ctx(struct lttng_ctx **ctx)