Fix: move dummy functions to common file

Those dummy functions are needed by both lttng-ust and lttng-ust-ctl
libraries.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/liblttng-ust/lttng-context-provider.c b/liblttng-ust/lttng-context-provider.c
index b5ae3075c075d1c70a797e5014f98ccb92a20d2d..6c067e2fecae06548a3d4495ef9477b2495a6a5b 100644 (file)
--- a/liblttng-ust/lttng-context-provider.c
+++ b/liblttng-ust/lttng-context-provider.c
@@ -92,31 +92,6 @@ end:
        return ret;
 }
 
-size_t lttng_ust_dummy_get_size(struct lttng_ctx_field *field, size_t offset)
-{
-       size_t size = 0;
-
-       size += lib_ring_buffer_align(offset, lttng_alignof(char));
-       size += sizeof(char);           /* tag */
-       return size;
-}
-
-void lttng_ust_dummy_record(struct lttng_ctx_field *field,
-                struct lttng_ust_lib_ring_buffer_ctx *ctx,
-                struct lttng_channel *chan)
-{
-       char sel_char = (char) LTTNG_UST_DYNAMIC_TYPE_NONE;
-
-       lib_ring_buffer_align_ctx(ctx, lttng_alignof(sel_char));
-       chan->ops->event_write(ctx, &sel_char, sizeof(sel_char));
-}
-
-void lttng_ust_dummy_get_value(struct lttng_ctx_field *field,
-               struct lttng_ctx_value *value)
-{
-       value->sel = LTTNG_UST_DYNAMIC_TYPE_NONE;
-}
-
 void lttng_ust_context_provider_unregister(struct lttng_ust_context_provider *provider)
 {
        if (ust_lock())

diff --git a/liblttng-ust/ust-core.c b/liblttng-ust/ust-core.c
index 60751dc32a9aa56058e1452f3e9ddec4a395981b..0182d95722040a24d4a57969ff95071eaf51513a 100644 (file)
--- a/liblttng-ust/ust-core.c
+++ b/liblttng-ust/ust-core.c
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <lttng/ust-events.h>
 #include <usterr-signal-safe.h>
+#include "lttng-tracer-core.h"
 #include "jhash.h"
 
 static CDS_LIST_HEAD(lttng_transport_list);
@@ -80,3 +81,28 @@ struct lttng_enum *lttng_ust_enum_get(struct lttng_session *session,
        }
        return NULL;
 }
+
+size_t lttng_ust_dummy_get_size(struct lttng_ctx_field *field, size_t offset)
+{
+       size_t size = 0;
+
+       size += lib_ring_buffer_align(offset, lttng_alignof(char));
+       size += sizeof(char);           /* tag */
+       return size;
+}
+
+void lttng_ust_dummy_record(struct lttng_ctx_field *field,
+                struct lttng_ust_lib_ring_buffer_ctx *ctx,
+                struct lttng_channel *chan)
+{
+       char sel_char = (char) LTTNG_UST_DYNAMIC_TYPE_NONE;
+
+       lib_ring_buffer_align_ctx(ctx, lttng_alignof(sel_char));
+       chan->ops->event_write(ctx, &sel_char, sizeof(sel_char));
+}
+
+void lttng_ust_dummy_get_value(struct lttng_ctx_field *field,
+               struct lttng_ctx_value *value)
+{
+       value->sel = LTTNG_UST_DYNAMIC_TYPE_NONE;
+}