#include <urcu/compiler.h>
#include <urcu/list.h>
#include <ust/lttng-events.h>
-#include "usterr_signal_safe.h"
+#include <ust/usterr-signal-safe.h>
#include "ust/core.h"
#include "ltt-tracer.h"
* by the caller.
*/
-struct obj;
-
-struct objd_ops {
- long (*cmd)(int objd, unsigned int cmd, unsigned long arg);
- int (*release)(int objd);
-};
-
struct obj {
union {
struct {
end:
obj->u.s.private_data = private_data;
obj->u.s.ops = ops;
- obj->u.s.f_count = 1;
+ obj->u.s.f_count = 2; /* count == 1 : object is allocated */
+ /* count == 2 : allocated + hold ref */
return obj - objd_table.array;
}
{
if (id >= objd_table.len)
return NULL;
+ if (!objd_table.array[id].u.s.f_count)
+ return NULL;
return &objd_table.array[id];
}
obj->u.s.private_data = private_data;
}
-static
const struct objd_ops *objd_ops(int id)
{
struct obj *obj = _objd_get(id);
- assert(obj);
+
+ if (!obj)
+ return NULL;
return obj->u.s.ops;
}
assert(obj);
obj->u.freelist_next = objd_table.freelist_head;
objd_table.freelist_head = obj - objd_table.array;
+ assert(obj->u.s.f_count == 1);
+ obj->u.s.f_count = 0; /* deallocated */
}
static
obj->u.s.f_count++;
}
-static
-void objd_unref(int id)
+int objd_unref(int id)
{
struct obj *obj = _objd_get(id);
- if (!(--obj->u.s.f_count)) {
+ if (!obj)
+ return -EINVAL;
+ if (obj->u.s.f_count == 1) {
+ ERR("Reference counting error\n");
+ return -EINVAL;
+ }
+ if ((--obj->u.s.f_count) == 1) {
const struct objd_ops *ops = objd_ops(id);
-
+
if (ops->release)
ops->release(id);
objd_free(id);
}
+ return 0;
}
static
void objd_table_destroy(void)
{
+ int i;
+
+ for (i = 0; i < objd_table.allocated_len; i++) {
+ struct obj *obj = _objd_get(i);
+ const struct objd_ops *ops;
+
+ if (!obj)
+ continue;
+ ops = obj->u.s.ops;
+ if (ops->release)
+ ops->release(i);
+ }
free(objd_table.array);
+ objd_table.freelist_head = -1;
}
/*
METADATA_CHANNEL,
};
+int lttng_abi_create_root_handle(void)
+{
+ int root_handle;
+
+ root_handle = objd_alloc(NULL, <tng_ops);
+ assert(root_handle == 0);
+ return root_handle;
+}
+
static
int lttng_abi_create_session(void)
{
switch (context_param->ctx) {
case LTTNG_UST_CONTEXT_VTID:
- return lttng_add_vtid_to_ctx(ctx);
+ //TODO return lttng_add_vtid_to_ctx(ctx);
default:
return -EINVAL;
}
return; /* not allowed to return error */
}
-static
int lttng_abi_create_channel(int session_objd,
struct lttng_ust_channel *chan_param,
enum channel_type channel_type)
return chan_objd;
chan_error:
- objd_unref(chan_objd);
+ {
+ int err;
+
+ err = objd_unref(chan_objd);
+ assert(!err);
+ }
objd_error:
return ret;
}
* individual file is released).
*/
static
-int lttng_session_release(int objd)
+int lttng_release_session(int objd)
{
struct ltt_session *session = objd_private(objd);
- if (session)
+ if (session) {
ltt_session_destroy(session);
- return 0;
+ return 0;
+ } else {
+ return -EINVAL;
+ }
}
static const struct objd_ops lttng_session_ops = {
- .release = lttng_session_release,
+ .release = lttng_release_session,
.cmd = lttng_session_cmd,
};
return event_objd;
event_error:
- objd_unref(event_objd);
+ {
+ int err;
+
+ err = objd_unref(event_objd);
+ assert(!err);
+ }
objd_error:
return ret;
}
struct ltt_channel *channel = objd_private(objd);
if (channel)
- objd_unref(channel->session->objd);
+ return objd_unref(channel->session->objd);
return 0;
}
struct ltt_event *event = objd_private(objd);
if (event)
- objd_unref(event->chan->objd);
+ return objd_unref(event->chan->objd);
return 0;
}
.cmd = lttng_event_cmd,
};
-void __attribute__((constructor)) lttng_ust_abi_init(void)
-{
- /* TODO: initialize socket */
-}
-
-static
-void __attribute__((destructor)) lttng_ust_abi_exit(void)
+void lttng_ust_abi_exit(void)
{
- /* TODO: teardown socket */
objd_table_destroy();
}