struct bt_context is opaque

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

diff --git a/include/Makefile.am b/include/Makefile.am
index 1dfa218b27afd52258136b4c673707086513fef8..5979b38262dcdad6397c3e0d9acf7962548ae2ea 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -12,6 +12,7 @@ noinst_HEADERS = \
        babeltrace/bitfield.h \
        babeltrace/callbacks-internal.h \
        babeltrace/compiler.h \
        babeltrace/bitfield.h \
        babeltrace/callbacks-internal.h \
        babeltrace/compiler.h \

+       babeltrace/context-internal.h \

        babeltrace/iterator-internal.h \
        babeltrace/list.h \
        babeltrace/prio_heap.h \
        babeltrace/iterator-internal.h \
        babeltrace/list.h \
        babeltrace/prio_heap.h \

diff --git a/include/babeltrace/context.h b/include/babeltrace/context.h
index 738a8432c61be0c003742225abbe6ea405884401..e5d9a4240dc9e438ab47f6ffae96c6332e2b82bc 100644 (file)
--- a/include/babeltrace/context.h
+++ b/include/babeltrace/context.h
@@ -23,24 +23,8 @@
  * included in all copies or substantial portions of the Software.
  */
 
  * included in all copies or substantial portions of the Software.
  */
 

-struct trace_collection;
-struct GHashTable;
-
-/*
- * The context represents the object in which a trace_collection is
- * open. As long as this structure is allocated, the trace_collection is
- * open and the traces it contains can be read and seeked by the
- * iterators and callbacks.
- *
- * It has to be created with the bt_context_create() function and
- * destroyed by calling one more bt_context_put() than bt_context_get()
- */
-struct bt_context {
-       struct trace_collection *tc;
-       GHashTable *trace_handles;
-       int refcount;
-       int last_trace_handle_id;
-};
+/* struct bt_context is opaque to the user */
+struct bt_context;

 
 /*
  * bt_context_create : create a Babeltrace context
 
 /*
  * bt_context_create : create a Babeltrace context

diff --git a/lib/callbacks.c b/lib/callbacks.c
index aae8196ffeb5508947b2c947932dd389299b1e9c..f5c4d105859315be4c19ce6e9753c3c7204b454f 100644 (file)
--- a/lib/callbacks.c
+++ b/lib/callbacks.c
@@ -22,6 +22,7 @@
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/callbacks-internal.h>
 #include <babeltrace/context.h>
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/callbacks-internal.h>
 #include <babeltrace/context.h>

+#include <babeltrace/context-internal.h>

 #include <babeltrace/ctf-ir/metadata.h>
 #include <babeltrace/iterator-internal.h>
 #include <inttypes.h>
 #include <babeltrace/ctf-ir/metadata.h>
 #include <babeltrace/iterator-internal.h>
 #include <inttypes.h>

diff --git a/lib/context.c b/lib/context.c
index c0479e1b31d441a4df4c9913ffece01278fe0051..507e90abb92d0abb7d94a06d1fe8d863b0a10f79 100644 (file)
--- a/lib/context.c
+++ b/lib/context.c
@@ -21,6 +21,7 @@
 
 #include <babeltrace/babeltrace.h>
 #include <babeltrace/context.h>
 
 #include <babeltrace/babeltrace.h>
 #include <babeltrace/context.h>

+#include <babeltrace/context-internal.h>

 #include <babeltrace/trace-handle.h>
 #include <babeltrace/trace-handle-internal.h>
 #include <babeltrace/trace-collection.h>
 #include <babeltrace/trace-handle.h>
 #include <babeltrace/trace-handle-internal.h>
 #include <babeltrace/trace-collection.h>

diff --git a/lib/iterator.c b/lib/iterator.c
index 3a07c1abcf1c0e75219528899977f45d6f357199..414f559e3e895bc8bcac9157968163fefd78a569 100644 (file)
--- a/lib/iterator.c
+++ b/lib/iterator.c
@@ -22,6 +22,7 @@
 #include <babeltrace/babeltrace.h>
 #include <babeltrace/callbacks-internal.h>
 #include <babeltrace/context.h>
 #include <babeltrace/babeltrace.h>
 #include <babeltrace/callbacks-internal.h>
 #include <babeltrace/context.h>

+#include <babeltrace/context-internal.h>

 #include <babeltrace/ctf/metadata.h>
 #include <babeltrace/iterator-internal.h>
 #include <babeltrace/iterator.h>
 #include <babeltrace/ctf/metadata.h>
 #include <babeltrace/iterator-internal.h>
 #include <babeltrace/iterator.h>

diff --git a/lib/trace-handle.c b/lib/trace-handle.c
index 73c137b3464011ffaf8e491f567f27bebb80103f..5a8a2192a98c004ebcde27528fc5b8f43c624178 100644 (file)
--- a/lib/trace-handle.c
+++ b/lib/trace-handle.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <babeltrace/babeltrace.h>
 #include <babeltrace/context.h>
 #include <stdlib.h>
 #include <babeltrace/babeltrace.h>
 #include <babeltrace/context.h>

+#include <babeltrace/context-internal.h>

 #include <babeltrace/trace-handle.h>
 #include <babeltrace/trace-handle-internal.h>
 
 #include <babeltrace/trace-handle.h>
 #include <babeltrace/trace-handle-internal.h>