This fixes bugs in static build context on platforms where the calling
order of library constructors is undefined: this constructor could be
called before GLib's constructor, in which case you cannot call
g_hash_table_new() because GLib's slice allocator is not initialized.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
#define BT_LOG_TAG "CTF-IR-UTILS"
#include <babeltrace/lib-logging-internal.h>
#define BT_LOG_TAG "CTF-IR-UTILS"
#include <babeltrace/lib-logging-internal.h>
#include <stdlib.h>
#include <glib.h>
#include <babeltrace/ctf-ir/utils.h>
#include <stdlib.h>
#include <glib.h>
#include <babeltrace/ctf-ir/utils.h>
static GHashTable *reserved_keywords_set;
static int init_done;
static GHashTable *reserved_keywords_set;
static int init_done;
-static int global_data_refcount;
-static __attribute__((constructor))
-void trace_init(void)
+static
+void try_init_reserved_keywords(void)
{
size_t i;
const size_t reserved_keywords_count =
sizeof(reserved_keywords_str) / sizeof(char *);
{
size_t i;
const size_t reserved_keywords_count =
sizeof(reserved_keywords_str) / sizeof(char *);
- global_data_refcount++;
- if (init_done) {
+ if (reserved_keywords_set) {
return;
}
reserved_keywords_set = g_hash_table_new(g_direct_hash, g_direct_equal);
return;
}
reserved_keywords_set = g_hash_table_new(g_direct_hash, g_direct_equal);
+ assert(reserved_keywords_set);
+
for (i = 0; i < reserved_keywords_count; i++) {
gpointer quark = GINT_TO_POINTER(g_quark_from_string(
reserved_keywords_str[i]));
for (i = 0; i < reserved_keywords_count; i++) {
gpointer quark = GINT_TO_POINTER(g_quark_from_string(
reserved_keywords_str[i]));
static __attribute__((destructor))
void trace_finalize(void)
{
static __attribute__((destructor))
void trace_finalize(void)
{
- if (--global_data_refcount == 0) {
+ if (reserved_keywords_set) {
g_hash_table_destroy(reserved_keywords_set);
}
}
g_hash_table_destroy(reserved_keywords_set);
}
}
+ try_init_reserved_keywords();
+
if (input_string[0] == '\0') {
ret = -1;
goto end;
if (input_string[0] == '\0') {
ret = -1;
goto end;