Export consumer ABI, implement ring buffer modifications for consumer

[lttng-ust.git] / libust / ltt-events.c

diff --git a/libust/ltt-events.c b/libust/ltt-events.c
index 325fe1d06df8e54d537ba03468306dfe359fea17..18fb8599ee09a5e87b5f529cbe4c4750d57185bf 100644 (file)
--- a/libust/ltt-events.c
+++ b/libust/ltt-events.c
@@ -299,7 +299,9 @@ struct ltt_channel *ltt_channel_create(struct ltt_session *session,
                                       void *buf_addr,
                                       size_t subbuf_size, size_t num_subbuf,
                                       unsigned int switch_timer_interval,
-                                      unsigned int read_timer_interval)
+                                      unsigned int read_timer_interval,
+                                      int *shm_fd, int *wait_fd,
+                                      uint64_t *memory_map_size)
 {
        struct ltt_channel *chan;
        struct ltt_transport *transport;
@@ -324,7 +326,8 @@ struct ltt_channel *ltt_channel_create(struct ltt_session *session,
         */
        transport->ops.channel_create("[lttng]", chan, buf_addr,
                        subbuf_size, num_subbuf, switch_timer_interval,
-                       read_timer_interval);
+                       read_timer_interval, shm_fd, wait_fd,
+                       memory_map_size);
        if (!chan->chan)
                goto create_error;
        chan->enabled = 1;
@@ -549,7 +552,7 @@ int _ltt_field_statedump(struct ltt_session *session,
        switch (field->type.atype) {
        case atype_integer:
                ret = lttng_metadata_printf(session,
-                       "               integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } %s;\n",
+                       "               integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } _%s;\n",
                        field->type.u.basic.integer.size,
                        field->type.u.basic.integer.alignment,
                        field->type.u.basic.integer.signedness,
@@ -568,7 +571,7 @@ int _ltt_field_statedump(struct ltt_session *session,
                break;
        case atype_float:
                ret = lttng_metadata_printf(session,
-                       "               floating_point { exp_dig = %u; mant_dig = %u; align = %u; } %s;\n",
+                       "               floating_point { exp_dig = %u; mant_dig = %u; align = %u; } _%s;\n",
                        field->type.u.basic._float.exp_dig,
                        field->type.u.basic._float.mant_dig,
                        field->type.u.basic._float.alignment,
@@ -591,7 +594,7 @@ int _ltt_field_statedump(struct ltt_session *session,
 
                elem_type = &field->type.u.array.elem_type;
                ret = lttng_metadata_printf(session,
-                       "               integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } %s[%u];\n",
+                       "               integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } _%s[%u];\n",
                        elem_type->u.basic.integer.size,
                        elem_type->u.basic.integer.alignment,
                        elem_type->u.basic.integer.signedness,
@@ -637,7 +640,7 @@ int _ltt_field_statedump(struct ltt_session *session,
                        return ret;
 
                ret = lttng_metadata_printf(session,
-                       "               integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } %s[ __%s_length ];\n",
+                       "               integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } _%s[ __%s_length ];\n",
                        elem_type->u.basic.integer.size,
                        (unsigned int) elem_type->u.basic.integer.alignment,
                        elem_type->u.basic.integer.signedness,
@@ -660,7 +663,7 @@ int _ltt_field_statedump(struct ltt_session *session,
        case atype_string:
                /* Default encoding is UTF8 */
                ret = lttng_metadata_printf(session,
-                       "               string%s %s;\n",
+                       "               string%s _%s;\n",
                        field->type.u.basic.string.encoding == lttng_encode_ASCII ?
                                " { encoding = ASCII; }" : "",
                        field->name);