X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-abi.c;h=435763d7e4e6f5f2ffd6754c15be1439f65f41f8;hb=refs%2Fheads%2Fstable-2.0;hp=baea888586536c6555dbad8422db5d86b4a08cba;hpb=6b0e60f149100b0b83b4a813689f75b04b3acb8f;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index baea8885..435763d7 100644
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -1,10 +1,25 @@
 /*
  * lttng-ust-abi.c
  *
- * Copyright 2010-2011 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
  * LTTng UST ABI
  *
+ * Copyright (C) 2010-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
+ *
+ *
  * Mimic system calls for:
  * - session creation, returns an object descriptor or failure.
  *   - channel creation, returns an object descriptor or failure.
@@ -20,8 +35,6 @@
  *     - Takes an instrumentation source as parameter
  *       - e.g. tracepoints, dynamic_probes...
  *     - Takes instrumentation source specific arguments.
- *
- * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include <lttng/ust-abi.h>
@@ -29,10 +42,11 @@
 #include <urcu/list.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-version.h>
+#include <lttng/tracepoint.h>
+#include "tracepoint-internal.h"
 #include <usterr-signal-safe.h>
 #include <helper.h>
 #include "ltt-tracer.h"
-#include "tracepoint-internal.h"
 
 static int lttng_ust_abi_close_in_progress;
 
@@ -203,7 +217,6 @@ static const struct lttng_ust_objd_ops lttng_session_ops;
 static const struct lttng_ust_objd_ops lttng_channel_ops;
 static const struct lttng_ust_objd_ops lttng_metadata_ops;
 static const struct lttng_ust_objd_ops lttng_event_ops;
-static const struct lttng_ust_objd_ops lttng_loglevel_ops;
 static const struct lttng_ust_objd_ops lttng_wildcard_ops;
 static const struct lttng_ust_objd_ops lib_ring_buffer_objd_ops;
 static const struct lttng_ust_objd_ops lttng_tracepoint_list_ops;
@@ -331,6 +344,8 @@ void lttng_metadata_create_events(int channel_objd)
 	static struct lttng_ust_event metadata_params = {
 		.instrumentation = LTTNG_UST_TRACEPOINT,
 		.name = "lttng_ust:metadata",
+		.loglevel_type = LTTNG_UST_LOGLEVEL_ALL,
+		.loglevel = TRACE_DEFAULT,
 	};
 	struct ltt_event *event;
 	int ret;
@@ -968,62 +983,6 @@ static const struct lttng_ust_objd_ops lttng_event_ops = {
 	.cmd = lttng_event_cmd,
 };
 
-/**
- *	lttng_loglevel_cmd - lttng control through object descriptors
- *
- *	@objd: the object descriptor
- *	@cmd: the command
- *	@arg: command arg
- *	@uargs: UST arguments (internal)
- *
- *	This object descriptor implements lttng commands:
- *	LTTNG_UST_CONTEXT
- *		Prepend a context field to each record of events of this
- *		loglevel.
- *	LTTNG_UST_ENABLE
- *		Enable recording for these loglevel events (weak enable)
- *	LTTNG_UST_DISABLE
- *		Disable recording for these loglevel events (strong disable)
- */
-static
-long lttng_loglevel_cmd(int objd, unsigned int cmd, unsigned long arg,
-	union ust_args *uargs)
-{
-	struct session_loglevel *loglevel = objd_private(objd);
-
-	switch (cmd) {
-	case LTTNG_UST_CONTEXT:
-		return -ENOSYS;	/* not implemented yet */
-#if 0
-		return lttng_abi_add_context(objd,
-				(struct lttng_ust_context *) arg,
-				&loglevel->ctx, loglevel->chan->session);
-#endif
-	case LTTNG_UST_ENABLE:
-		return ltt_loglevel_enable(loglevel);
-	case LTTNG_UST_DISABLE:
-		return ltt_loglevel_disable(loglevel);
-	default:
-		return -EINVAL;
-	}
-}
-
-static
-int lttng_loglevel_release(int objd)
-{
-	struct session_loglevel *loglevel = objd_private(objd);
-
-	if (loglevel)
-		return lttng_ust_objd_unref(loglevel->chan->objd);
-	return 0;
-}
-
-/* TODO: filter control ioctl */
-static const struct lttng_ust_objd_ops lttng_loglevel_ops = {
-	.release = lttng_loglevel_release,
-	.cmd = lttng_loglevel_cmd,
-};
-
 /**
  *	lttng_wildcard_cmd - lttng control through object descriptors
  *