Fix loop dependency

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

diff --git a/Makefile b/Makefile
index 169b7cdd89eb2132353827d917607a8415b32f0d..01b0e7ee1b02d0f45e08b305cf45b77b98a9f7b5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,8 @@ obj-m += ltt-ring-buffer-metadata-client.o
 
 obj-m += ltt-relay.o
 ltt-relay-objs :=  ltt-events.o ltt-debugfs-abi.o \
-                       ltt-probes.o ltt-core.o ltt-context.o
+                       ltt-probes.o ltt-core.o ltt-context.o \
+                       lttng-context-pid.o
 
 obj-m += probes/
 obj-m += lib/

diff --git a/lttng-context-pid.c b/lttng-context-pid.c
new file mode 100644 (file)
index 0000000..956920f
--- /dev/null
+++ b/lttng-context-pid.c
@@ -0,0 +1,65 @@
+/*
+ * (C) Copyright       2009-2011 -
+ *             Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * LTTng PID context.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
+ */
+
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/sched.h>
+#include "ltt-events.h"
+#include "wrapper/ringbuffer/frontend_types.h"
+#include "wrapper/vmalloc.h"
+#include "ltt-tracer.h"
+
+static
+size_t pid_get_size(size_t offset)
+{
+       size_t size = 0;
+
+       size += lib_ring_buffer_align(offset, ltt_alignof(pid_t));
+       size += sizeof(pid_t);
+       return size;
+}
+
+static
+void pid_record(struct lttng_ctx_field *field,
+               struct lib_ring_buffer_ctx *ctx,
+               struct ltt_channel *chan)
+{
+       pid_t pid;
+
+       pid = current->pid;
+       lib_ring_buffer_align_ctx(ctx, ltt_alignof(pid));
+       chan->ops->event_write(ctx, &pid, sizeof(pid));
+}
+
+int lttng_add_pid_to_ctx(struct lttng_ctx **ctx)
+{
+       struct lttng_ctx_field *field;
+       int ret;
+
+       field = lttng_append_context(ctx);
+       if (!field)
+               return ret;
+       field->event_field.name = "pid";
+       field->event_field.type.atype = atype_integer;
+       field->event_field.type.u.basic.integer.size = sizeof(pid_t) * CHAR_BIT;
+       field->event_field.type.u.basic.integer.alignment = ltt_alignof(pid_t) * CHAR_BIT;
+       field->event_field.type.u.basic.integer.signedness = is_signed_type(pid_t);
+       field->event_field.type.u.basic.integer.reverse_byte_order = 0;
+       field->event_field.type.u.basic.integer.base = 10;
+       field->event_field.type.u.basic.integer.encoding = lttng_encode_none;
+       field->get_size = pid_get_size;
+       field->record = pid_record;
+       wrapper_vmalloc_sync_all();
+       return 0;
+}
+EXPORT_SYMBOL_GPL(lttng_add_pid_to_ctx);
+
+MODULE_LICENSE("GPL and additional rights");
+MODULE_AUTHOR("Mathieu Desnoyers");
+MODULE_DESCRIPTION("Linux Trace Toolkit Perf Support");

diff --git a/probes/Makefile b/probes/Makefile
index 78c0c69903882a36d7d6c241a4c503eff7c8e885..554e6ffaf8e34c6a3a889786d3a126bbdc3fe46a 100644 (file)
--- a/probes/Makefile
+++ b/probes/Makefile
@@ -28,8 +28,6 @@ ifneq ($(CONFIG_PERF_EVENTS),)
 obj-m += lttng-perf-counters.o
 endif
 
-obj-m += lttng-context-pid.o
-
 endif
 
 else

diff --git a/probes/lttng-context-pid.c b/probes/lttng-context-pid.c
deleted file mode 100644 (file)
index 81dbe4a..0000000
--- a/probes/lttng-context-pid.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * (C) Copyright       2009-2011 -
- *             Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * LTTng PID context.
- *
- * Dual LGPL v2.1/GPL v2 license.
- */
-
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/sched.h>
-#include "../ltt-events.h"
-#include "../wrapper/ringbuffer/frontend_types.h"
-#include "../wrapper/vmalloc.h"
-#include "../ltt-tracer.h"
-
-static
-size_t pid_get_size(size_t offset)
-{
-       size_t size = 0;
-
-       size += lib_ring_buffer_align(offset, ltt_alignof(pid_t));
-       size += sizeof(pid_t);
-       return size;
-}
-
-static
-void pid_record(struct lttng_ctx_field *field,
-               struct lib_ring_buffer_ctx *ctx,
-               struct ltt_channel *chan)
-{
-       pid_t pid;
-
-       pid = current->pid;
-       lib_ring_buffer_align_ctx(ctx, ltt_alignof(pid));
-       chan->ops->event_write(ctx, &pid, sizeof(pid));
-}
-
-int lttng_add_pid_to_ctx(struct lttng_ctx **ctx)
-{
-       struct lttng_ctx_field *field;
-       int ret;
-
-       field = lttng_append_context(ctx);
-       if (!field)
-               return ret;
-       field->event_field.name = "pid";
-       field->event_field.type.atype = atype_integer;
-       field->event_field.type.u.basic.integer.size = sizeof(pid_t) * CHAR_BIT;
-       field->event_field.type.u.basic.integer.alignment = ltt_alignof(pid_t) * CHAR_BIT;
-       field->event_field.type.u.basic.integer.signedness = is_signed_type(pid_t);
-       field->event_field.type.u.basic.integer.reverse_byte_order = 0;
-       field->event_field.type.u.basic.integer.base = 10;
-       field->event_field.type.u.basic.integer.encoding = lttng_encode_none;
-       field->get_size = pid_get_size;
-       field->record = pid_record;
-       wrapper_vmalloc_sync_all();
-       return 0;
-}
-EXPORT_SYMBOL_GPL(lttng_add_pid_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit Perf Support");