projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split CTF IR and CTF writer APIs and implementations
[babeltrace.git]
/
lib
/
ctf-ir
/
utils.c
diff --git
a/lib/ctf-ir/utils.c
b/lib/ctf-ir/utils.c
index 0ab0df2464c72df45ecb898f886c5c8522824b89..312deb9dea835308d06fb967d7351c306357d7c1 100644
(file)
--- a/
lib/ctf-ir/utils.c
+++ b/
lib/ctf-ir/utils.c
@@
-29,10
+29,13
@@
#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 <string.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>
+#include <babeltrace/ctf-ir/field-types-internal.h>
+#include <babeltrace/ctf-ir/clock-class.h>
+#include <babeltrace/ref.h>
+#include <babeltrace/assert-internal.h>
static
const char * const reserved_keywords_str[] = {"align", "callsite",
static
const char * const reserved_keywords_str[] = {"align", "callsite",
@@
-43,21
+46,21
@@
const char * const reserved_keywords_str[] = {"align", "callsite",
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 tr
ace_init
(void)
+static
+void tr
y_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);
+ BT_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]));
@@
-71,32
+74,34
@@
void trace_init(void)
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);
}
}
-
int bt_ctf_validate_identifier(const char *input_string
)
+
bt_bool bt_identifier_is_valid(const char *identifier
)
{
{
-
int ret = 0
;
+
bt_bool is_valid = BT_TRUE
;
char *string = NULL;
char *save_ptr, *token;
char *string = NULL;
char *save_ptr, *token;
- if (!i
nput_string
) {
+ if (!i
dentifier
) {
BT_LOGV_STR("Invalid parameter: input string is NULL.");
BT_LOGV_STR("Invalid parameter: input string is NULL.");
-
ret = -1
;
+
is_valid = BT_FALSE
;
goto end;
}
goto end;
}
- if (input_string[0] == '\0') {
- ret = -1;
+ try_init_reserved_keywords();
+
+ if (identifier[0] == '\0') {
+ is_valid = BT_FALSE;
goto end;
}
goto end;
}
- string = strdup(i
nput_string
);
+ string = strdup(i
dentifier
);
if (!string) {
BT_LOGE("strdup() failed.");
if (!string) {
BT_LOGE("strdup() failed.");
-
ret = -1
;
+
is_valid = BT_FALSE
;
goto end;
}
goto end;
}
@@
-105,7
+110,7
@@
int bt_ctf_validate_identifier(const char *input_string)
if (g_hash_table_lookup_extended(reserved_keywords_set,
GINT_TO_POINTER(g_quark_from_string(token)),
NULL, NULL)) {
if (g_hash_table_lookup_extended(reserved_keywords_set,
GINT_TO_POINTER(g_quark_from_string(token)),
NULL, NULL)) {
-
ret = -1
;
+
is_valid = BT_FALSE
;
goto end;
}
goto end;
}
@@
-113,10
+118,5
@@
int bt_ctf_validate_identifier(const char *input_string)
}
end:
free(string);
}
end:
free(string);
- return ret;
-}
-
-bt_bool bt_ctf_identifier_is_valid(const char *identifier)
-{
- return bt_ctf_validate_identifier(identifier);
+ return is_valid;
}
}
This page took
0.025908 seconds
and
4
git commands to generate.