* by the caller.
*/
-struct obj {
+struct lttng_ust_obj {
union {
struct {
void *private_data;
- const struct objd_ops *ops;
+ const struct lttng_ust_objd_ops *ops;
int f_count;
} s;
int freelist_next; /* offset freelist. end is -1. */
} u;
};
-struct objd_table {
- struct obj *array;
+struct lttng_ust_objd_table {
+ struct lttng_ust_obj *array;
unsigned int len, allocated_len;
int freelist_head; /* offset freelist head. end is -1 */
};
-static struct objd_table objd_table = {
+static struct lttng_ust_objd_table objd_table = {
.freelist_head = -1,
};
static
-int objd_alloc(void *private_data, const struct objd_ops *ops)
+int objd_alloc(void *private_data, const struct lttng_ust_objd_ops *ops)
{
- struct obj *obj;
+ struct lttng_ust_obj *obj;
if (objd_table.freelist_head != -1) {
obj = &objd_table.array[objd_table.freelist_head];
if (objd_table.len >= objd_table.allocated_len) {
unsigned int new_allocated_len, old_allocated_len;
- struct obj *new_table, *old_table;
+ struct lttng_ust_obj *new_table, *old_table;
old_allocated_len = objd_table.allocated_len;
old_table = objd_table.array;
new_allocated_len = 1;
else
new_allocated_len = old_allocated_len << 1;
- new_table = zmalloc(sizeof(struct obj) * new_allocated_len);
+ new_table = zmalloc(sizeof(struct lttng_ust_obj) * new_allocated_len);
if (!new_table)
return -ENOMEM;
memcpy(new_table, old_table,
- sizeof(struct obj) * old_allocated_len);
+ sizeof(struct lttng_ust_obj) * old_allocated_len);
free(old_table);
objd_table.array = new_table;
objd_table.allocated_len = new_allocated_len;
}
static
-struct obj *_objd_get(int id)
+struct lttng_ust_obj *_objd_get(int id)
{
if (id >= objd_table.len)
return NULL;
static
void *objd_private(int id)
{
- struct obj *obj = _objd_get(id);
+ struct lttng_ust_obj *obj = _objd_get(id);
assert(obj);
return obj->u.s.private_data;
}
static
void objd_set_private(int id, void *private_data)
{
- struct obj *obj = _objd_get(id);
+ struct lttng_ust_obj *obj = _objd_get(id);
assert(obj);
obj->u.s.private_data = private_data;
}
-const struct objd_ops *objd_ops(int id)
+const struct lttng_ust_objd_ops *objd_ops(int id)
{
- struct obj *obj = _objd_get(id);
+ struct lttng_ust_obj *obj = _objd_get(id);
if (!obj)
return NULL;
static
void objd_free(int id)
{
- struct obj *obj = _objd_get(id);
+ struct lttng_ust_obj *obj = _objd_get(id);
assert(obj);
obj->u.freelist_next = objd_table.freelist_head;
static
void objd_ref(int id)
{
- struct obj *obj = _objd_get(id);
+ struct lttng_ust_obj *obj = _objd_get(id);
obj->u.s.f_count++;
}
int objd_unref(int id)
{
- struct obj *obj = _objd_get(id);
+ struct lttng_ust_obj *obj = _objd_get(id);
if (!obj)
return -EINVAL;
return -EINVAL;
}
if ((--obj->u.s.f_count) == 1) {
- const struct objd_ops *ops = objd_ops(id);
+ const struct lttng_ust_objd_ops *ops = objd_ops(id);
if (ops->release)
ops->release(id);
* We send commands over a socket.
*/
-static const struct objd_ops lttng_ops;
-static const struct objd_ops lttng_session_ops;
-static const struct objd_ops lttng_channel_ops;
-static const struct objd_ops lttng_metadata_ops;
-static const struct objd_ops lttng_event_ops;
-static const struct objd_ops lib_ring_buffer_objd_ops;
+static const struct lttng_ust_objd_ops lttng_ops;
+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 lib_ring_buffer_objd_ops;
enum channel_type {
PER_CPU_CHANNEL,
return lttng_add_vtid_to_ctx(ctx);
case LTTNG_UST_CONTEXT_VPID:
return lttng_add_vpid_to_ctx(ctx);
+ case LTTNG_UST_CONTEXT_PROCNAME:
+ return lttng_add_procname_to_ctx(ctx);
default:
return -EINVAL;
}
}
}
-static const struct objd_ops lttng_ops = {
+static const struct lttng_ust_objd_ops lttng_ops = {
.cmd = lttng_cmd,
};
enum channel_type channel_type)
{
struct ltt_session *session = objd_private(session_objd);
- const struct objd_ops *ops;
+ const struct lttng_ust_objd_ops *ops;
const char *transport_name;
struct ltt_channel *chan;
int chan_objd;
}
}
-static const struct objd_ops lttng_session_ops = {
+static const struct lttng_ust_objd_ops lttng_session_ops = {
.release = lttng_release_session,
.cmd = lttng_session_cmd,
};
struct stream_priv_data {
- struct lib_ring_buffer *buf;
+ struct lttng_ust_lib_ring_buffer *buf;
struct ltt_channel *ltt_chan;
};
int lttng_abi_open_stream(int channel_objd, struct lttng_ust_stream *info)
{
struct ltt_channel *channel = objd_private(channel_objd);
- struct lib_ring_buffer *buf;
+ struct lttng_ust_lib_ring_buffer *buf;
struct stream_priv_data *priv;
int stream_objd, ret;
return ltt_channel_enable(channel);
case LTTNG_UST_DISABLE:
return ltt_channel_disable(channel);
+ case LTTNG_UST_FLUSH_BUFFER:
+ return channel->ops->flush_buffer(channel->chan, channel->handle);
default:
return -EINVAL;
}
static
long lttng_metadata_cmd(int objd, unsigned int cmd, unsigned long arg)
{
+ struct ltt_channel *channel = objd_private(objd);
+
switch (cmd) {
case LTTNG_UST_STREAM:
{
/* stream used as output */
return lttng_abi_open_stream(objd, stream);
}
+ case LTTNG_UST_FLUSH_BUFFER:
+ return channel->ops->flush_buffer(channel->chan, channel->handle);
default:
return -EINVAL;
}
return 0;
}
-static const struct objd_ops lttng_channel_ops = {
+static const struct lttng_ust_objd_ops lttng_channel_ops = {
.release = lttng_channel_release,
//.poll = lttng_channel_poll,
.cmd = lttng_channel_cmd,
};
-static const struct objd_ops lttng_metadata_ops = {
+static const struct lttng_ust_objd_ops lttng_metadata_ops = {
.release = lttng_channel_release,
.cmd = lttng_metadata_cmd,
};
*
* This object descriptor implements lttng commands:
* (None for now. Access is done directly though shm.)
- * TODO: Add buffer flush.
*/
static
long lttng_rb_cmd(int objd, unsigned int cmd, unsigned long arg)
{
- //struct stream_priv_data *priv = objd_private(objd);
-
switch (cmd) {
default:
return -EINVAL;
int lttng_rb_release(int objd)
{
struct stream_priv_data *priv = objd_private(objd);
- struct lib_ring_buffer *buf;
+ struct lttng_ust_lib_ring_buffer *buf;
struct ltt_channel *channel;
if (priv) {
return 0;
}
-static const struct objd_ops lib_ring_buffer_objd_ops = {
+static const struct lttng_ust_objd_ops lib_ring_buffer_objd_ops = {
.release = lttng_rb_release,
.cmd = lttng_rb_cmd,
};
}
/* TODO: filter control ioctl */
-static const struct objd_ops lttng_event_ops = {
+static const struct lttng_ust_objd_ops lttng_event_ops = {
.release = lttng_event_release,
.cmd = lttng_event_cmd,
};