X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-abi.c;h=24769a7d6571f5fe49ea90ab4f1dcc7443b822ba;hb=ef1a13e0de71e01d19a9d1b2d4abdac5e34eb9bc;hp=c5cc42b727c107a26d1466cea45227072643aa0c;hpb=2deddc6f7fde7bc9d1f6abc77217649e22a0c78c;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index c5cc42b7..24769a7d 100644
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -37,6 +37,7 @@
  *     - Takes instrumentation source specific arguments.
  */
 
+#define _LGPL_SOURCE
 #include <lttng/ust-abi.h>
 #include <lttng/ust-error.h>
 #include <urcu/compiler.h>
@@ -44,10 +45,12 @@
 #include <lttng/ust-events.h>
 #include <lttng/ust-version.h>
 #include <lttng/tracepoint.h>
+#include <ust-fd.h>
 #include "tracepoint-internal.h"
 #include <usterr-signal-safe.h>
 #include <helper.h>
 #include "lttng-tracer.h"
+#include "string-utils.h"
 #include "../libringbuffer/shm.h"
 #include "../libringbuffer/frontend_types.h"
 
@@ -208,7 +211,7 @@ int lttng_ust_objd_unref(int id, int is_owner)
 	}
 	if ((--obj->u.s.f_count) == 1) {
 		const struct lttng_ust_objd_ops *ops = objd_ops(id);
-		
+
 		if (ops->release)
 			ops->release(id);
 		objd_free(id);
@@ -335,9 +338,10 @@ long lttng_abi_tracer_version(int objd,
 static
 long lttng_abi_add_context(int objd,
 	struct lttng_ust_context *context_param,
+	union ust_args *uargs,
 	struct lttng_ctx **ctx, struct lttng_session *session)
 {
-	return lttng_attach_context(context_param, ctx, session);
+	return lttng_attach_context(context_param, uargs, ctx, session);
 }
 
 /**
@@ -512,7 +516,6 @@ int lttng_abi_map_channel(int session_objd,
 	/* error path after channel was created */
 objd_error:
 notransport:
-	free(lttng_chan);
 alloc_error:
 	channel_destroy(chan, channel_handle, 0);
 	return ret;
@@ -527,7 +530,9 @@ invalid:
 	{
 		int close_ret;
 
+		lttng_ust_lock_fd_tracker();
 		close_ret = close(wakeup_fd);
+		lttng_ust_unlock_fd_tracker();
 		if (close_ret) {
 			PERROR("close");
 		}
@@ -572,6 +577,8 @@ long lttng_session_cmd(int objd, unsigned int cmd, unsigned long arg,
 	case LTTNG_UST_SESSION_STOP:
 	case LTTNG_UST_DISABLE:
 		return lttng_session_disable(session);
+	case LTTNG_UST_SESSION_STATEDUMP:
+		return lttng_session_statedump(session);
 	default:
 		return -EINVAL;
 	}
@@ -874,10 +881,14 @@ long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg,
 	{
 		struct lttng_ust_event *event_param =
 			(struct lttng_ust_event *) arg;
-		if (event_param->name[strlen(event_param->name) - 1] == '*') {
-			/* If ends with wildcard, create wildcard. */
+
+		if (strutils_is_star_glob_pattern(event_param->name)) {
+			/*
+			 * If the event name is a star globbing pattern,
+			 * we create the special star globbing enabler.
+			 */
 			return lttng_abi_create_enabler(objd, event_param,
-					owner, LTTNG_ENABLER_WILDCARD);
+					owner, LTTNG_ENABLER_STAR_GLOB);
 		} else {
 			return lttng_abi_create_enabler(objd, event_param,
 					owner, LTTNG_ENABLER_EVENT);
@@ -885,7 +896,7 @@ long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg,
 	}
 	case LTTNG_UST_CONTEXT:
 		return lttng_abi_add_context(objd,
-				(struct lttng_ust_context *) arg,
+				(struct lttng_ust_context *) arg, uargs,
 				&channel->ctx, channel->session);
 	case LTTNG_UST_ENABLE:
 		return lttng_channel_enable(channel);