X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-abi.c;h=12b42ea9b0a1d335b0a937330ab24c4806d11e1d;hb=1879f67f1532fe1644a0657a5d52f063b43c0bf4;hp=6be716be6a26403b4c3a2917d1ee2097a96a3b32;hpb=df854e41ded4203a5b86bac062b8604bb038759a;p=lttng-ust.git diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c index 6be716be..12b42ea9 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 - * * LTTng UST ABI * + * Copyright (C) 2010-2012 Mathieu Desnoyers + * + * 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 @@ -29,28 +42,18 @@ #include #include #include +#include +#include "tracepoint-internal.h" #include #include #include "ltt-tracer.h" -#include "tracepoint-internal.h" - -struct ltt_tracepoint_list { - struct tracepoint_iter iter; - int got_first; -}; - -struct ltt_loglevel_list { - struct loglevel_iter *iter; - int got_first; -}; static int lttng_ust_abi_close_in_progress; static int lttng_abi_tracepoint_list(void); - static -int lttng_abi_loglevel_list(void); +int lttng_abi_tracepoint_field_list(void); /* * Object descriptor table. Should be protected from concurrent access @@ -216,9 +219,10 @@ 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_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; -static const struct lttng_ust_objd_ops lttng_loglevel_list_ops; +static const struct lttng_ust_objd_ops lttng_tracepoint_field_list_ops; enum channel_type { PER_CPU_CHANNEL, @@ -293,6 +297,7 @@ long lttng_abi_add_context(int objd, * @objd: the object descriptor * @cmd: the command * @arg: command arg + * @uargs: UST arguments (internal) * * This descriptor implements lttng commands: * LTTNG_UST_SESSION @@ -301,15 +306,16 @@ long lttng_abi_add_context(int objd, * Returns the LTTng kernel tracer version * LTTNG_UST_TRACEPOINT_LIST * Returns a file descriptor listing available tracepoints + * LTTNG_UST_TRACEPOINT_FIELD_LIST + * Returns a file descriptor listing available tracepoint fields * LTTNG_UST_WAIT_QUIESCENT * Returns after all previously running probes have completed - * LTTNG_UST_LOGLEVEL_LIST - * Returns a file descriptor listing available loglevels * * The returned session will be deleted when its file descriptor is closed. */ static -long lttng_cmd(int objd, unsigned int cmd, unsigned long arg) +long lttng_cmd(int objd, unsigned int cmd, unsigned long arg, + union ust_args *uargs) { switch (cmd) { case LTTNG_UST_SESSION: @@ -319,11 +325,11 @@ long lttng_cmd(int objd, unsigned int cmd, unsigned long arg) (struct lttng_ust_tracer_version *) arg); case LTTNG_UST_TRACEPOINT_LIST: return lttng_abi_tracepoint_list(); + case LTTNG_UST_TRACEPOINT_FIELD_LIST: + return lttng_abi_tracepoint_field_list(); case LTTNG_UST_WAIT_QUIESCENT: synchronize_trace(); return 0; - case LTTNG_UST_LOGLEVEL_LIST: - return lttng_abi_loglevel_list(); default: return -EINVAL; } @@ -345,6 +351,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; @@ -353,7 +361,7 @@ void lttng_metadata_create_events(int channel_objd) * 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; } @@ -366,7 +374,8 @@ create_error: int lttng_abi_create_channel(int session_objd, struct lttng_ust_channel *chan_param, - enum channel_type channel_type) + enum channel_type channel_type, + union ust_args *uargs) { struct ltt_session *session = objd_private(session_objd); const struct lttng_ust_objd_ops *ops; @@ -415,9 +424,9 @@ int lttng_abi_create_channel(int session_objd, chan_param->num_subbuf, chan_param->switch_timer_interval, chan_param->read_timer_interval, - &chan_param->shm_fd, - &chan_param->wait_fd, - &chan_param->memory_map_size, + &uargs->channel.shm_fd, + &uargs->channel.wait_fd, + &uargs->channel.memory_map_size, &chan_priv_init); if (!chan) { ret = -EINVAL; @@ -451,6 +460,7 @@ objd_error: * @obj: the object * @cmd: the command * @arg: command arg + * @uargs: UST arguments (internal) * * This descriptor implements lttng commands: * LTTNG_UST_CHANNEL @@ -465,7 +475,8 @@ objd_error: * The returned channel will be deleted when its file descriptor is closed. */ static -long lttng_session_cmd(int objd, unsigned int cmd, unsigned long arg) +long lttng_session_cmd(int objd, unsigned int cmd, unsigned long arg, + union ust_args *uargs) { struct ltt_session *session = objd_private(objd); @@ -473,7 +484,7 @@ long lttng_session_cmd(int objd, unsigned int cmd, unsigned long arg) case LTTNG_UST_CHANNEL: return lttng_abi_create_channel(objd, (struct lttng_ust_channel *) arg, - PER_CPU_CHANNEL); + PER_CPU_CHANNEL, uargs); case LTTNG_UST_SESSION_START: case LTTNG_UST_ENABLE: return ltt_session_enable(session); @@ -483,7 +494,7 @@ long lttng_session_cmd(int objd, unsigned int cmd, unsigned long arg) case LTTNG_UST_METADATA: return lttng_abi_create_channel(objd, (struct lttng_ust_channel *) arg, - METADATA_CHANNEL); + METADATA_CHANNEL, uargs); default: return -EINVAL; } @@ -515,47 +526,27 @@ static const struct lttng_ust_objd_ops lttng_session_ops = { .cmd = lttng_session_cmd, }; -/* - * beware: we don't keep the mutex over the send, but we must walk the - * whole list each time we are called again. So sending one tracepoint - * at a time means this is O(n^2). TODO: do as in the kernel and send - * multiple tracepoints for each call to amortize this cost. - */ -static -void ltt_tracepoint_list_get(struct ltt_tracepoint_list *list, - char *tp_list_entry) -{ -next: - if (!list->got_first) { - tracepoint_iter_start(&list->iter); - list->got_first = 1; - goto copy; - } - tracepoint_iter_next(&list->iter); -copy: - if (!list->iter.tracepoint) { - tp_list_entry[0] = '\0'; /* end of list */ - } else { - if (!strcmp((*list->iter.tracepoint)->name, - "lttng_ust:metadata")) - goto next; - memcpy(tp_list_entry, (*list->iter.tracepoint)->name, - LTTNG_UST_SYM_NAME_LEN); - } -} - static -long lttng_tracepoint_list_cmd(int objd, unsigned int cmd, unsigned long arg) +long lttng_tracepoint_list_cmd(int objd, unsigned int cmd, unsigned long arg, + union ust_args *uargs) { - struct ltt_tracepoint_list *list = objd_private(objd); - char *str = (char *) arg; + struct lttng_ust_tracepoint_list *list = objd_private(objd); + struct lttng_ust_tracepoint_iter *tp = + (struct lttng_ust_tracepoint_iter *) arg; + struct lttng_ust_tracepoint_iter *iter; switch (cmd) { case LTTNG_UST_TRACEPOINT_LIST_GET: - ltt_tracepoint_list_get(list, str); - if (str[0] == '\0') + { + retry: + iter = lttng_ust_tracepoint_list_get_iter_next(list); + if (!iter) return -ENOENT; + if (!strcmp(iter->name, "lttng_ust:metadata")) + goto retry; + memcpy(tp, iter, sizeof(*tp)); return 0; + } default: return -EINVAL; } @@ -565,7 +556,7 @@ static int lttng_abi_tracepoint_list(void) { int list_objd, ret; - struct ltt_tracepoint_list *list; + struct lttng_ust_tracepoint_list *list; list_objd = objd_alloc(NULL, <tng_tracepoint_list_ops); if (list_objd < 0) { @@ -579,8 +570,15 @@ int lttng_abi_tracepoint_list(void) } objd_set_private(list_objd, list); + /* populate list by walking on all registered probes. */ + ret = ltt_probes_get_event_list(list); + if (ret) { + goto list_error; + } return list_objd; +list_error: + free(list); alloc_error: { int err; @@ -595,10 +593,10 @@ objd_error: static int lttng_release_tracepoint_list(int objd) { - struct ltt_tracepoint_list *list = objd_private(objd); + struct lttng_ust_tracepoint_list *list = objd_private(objd); if (list) { - tracepoint_iter_stop(&list->iter); + ltt_probes_prune_event_list(list); free(list); return 0; } else { @@ -611,69 +609,38 @@ static const struct lttng_ust_objd_ops lttng_tracepoint_list_ops = { .cmd = lttng_tracepoint_list_cmd, }; -/* - * beware: we don't keep the mutex over the send, but we must walk the - * whole list each time we are called again. So sending one loglevel - * entry at a time means this is O(n^2). TODO: do as in the kernel and - * send multiple tracepoints for each call to amortize this cost. - */ static -void ltt_loglevel_list_get(struct ltt_loglevel_list *list, - const char *loglevel_provider, - const char *loglevel, - long *value) +long lttng_tracepoint_field_list_cmd(int objd, unsigned int cmd, + unsigned long arg, union ust_args *uargs) { -#if 0 -next: - if (!list->got_first) { - //tp_loglevel_iter_start(&list->iter); - list->got_first = 1; - goto copy; - } - //tp_loglevel_iter_next(&list->iter); -copy: - if (!list->iter->desc.provider) { - loglevel_provider[0] = '\0'; /* end of list */ - } else { - memcpy(loglevel_provider, list->iter->desc.provider, - LTTNG_UST_SYM_NAME_LEN); - memcpy(loglevel, list->iter.loglevel, - LTTNG_UST_SYM_NAME_LEN); - *value = list->iter.value; - } -#endif -} - -static -long lttng_loglevel_list_cmd(int objd, unsigned int cmd, unsigned long arg) -{ - struct ltt_loglevel_list *list = objd_private(objd); - struct lttng_ust_loglevel *loglevel_list_entry = - (struct lttng_ust_loglevel *) arg; + struct lttng_ust_field_list *list = objd_private(objd); + struct lttng_ust_field_iter *tp = &uargs->field_list.entry; + struct lttng_ust_field_iter *iter; switch (cmd) { - case LTTNG_UST_LOGLEVEL_LIST_GET: -/* - ltt_tracepoint_list_get(list, - loglevel_list_entry->provider, - loglevel_list_entry->loglevel, - &loglevel_list_entry->value); - if (loglevel_list_entry->provider[0] == '\0') + case LTTNG_UST_TRACEPOINT_FIELD_LIST_GET: + { + retry: + iter = lttng_ust_field_list_get_iter_next(list); + if (!iter) return -ENOENT; -*/ + if (!strcmp(iter->event_name, "lttng_ust:metadata")) + goto retry; + memcpy(tp, iter, sizeof(*tp)); return 0; + } default: return -EINVAL; } } static -int lttng_abi_loglevel_list(void) +int lttng_abi_tracepoint_field_list(void) { int list_objd, ret; - struct ltt_loglevel_list *list; + struct lttng_ust_field_list *list; - list_objd = objd_alloc(NULL, <tng_loglevel_list_ops); + list_objd = objd_alloc(NULL, <tng_tracepoint_field_list_ops); if (list_objd < 0) { ret = list_objd; goto objd_error; @@ -685,8 +652,15 @@ int lttng_abi_loglevel_list(void) } objd_set_private(list_objd, list); + /* populate list by walking on all registered probes. */ + ret = ltt_probes_get_field_list(list); + if (ret) { + goto list_error; + } return list_objd; +list_error: + free(list); alloc_error: { int err; @@ -699,12 +673,12 @@ objd_error: } static -int lttng_release_loglevel_list(int objd) +int lttng_release_tracepoint_field_list(int objd) { - struct ltt_loglevel_list *list = objd_private(objd); + struct lttng_ust_field_list *list = objd_private(objd); if (list) { - //tp_loglevel_iter_stop(&list->iter); + ltt_probes_prune_field_list(list); free(list); return 0; } else { @@ -712,9 +686,9 @@ int lttng_release_loglevel_list(int objd) } } -static const struct lttng_ust_objd_ops lttng_loglevel_list_ops = { - .release = lttng_release_loglevel_list, - .cmd = lttng_loglevel_list_cmd, +static const struct lttng_ust_objd_ops lttng_tracepoint_field_list_ops = { + .release = lttng_release_tracepoint_field_list, + .cmd = lttng_tracepoint_field_list_cmd, }; struct stream_priv_data { @@ -723,7 +697,8 @@ struct stream_priv_data { }; static -int lttng_abi_open_stream(int channel_objd, struct lttng_ust_stream *info) +int lttng_abi_open_stream(int channel_objd, struct lttng_ust_stream *info, + union ust_args *uargs) { struct ltt_channel *channel = objd_private(channel_objd); struct lttng_ust_lib_ring_buffer *buf; @@ -731,7 +706,9 @@ int lttng_abi_open_stream(int channel_objd, struct lttng_ust_stream *info) int stream_objd, ret; buf = channel->ops->buffer_read_open(channel->chan, channel->handle, - &info->shm_fd, &info->wait_fd, &info->memory_map_size); + &uargs->stream.shm_fd, + &uargs->stream.wait_fd, + &uargs->stream.memory_map_size); if (!buf) return -ENOENT; @@ -776,7 +753,7 @@ int lttng_abi_create_event(int channel_objd, * 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; } @@ -796,12 +773,51 @@ objd_error: return ret; } +static +int lttng_abi_create_wildcard(int channel_objd, + struct lttng_ust_event *event_param) +{ + 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); + if (wildcard_objd < 0) { + ret = wildcard_objd; + goto objd_error; + } + /* + * We tolerate no failure path after wildcard creation. It will + * stay invariant for the rest of the session. + */ + ret = ltt_wildcard_create(channel, event_param, &wildcard); + if (ret < 0) { + goto wildcard_error; + } + objd_set_private(wildcard_objd, wildcard); + /* The wildcard holds a reference on the channel */ + objd_ref(channel_objd); + return wildcard_objd; + +wildcard_error: + { + int err; + + err = lttng_ust_objd_unref(wildcard_objd); + assert(!err); + } +objd_error: + return ret; +} + /** * lttng_channel_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_STREAM @@ -819,7 +835,8 @@ objd_error: * Channel and event file descriptors also hold a reference on the session. */ static -long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg) +long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg, + union ust_args *uargs) { struct ltt_channel *channel = objd_private(objd); @@ -830,10 +847,19 @@ long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg) stream = (struct lttng_ust_stream *) arg; /* stream used as output */ - return lttng_abi_open_stream(objd, stream); + return lttng_abi_open_stream(objd, stream, uargs); } case LTTNG_UST_EVENT: - return lttng_abi_create_event(objd, (struct lttng_ust_event *) 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. */ + return lttng_abi_create_wildcard(objd, event_param); + } else { + return lttng_abi_create_event(objd, event_param); + } + } case LTTNG_UST_CONTEXT: return lttng_abi_add_context(objd, (struct lttng_ust_context *) arg, @@ -855,6 +881,7 @@ long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg) * @objd: the object descriptor * @cmd: the command * @arg: command arg + * @uargs: UST arguments (internal) * * This object descriptor implements lttng commands: * LTTNG_UST_STREAM @@ -863,7 +890,8 @@ long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg) * Channel and event file descriptors also hold a reference on the session. */ static -long lttng_metadata_cmd(int objd, unsigned int cmd, unsigned long arg) +long lttng_metadata_cmd(int objd, unsigned int cmd, unsigned long arg, + union ust_args *uargs) { struct ltt_channel *channel = objd_private(objd); @@ -874,7 +902,7 @@ long lttng_metadata_cmd(int objd, unsigned int cmd, unsigned long arg) stream = (struct lttng_ust_stream *) arg; /* stream used as output */ - return lttng_abi_open_stream(objd, stream); + return lttng_abi_open_stream(objd, stream, uargs); } case LTTNG_UST_FLUSH_BUFFER: return channel->ops->flush_buffer(channel->chan, channel->handle); @@ -940,12 +968,14 @@ static const struct lttng_ust_objd_ops lttng_metadata_ops = { * @objd: the object descriptor * @cmd: the command * @arg: command arg + * @uargs: UST arguments (internal) * * 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) +long lttng_rb_cmd(int objd, unsigned int cmd, unsigned long arg, + union ust_args *uargs) { switch (cmd) { default: @@ -996,6 +1026,7 @@ static const struct lttng_ust_objd_ops lib_ring_buffer_objd_ops = { * @objd: the object descriptor * @cmd: the command * @arg: command arg + * @uargs: UST arguments (internal) * * This object descriptor implements lttng commands: * LTTNG_UST_CONTEXT @@ -1004,9 +1035,12 @@ static const struct lttng_ust_objd_ops lib_ring_buffer_objd_ops = { * 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) +long lttng_event_cmd(int objd, unsigned int cmd, unsigned long arg, + union ust_args *uargs) { struct ltt_event *event = objd_private(objd); @@ -1019,6 +1053,17 @@ long lttng_event_cmd(int objd, unsigned int cmd, unsigned long arg) 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 *) arg); + if (ret) + return ret; + lttng_filter_event_link_bytecode(event, + event->filter_bytecode); + return 0; + } default: return -EINVAL; } @@ -1040,6 +1085,75 @@ static const struct lttng_ust_objd_ops lttng_event_ops = { .cmd = lttng_event_cmd, }; +/** + * lttng_wildcard_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 + * wildcard. + * LTTNG_UST_ENABLE + * 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) +{ + struct session_wildcard *wildcard = 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, + &wildcard->ctx, wildcard->chan->session); +#endif + case LTTNG_UST_ENABLE: + 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 *) arg); + if (ret) + return ret; + lttng_filter_wildcard_link_bytecode(wildcard); + return 0; + } + default: + return -EINVAL; + } +} + +static +int lttng_wildcard_release(int objd) +{ + struct session_wildcard *wildcard = objd_private(objd); + + if (wildcard) + return lttng_ust_objd_unref(wildcard->chan->objd); + return 0; +} + +/* TODO: filter control ioctl */ +static const struct lttng_ust_objd_ops lttng_wildcard_ops = { + .release = lttng_wildcard_release, + .cmd = lttng_wildcard_cmd, +}; + void lttng_ust_abi_exit(void) { lttng_ust_abi_close_in_progress = 1;