Typedef bt_intern_str

Remove external dependency to glib

Signed-off-by: Julien Desfossez <julien.desfossez@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/formats/registry.c b/formats/registry.c
index 12912561773fd3884ab3fad7015624fd6683be5d..829ede9da77bf12dce5da544e3ea0bb3538a8049 100644 (file)
--- a/formats/registry.c
+++ b/formats/registry.c
@@ -40,12 +40,12 @@ void __attribute__((destructor)) format_finalize(void);
  */
 GHashTable *format_registry;
 
-struct format *bt_lookup_format(GQuark qname)
+struct format *bt_lookup_format(bt_intern_str name)
 {
        if (!init_done)
                return NULL;
        return g_hash_table_lookup(format_registry,
-                                  (gconstpointer) (unsigned long) qname);
+                                  (gconstpointer) (unsigned long) name);
 }
 
 static void show_format(gpointer key, gpointer value, gpointer user_data)

diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h
index 8fe9a9c69f3ef7798930d6b84358cfca725526ef..4d94a5628117b596d361fddb128bd9673aef6ebf 100644 (file)
--- a/include/babeltrace/babeltrace.h
+++ b/include/babeltrace/babeltrace.h
@@ -17,7 +17,6 @@
  * all copies or substantial portions of the Software.
  */
 
-#include <glib.h>
 #include <babeltrace/context.h>
 #include <babeltrace/format.h>
 #include <babeltrace/iterator.h>
@@ -25,8 +24,6 @@
 #include <babeltrace/trace-handle.h>
 #include <babeltrace/ctf/events.h>
 
-typedef GQuark bt_event_name;
-
 /* Forward declarations */
 struct bt_iter;
 struct ctf_stream_event;
@@ -92,7 +89,7 @@ void babeltrace_dependencies_destroy(struct bt_dependencies *dep);
  * callbacks/read/add more callbacks/read some more.)
  */
 int bt_iter_add_callback(struct bt_iter *iter,
-               bt_event_name event, void *private_data, int flags,
+               bt_intern_str event, void *private_data, int flags,
                enum bt_cb_ret (*callback)(struct bt_ctf_data *ctf_data,
                                           void *caller_data),
                struct bt_dependencies *depends,

diff --git a/include/babeltrace/callbacks-internal.h b/include/babeltrace/callbacks-internal.h
index 65f62adbb491c40e2ed7e69d2c2da04a0d72d862..c9aeccdf3ecbab8a63958fb840334cf7c152144a 100644 (file)
--- a/include/babeltrace/callbacks-internal.h
+++ b/include/babeltrace/callbacks-internal.h
@@ -21,6 +21,8 @@
  * all copies or substantial portions of the Software.
  */
 
+#include <glib.h>
+
 struct bt_callback {
        int prio;               /* Callback order priority. Lower first. Dynamically assigned from dependency graph. */
        void *private_data;

diff --git a/include/babeltrace/context-internal.h b/include/babeltrace/context-internal.h
index 475b2d894ecd7488a6ff572584802d92ad431990..80ca42c8d0aaa791994481c2bc9f3767bdf9f355 100644 (file)
--- a/include/babeltrace/context-internal.h
+++ b/include/babeltrace/context-internal.h
@@ -23,6 +23,8 @@
  * included in all copies or substantial portions of the Software.
  */
 
+#include <glib.h>
+
 struct trace_collection;
 struct GHashTable;
 

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index 4eb59858a84a9d562339c3e0782c288c481f7046..f680dfa7ceb4e76aec8d4ecb380a09e8947b6174 100644 (file)
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -24,7 +24,8 @@
 #include <babeltrace/list.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <glib.h>
+
+typedef int bt_intern_str;
 
 /* forward declaration */
 struct ctf_stream_pos;
@@ -43,7 +44,7 @@ struct mmap_stream_list {
 };
 
 struct format {
-       GQuark name;
+       bt_intern_str name;
 
        struct trace_descriptor *(*open_trace)(const char *path, int flags,
                        void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
@@ -55,7 +56,7 @@ struct format {
        void (*close_trace)(struct trace_descriptor *descriptor);
 };
 
-extern struct format *bt_lookup_format(GQuark qname);
+extern struct format *bt_lookup_format(bt_intern_str qname);
 extern void bt_fprintf_format_list(FILE *fp);
 extern int bt_register_format(struct format *format);
 

diff --git a/lib/callbacks.c b/lib/callbacks.c
index f5c4d105859315be4c19ce6e9753c3c7204b454f..591f5109f15de2af16b9aff5cfc2c5ef2f8afcbe 100644 (file)
--- a/lib/callbacks.c
+++ b/lib/callbacks.c
@@ -61,7 +61,7 @@ struct bt_dependencies *babeltrace_dependencies_create(const char *first, ...)
  * bt_iter_add_callback: Add a callback to iterator.
  */
 int bt_iter_add_callback(struct bt_iter *iter,
-               bt_event_name event, void *private_data, int flags,
+               bt_intern_str event, void *private_data, int flags,
                enum bt_cb_ret (*callback)(struct bt_ctf_data *ctf_data,
                                           void *private_data),
                struct bt_dependencies *depends,