*/
#include <lttng/ust-abi.h>
+#include <lttng/ust-error.h>
#include <urcu/compiler.h>
#include <urcu/list.h>
#include <lttng/ust-events.h>
static int lttng_ust_abi_close_in_progress;
static
-int lttng_abi_tracepoint_list(void);
+int lttng_abi_tracepoint_list(void *owner);
static
-int lttng_abi_tracepoint_field_list(void);
+int lttng_abi_tracepoint_field_list(void *owner);
/*
* Object descriptor table. Should be protected from concurrent access
void *private_data;
const struct lttng_ust_objd_ops *ops;
int f_count;
+ void *owner;
} s;
int freelist_next; /* offset freelist. end is -1. */
} u;
};
static
-int objd_alloc(void *private_data, const struct lttng_ust_objd_ops *ops)
+int objd_alloc(void *private_data, const struct lttng_ust_objd_ops *ops,
+ void *owner)
{
struct lttng_ust_obj *obj;
obj->u.s.ops = ops;
obj->u.s.f_count = 2; /* count == 1 : object is allocated */
/* count == 2 : allocated + hold ref */
+ obj->u.s.owner = owner;
return obj - objd_table.array;
}
objd_table.freelist_head = -1;
}
+void lttng_ust_objd_table_owner_cleanup(void *owner)
+{
+ int i;
+
+ for (i = 0; i < objd_table.allocated_len; i++) {
+ struct lttng_ust_obj *obj;
+
+ obj = _objd_get(i);
+ if (!obj)
+ continue;
+ if (!obj->u.s.owner)
+ continue; /* skip root handles */
+ if (obj->u.s.owner == owner)
+ (void) lttng_ust_objd_unref(i);
+ }
+}
+
/*
* This is LTTng's own personal way to create an ABI for sessiond.
* We send commands over a socket.
{
int root_handle;
- root_handle = objd_alloc(NULL, <tng_ops);
+ /* root handles have NULL owners */
+ root_handle = objd_alloc(NULL, <tng_ops, NULL);
return root_handle;
}
static
-int lttng_abi_create_session(void)
+int lttng_abi_create_session(void *owner)
{
struct ltt_session *session;
int session_objd, ret;
session = ltt_session_create();
if (!session)
return -ENOMEM;
- session_objd = objd_alloc(session, <tng_session_ops);
+ session_objd = objd_alloc(session, <tng_session_ops, owner);
if (session_objd < 0) {
ret = session_objd;
goto objd_error;
long lttng_abi_tracer_version(int objd,
struct lttng_ust_tracer_version *v)
{
- v->major = LTTNG_UST_MAJOR_VERSION;
- v->minor = LTTNG_UST_MINOR_VERSION;
- v->patchlevel = LTTNG_UST_PATCHLEVEL_VERSION;
+ v->major = LTTNG_UST_INTERNAL_MAJOR_VERSION;
+ v->minor = LTTNG_UST_INTERNAL_MINOR_VERSION;
+ v->patchlevel = LTTNG_UST_INTERNAL_PATCHLEVEL_VERSION;
return 0;
}
* @cmd: the command
* @arg: command arg
* @uargs: UST arguments (internal)
+ * @owner: objd owner
*
* This descriptor implements lttng commands:
* LTTNG_UST_SESSION
*/
static
long lttng_cmd(int objd, unsigned int cmd, unsigned long arg,
- union ust_args *uargs)
+ union ust_args *uargs, void *owner)
{
switch (cmd) {
case LTTNG_UST_SESSION:
- return lttng_abi_create_session();
+ return lttng_abi_create_session(owner);
case LTTNG_UST_TRACER_VERSION:
return lttng_abi_tracer_version(objd,
(struct lttng_ust_tracer_version *) arg);
case LTTNG_UST_TRACEPOINT_LIST:
- return lttng_abi_tracepoint_list();
+ return lttng_abi_tracepoint_list(owner);
case LTTNG_UST_TRACEPOINT_FIELD_LIST:
- return lttng_abi_tracepoint_field_list();
+ return lttng_abi_tracepoint_field_list(owner);
case LTTNG_UST_WAIT_QUIESCENT:
synchronize_trace();
return 0;
* We tolerate no failure path after event creation. It will stay
* invariant for the rest of the session.
*/
- ret = ltt_event_create(channel, &metadata_params, NULL, &event);
+ ret = ltt_event_create(channel, &metadata_params, &event);
if (ret < 0) {
goto create_error;
}
int lttng_abi_create_channel(int session_objd,
struct lttng_ust_channel *chan_param,
enum channel_type channel_type,
- union ust_args *uargs)
+ union ust_args *uargs,
+ void *owner)
{
struct ltt_session *session = objd_private(session_objd);
const struct lttng_ust_objd_ops *ops;
transport_name = "<unknown>";
return -EINVAL;
}
- chan_objd = objd_alloc(NULL, ops);
+ chan_objd = objd_alloc(NULL, ops, owner);
if (chan_objd < 0) {
ret = chan_objd;
goto objd_error;
* @cmd: the command
* @arg: command arg
* @uargs: UST arguments (internal)
+ * @owner: objd owner
*
* This descriptor implements lttng commands:
* LTTNG_UST_CHANNEL
*/
static
long lttng_session_cmd(int objd, unsigned int cmd, unsigned long arg,
- union ust_args *uargs)
+ union ust_args *uargs, void *owner)
{
struct ltt_session *session = objd_private(objd);
case LTTNG_UST_CHANNEL:
return lttng_abi_create_channel(objd,
(struct lttng_ust_channel *) arg,
- PER_CPU_CHANNEL, uargs);
+ PER_CPU_CHANNEL, uargs, owner);
case LTTNG_UST_SESSION_START:
case LTTNG_UST_ENABLE:
return ltt_session_enable(session);
case LTTNG_UST_METADATA:
return lttng_abi_create_channel(objd,
(struct lttng_ust_channel *) arg,
- METADATA_CHANNEL, uargs);
+ METADATA_CHANNEL, uargs, owner);
default:
return -EINVAL;
}
static
long lttng_tracepoint_list_cmd(int objd, unsigned int cmd, unsigned long arg,
- union ust_args *uargs)
+ union ust_args *uargs, void *owner)
{
struct lttng_ust_tracepoint_list *list = objd_private(objd);
struct lttng_ust_tracepoint_iter *tp =
retry:
iter = lttng_ust_tracepoint_list_get_iter_next(list);
if (!iter)
- return -ENOENT;
+ return -LTTNG_UST_ERR_NOENT;
if (!strcmp(iter->name, "lttng_ust:metadata"))
goto retry;
memcpy(tp, iter, sizeof(*tp));
}
static
-int lttng_abi_tracepoint_list(void)
+int lttng_abi_tracepoint_list(void *owner)
{
int list_objd, ret;
struct lttng_ust_tracepoint_list *list;
- list_objd = objd_alloc(NULL, <tng_tracepoint_list_ops);
+ list_objd = objd_alloc(NULL, <tng_tracepoint_list_ops, owner);
if (list_objd < 0) {
ret = list_objd;
goto objd_error;
static
long lttng_tracepoint_field_list_cmd(int objd, unsigned int cmd,
- unsigned long arg, union ust_args *uargs)
+ unsigned long arg, union ust_args *uargs, void *owner)
{
struct lttng_ust_field_list *list = objd_private(objd);
- struct lttng_ust_field_iter *tp =
- (struct lttng_ust_field_iter *) arg;
+ struct lttng_ust_field_iter *tp = &uargs->field_list.entry;
struct lttng_ust_field_iter *iter;
switch (cmd) {
retry:
iter = lttng_ust_field_list_get_iter_next(list);
if (!iter)
- return -ENOENT;
+ return -LTTNG_UST_ERR_NOENT;
if (!strcmp(iter->event_name, "lttng_ust:metadata"))
goto retry;
memcpy(tp, iter, sizeof(*tp));
}
static
-int lttng_abi_tracepoint_field_list(void)
+int lttng_abi_tracepoint_field_list(void *owner)
{
int list_objd, ret;
struct lttng_ust_field_list *list;
- list_objd = objd_alloc(NULL, <tng_tracepoint_field_list_ops);
+ list_objd = objd_alloc(NULL, <tng_tracepoint_field_list_ops, owner);
if (list_objd < 0) {
ret = list_objd;
goto objd_error;
static
int lttng_abi_open_stream(int channel_objd, struct lttng_ust_stream *info,
- union ust_args *uargs)
+ union ust_args *uargs, void *owner)
{
struct ltt_channel *channel = objd_private(channel_objd);
struct lttng_ust_lib_ring_buffer *buf;
}
priv->buf = buf;
priv->ltt_chan = channel;
- stream_objd = objd_alloc(priv, &lib_ring_buffer_objd_ops);
+ stream_objd = objd_alloc(priv, &lib_ring_buffer_objd_ops, owner);
if (stream_objd < 0) {
ret = stream_objd;
goto objd_error;
static
int lttng_abi_create_event(int channel_objd,
- struct lttng_ust_event *event_param)
+ struct lttng_ust_event *event_param,
+ void *owner)
{
struct ltt_channel *channel = objd_private(channel_objd);
struct ltt_event *event;
int event_objd, ret;
event_param->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
- event_objd = objd_alloc(NULL, <tng_event_ops);
+ event_objd = objd_alloc(NULL, <tng_event_ops, owner);
if (event_objd < 0) {
ret = event_objd;
goto objd_error;
* We tolerate no failure path after event creation. It will stay
* invariant for the rest of the session.
*/
- ret = ltt_event_create(channel, event_param, NULL, &event);
+ ret = ltt_event_create(channel, event_param, &event);
if (ret < 0) {
goto event_error;
}
static
int lttng_abi_create_wildcard(int channel_objd,
- struct lttng_ust_event *event_param)
+ struct lttng_ust_event *event_param,
+ void *owner)
{
struct ltt_channel *channel = objd_private(channel_objd);
struct session_wildcard *wildcard;
int wildcard_objd, ret;
event_param->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
- wildcard_objd = objd_alloc(NULL, <tng_wildcard_ops);
+ wildcard_objd = objd_alloc(NULL, <tng_wildcard_ops, owner);
if (wildcard_objd < 0) {
ret = wildcard_objd;
goto objd_error;
* @cmd: the command
* @arg: command arg
* @uargs: UST arguments (internal)
+ * @owner: objd owner
*
* This object descriptor implements lttng commands:
* LTTNG_UST_STREAM
*/
static
long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg,
- union ust_args *uargs)
+ union ust_args *uargs, void *owner)
{
struct ltt_channel *channel = objd_private(objd);
stream = (struct lttng_ust_stream *) arg;
/* stream used as output */
- return lttng_abi_open_stream(objd, stream, uargs);
+ return lttng_abi_open_stream(objd, stream, uargs, owner);
}
case LTTNG_UST_EVENT:
{
(struct lttng_ust_event *) arg;
if (event_param->name[strlen(event_param->name) - 1] == '*') {
/* If ends with wildcard, create wildcard. */
- return lttng_abi_create_wildcard(objd, event_param);
+ return lttng_abi_create_wildcard(objd, event_param,
+ owner);
} else {
- return lttng_abi_create_event(objd, event_param);
+ return lttng_abi_create_event(objd, event_param,
+ owner);
}
}
case LTTNG_UST_CONTEXT:
* @cmd: the command
* @arg: command arg
* @uargs: UST arguments (internal)
+ * @owner: objd owner
*
* This object descriptor implements lttng commands:
* LTTNG_UST_STREAM
*/
static
long lttng_metadata_cmd(int objd, unsigned int cmd, unsigned long arg,
- union ust_args *uargs)
+ union ust_args *uargs, void *owner)
{
struct ltt_channel *channel = objd_private(objd);
stream = (struct lttng_ust_stream *) arg;
/* stream used as output */
- return lttng_abi_open_stream(objd, stream, uargs);
+ return lttng_abi_open_stream(objd, stream, uargs, owner);
}
case LTTNG_UST_FLUSH_BUFFER:
return channel->ops->flush_buffer(channel->chan, channel->handle);
* @cmd: the command
* @arg: command arg
* @uargs: UST arguments (internal)
+ * @owner: objd owner
*
* This object descriptor implements lttng commands:
* (None for now. Access is done directly though shm.)
*/
static
long lttng_rb_cmd(int objd, unsigned int cmd, unsigned long arg,
- union ust_args *uargs)
+ union ust_args *uargs, void *owner)
{
switch (cmd) {
default:
* @cmd: the command
* @arg: command arg
* @uargs: UST arguments (internal)
+ * @owner: objd owner
*
* This object descriptor implements lttng commands:
* LTTNG_UST_CONTEXT
* Enable recording for this event (weak enable)
* LTTNG_UST_DISABLE
* Disable recording for this event (strong disable)
+ * LTTNG_UST_FILTER
+ * Attach a filter to an event.
*/
static
long lttng_event_cmd(int objd, unsigned int cmd, unsigned long arg,
- union ust_args *uargs)
+ union ust_args *uargs, void *owner)
{
struct ltt_event *event = objd_private(objd);
return ltt_event_enable(event);
case LTTNG_UST_DISABLE:
return ltt_event_disable(event);
+ case LTTNG_UST_FILTER:
+ {
+ int ret;
+ ret = lttng_filter_event_attach_bytecode(event,
+ (struct lttng_ust_filter_bytecode_node *) arg);
+ if (ret)
+ return ret;
+ lttng_filter_event_link_bytecode(event);
+ return 0;
+ }
default:
return -EINVAL;
}
* @cmd: the command
* @arg: command arg
* @uargs: UST arguments (internal)
+ * @owner: objd owner
*
* This object descriptor implements lttng commands:
* LTTNG_UST_CONTEXT
* Enable recording for these wildcard events (weak enable)
* LTTNG_UST_DISABLE
* Disable recording for these wildcard events (strong disable)
+ * LTTNG_UST_FILTER
+ * Attach a filter to a wildcard.
*/
static
long lttng_wildcard_cmd(int objd, unsigned int cmd, unsigned long arg,
- union ust_args *uargs)
+ union ust_args *uargs, void *owner)
{
struct session_wildcard *wildcard = objd_private(objd);
return ltt_wildcard_enable(wildcard);
case LTTNG_UST_DISABLE:
return ltt_wildcard_disable(wildcard);
+ case LTTNG_UST_FILTER:
+ {
+ int ret;
+
+ ret = lttng_filter_wildcard_attach_bytecode(wildcard,
+ (struct lttng_ust_filter_bytecode_node *) arg);
+ if (ret)
+ return ret;
+ lttng_filter_wildcard_link_bytecode(wildcard);
+ return 0;
+ }
default:
return -EINVAL;
}
projects / lttng-ust.git / blobdiff