#include <linux/mutex.h>
#include <linux/sched.h>
#include <linux/slab.h>
-#include <linux/vmalloc.h> /* For vmalloc_sync_all */
+#include "wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */
#include "ltt-events.h"
static LIST_HEAD(sessions);
struct ltt_session *session;
mutex_lock(&sessions_mutex);
- session = kmalloc(sizeof(struct ltt_session), GFP_KERNEL);
+ session = kzalloc(sizeof(struct ltt_session), GFP_KERNEL);
if (!session)
return NULL;
INIT_LIST_HEAD(&session->chan);
+ INIT_LIST_HEAD(&session->events);
list_add(&session->list, &sessions);
mutex_unlock(&sessions_mutex);
return session;
{
struct ltt_channel *chan, *tmpchan;
struct ltt_event *event, *tmpevent;
+ int ret;
mutex_lock(&sessions_mutex);
- session->active = 0;
+ ACCESS_ONCE(session->active) = 0;
+ list_for_each_entry(event, &session->events, list) {
+ ret = _ltt_event_unregister(event);
+ WARN_ON(ret);
+ }
synchronize_trace(); /* Wait for in-flight events to complete */
list_for_each_entry_safe(event, tmpevent, &session->events, list)
_ltt_event_destroy(event);
ret = -EBUSY;
goto end;
}
- session->active = 1;
+ ACCESS_ONCE(session->active) = 1;
synchronize_trace(); /* Wait for in-flight events to complete */
end:
mutex_unlock(&sessions_mutex);
ret = -EBUSY;
goto end;
}
- session->active = 0;
+ ACCESS_ONCE(session->active) = 0;
synchronize_trace(); /* Wait for in-flight events to complete */
end:
mutex_unlock(&sessions_mutex);
return ret;
}
+static struct ltt_transport *ltt_transport_find(const char *name)
+{
+ struct ltt_transport *transport;
+
+ list_for_each_entry(transport, <t_transport_list, node) {
+ if (!strcmp(transport->name, name))
+ return transport;
+ }
+ return NULL;
+}
+
struct ltt_channel *ltt_channel_create(struct ltt_session *session,
- int overwrite, void *buf_addr,
+ const char *transport_name,
+ void *buf_addr,
size_t subbuf_size, size_t num_subbuf,
unsigned int switch_timer_interval,
unsigned int read_timer_interval)
{
struct ltt_channel *chan;
- struct ltt_transport *transport = NULL, *tran_iter;
- char *transport_name;
+ struct ltt_transport *transport;
mutex_lock(&sessions_mutex);
- if (session->active)
+ if (session->active) {
+ printk(KERN_WARNING "LTTng refusing to add channel to active session\n");
goto active; /* Refuse to add channel to active session */
- transport_name = overwrite ? "relay-overwrite" : "relay-discard";
- list_for_each_entry(tran_iter, <t_transport_list, node) {
- if (!strcmp(tran_iter->name, transport_name)) {
- transport = tran_iter;
- break;
- }
}
- if (!transport)
+ transport = ltt_transport_find(transport_name);
+ if (!transport) {
+ printk(KERN_WARNING "LTTng transport %s not found\n",
+ transport_name);
goto notransport;
- chan = kmalloc(sizeof(struct ltt_channel), GFP_KERNEL);
+ }
+ chan = kzalloc(sizeof(struct ltt_channel), GFP_KERNEL);
if (!chan)
goto nomem;
chan->session = session;
chan->chan = transport->ops.channel_create("[lttng]", session, buf_addr,
subbuf_size, num_subbuf, switch_timer_interval,
read_timer_interval);
+ if (!chan->chan)
+ goto create_error;
chan->ops = &transport->ops;
list_add(&chan->list, &session->chan);
mutex_unlock(&sessions_mutex);
return chan;
+create_error:
+ kfree(chan);
nomem:
notransport:
active:
*/
struct ltt_event *ltt_event_create(struct ltt_channel *chan, char *name,
enum instrum_type itype,
- void *probe, void *filter)
+ const struct lttng_event_desc *event_desc,
+ void *filter)
{
struct ltt_event *event;
int ret;
if (chan->free_event_id == -1UL)
goto full;
/*
- * This is O(n^2) (for each event loop called at event creation).
- * Might require a hash if we have lots of events.
+ * This is O(n^2) (for each event, the loop is called at event
+ * creation). Might require a hash if we have lots of events.
*/
list_for_each_entry(event, &chan->session->events, list)
- if (!strcmp(event->name, name))
+ if (!strcmp(event->desc->name, name))
goto exist;
event = kmem_cache_zalloc(event_cache, GFP_KERNEL);
if (!event)
goto cache_error;
- event->name = kmalloc(strlen(name) + 1, GFP_KERNEL);
- if (!event->name)
- goto name_error;
- strcpy(event->name, name);
event->chan = chan;
- event->probe = probe;
+ event->desc = event_desc;
event->filter = filter;
event->id = chan->free_event_id++;
event->itype = itype;
smp_wmb();
switch (itype) {
case INSTRUM_TRACEPOINTS:
- ret = tracepoint_probe_register(name, probe, event);
+ ret = tracepoint_probe_register(name, event_desc->probe_callback,
+ event);
if (ret)
goto register_error;
break;
default:
WARN_ON_ONCE(1);
}
+ list_add(&event->list, &chan->session->events);
mutex_unlock(&sessions_mutex);
return event;
register_error:
- kfree(event->name);
-name_error:
kmem_cache_free(event_cache, event);
cache_error:
exist:
/*
* Only used internally at session destruction.
*/
-int _ltt_event_destroy(struct ltt_event *event)
+int _ltt_event_unregister(struct ltt_event *event)
{
int ret = -EINVAL;
switch (event->itype) {
case INSTRUM_TRACEPOINTS:
- ret = tracepoint_probe_unregister(event->name, event->probe,
+ ret = tracepoint_probe_unregister(event->desc->name,
+ event->desc->probe_callback,
event);
if (ret)
return ret;
default:
WARN_ON_ONCE(1);
}
- kfree(event->name);
- kmem_cache_free(event_cache, event);
return ret;
}
+/*
+ * Only used internally at session destruction.
+ */
+void _ltt_event_destroy(struct ltt_event *event)
+{
+ ltt_event_put(event->desc);
+ list_del(&event->list);
+ kmem_cache_free(event_cache, event);
+}
+
/**
* ltt_transport_register - LTT transport registration
* @transport: transport structure
* registered. We deal with this here so we don't have to call
* vmalloc_sync_all() in each module's init.
*/
- vmalloc_sync_all();
+ wrapper_vmalloc_sync_all();
mutex_lock(&sessions_mutex);
list_add_tail(&transport->node, <t_transport_list);
return -ENOMEM;
ret = ltt_debugfs_abi_init();
if (ret)
- goto error;
+ goto error_abi;
return 0;
-error:
+error_abi:
kmem_cache_destroy(event_cache);
return ret;
}
projects / lttng-modules.git / blobdiff