event-types.c \
stream.c \
stream-class.c \
- trace.c
+ trace.c \
+ utils.c
libctf_ir_la_LIBADD = \
$(top_builddir)/lib/libbabeltrace.la
*/
#include <babeltrace/ctf-ir/clock-internal.h>
+#include <babeltrace/ctf-ir/utils.h>
#include <babeltrace/ctf-writer/writer-internal.h>
#include <babeltrace/compiler.h>
#include <inttypes.h>
{
int ret = 0;
- if (validate_identifier(name)) {
+ if (bt_ctf_validate_identifier(name)) {
ret = -1;
goto end;
}
#include <babeltrace/ctf-writer/event-types.h>
#include <babeltrace/ctf-ir/event-types-internal.h>
+#include <babeltrace/ctf-ir/utils.h>
#include <babeltrace/ctf-writer/writer-internal.h>
#include <babeltrace/compiler.h>
#include <babeltrace/endian.h>
struct bt_ctf_field_type_structure *structure;
if (!type || !field_type || type->frozen ||
- validate_identifier(field_name) ||
+ bt_ctf_validate_identifier(field_name) ||
(type->declaration->id != CTF_TYPE_STRUCT) ||
bt_ctf_field_type_validate(field_type)) {
ret = -1;
{
struct bt_ctf_field_type_variant *variant = NULL;
- if (!enum_tag || validate_identifier(tag_name) ||
+ if (!enum_tag || bt_ctf_validate_identifier(tag_name) ||
(enum_tag->declaration->id != CTF_TYPE_ENUM)) {
goto error;
}
GQuark field_name_quark = g_quark_from_string(field_name);
if (!type || !field_type || type->frozen ||
- validate_identifier(field_name) ||
+ bt_ctf_validate_identifier(field_name) ||
(type->declaration->id != CTF_TYPE_VARIANT) ||
bt_ctf_field_type_validate(field_type)) {
ret = -1;
{
struct bt_ctf_field_type_sequence *sequence = NULL;
- if (!element_type || validate_identifier(length_field_name) ||
+ if (!element_type || bt_ctf_validate_identifier(length_field_name) ||
bt_ctf_field_type_validate(element_type)) {
goto error;
}
#include <babeltrace/ctf-ir/event-internal.h>
#include <babeltrace/ctf-ir/stream-class.h>
#include <babeltrace/ctf-ir/trace-internal.h>
+#include <babeltrace/ctf-ir/utils.h>
#include <babeltrace/compiler.h>
static
{
struct bt_ctf_event_class *event_class = NULL;
- if (validate_identifier(name)) {
+ if (bt_ctf_validate_identifier(name)) {
goto end;
}
{
int ret = 0;
- if (!event_class || !type || validate_identifier(name) ||
+ if (!event_class || !type || bt_ctf_validate_identifier(name) ||
event_class->frozen) {
ret = -1;
goto end;
{
int ret = 0;
- if (!event || !value || validate_identifier(name)) {
+ if (!event || !value || bt_ctf_validate_identifier(name)) {
ret = -1;
goto end;
}
#include <babeltrace/ctf-writer/stream.h>
#include <babeltrace/ctf-ir/stream-class-internal.h>
#include <babeltrace/ctf-writer/functor-internal.h>
+#include <babeltrace/ctf-ir/utils.h>
#include <babeltrace/compiler.h>
#include <babeltrace/align.h>
int ret;
struct bt_ctf_stream_class *stream_class = NULL;
- if (!name || !strlen(name)) {
+ if (!name || !strlen(name) || bt_ctf_validate_identifier(name)) {
goto error;
}
#include <babeltrace/ctf-ir/stream-class-internal.h>
#include <babeltrace/ctf-writer/functor-internal.h>
#include <babeltrace/ctf-ir/event-types-internal.h>
+#include <babeltrace/ctf-ir/utils.h>
#include <babeltrace/compiler.h>
#define DEFAULT_IDENTIFIER_SIZE 128
static
int init_trace_packet_header(struct bt_ctf_trace *trace);
-static
-const char * const reserved_keywords_str[] = {"align", "callsite",
- "const", "char", "clock", "double", "enum", "env", "event",
- "floating_point", "float", "integer", "int", "long", "short", "signed",
- "stream", "string", "struct", "trace", "typealias", "typedef",
- "unsigned", "variant", "void" "_Bool", "_Complex", "_Imaginary"};
-
static
const unsigned int field_type_aliases_alignments[] = {
[FIELD_TYPE_ALIAS_UINT5_T] = 1,
[FIELD_TYPE_ALIAS_UINT64_T] = 64,
};
-static GHashTable *reserved_keywords_set;
-static int init_done;
-static int global_data_refcount;
-
struct bt_ctf_trace *bt_ctf_trace_create(void)
{
struct bt_ctf_trace *trace = NULL;
char *escaped_value = NULL;
int ret = 0;
- if (!trace || !name || !value || validate_identifier(name)) {
+ if (!trace || !name || !value || bt_ctf_validate_identifier(name)) {
ret = -1;
goto error;
}
bt_ctf_ref_put(&trace->ref_count, bt_ctf_trace_destroy);
}
-BT_HIDDEN
-int validate_identifier(const char *input_string)
-{
- int ret = 0;
- char *string = NULL;
- char *save_ptr, *token;
-
- if (!input_string || input_string[0] == '\0') {
- ret = -1;
- goto end;
- }
-
- string = strdup(input_string);
- if (!string) {
- ret = -1;
- goto end;
- }
-
- token = strtok_r(string, " ", &save_ptr);
- while (token) {
- if (g_hash_table_lookup_extended(reserved_keywords_set,
- GINT_TO_POINTER(g_quark_from_string(token)),
- NULL, NULL)) {
- ret = -1;
- goto end;
- }
-
- token = strtok_r(NULL, " ", &save_ptr);
- }
-end:
- free(string);
- return ret;
-}
-
BT_HIDDEN
struct bt_ctf_field_type *get_field_type(enum field_type_alias alias)
{
g_string_free(var->value, TRUE);
g_free(var);
}
-
-static __attribute__((constructor))
-void trace_init(void)
-{
- size_t i;
- const size_t reserved_keywords_count =
- sizeof(reserved_keywords_str) / sizeof(char *);
-
- global_data_refcount++;
- if (init_done) {
- return;
- }
-
- reserved_keywords_set = g_hash_table_new(g_direct_hash, g_direct_equal);
- for (i = 0; i < reserved_keywords_count; i++) {
- gpointer quark = GINT_TO_POINTER(g_quark_from_string(
- reserved_keywords_str[i]));
-
- g_hash_table_insert(reserved_keywords_set, quark, quark);
- }
-
- init_done = 1;
-}
-
-static __attribute__((destructor))
-void trace_finalize(void)
-{
- if (--global_data_refcount == 0) {
- g_hash_table_destroy(reserved_keywords_set);
- }
-}
--- /dev/null
+/*
+ * utils.c
+ *
+ * Babeltrace CTF IR - Utilities
+ *
+ * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <string.h>
+#include <stdlib.h>
+#include <glib.h>
+
+static
+const char * const reserved_keywords_str[] = {"align", "callsite",
+ "const", "char", "clock", "double", "enum", "env", "event",
+ "floating_point", "float", "integer", "int", "long", "short", "signed",
+ "stream", "string", "struct", "trace", "typealias", "typedef",
+ "unsigned", "variant", "void" "_Bool", "_Complex", "_Imaginary"};
+
+static GHashTable *reserved_keywords_set;
+static int init_done;
+static int global_data_refcount;
+
+static __attribute__((constructor))
+void trace_init(void)
+{
+ size_t i;
+ const size_t reserved_keywords_count =
+ sizeof(reserved_keywords_str) / sizeof(char *);
+
+ global_data_refcount++;
+ if (init_done) {
+ return;
+ }
+
+ reserved_keywords_set = g_hash_table_new(g_direct_hash, g_direct_equal);
+ for (i = 0; i < reserved_keywords_count; i++) {
+ gpointer quark = GINT_TO_POINTER(g_quark_from_string(
+ reserved_keywords_str[i]));
+
+ g_hash_table_insert(reserved_keywords_set, quark, quark);
+ }
+
+ init_done = 1;
+}
+
+static __attribute__((destructor))
+void trace_finalize(void)
+{
+ if (--global_data_refcount == 0) {
+ g_hash_table_destroy(reserved_keywords_set);
+ }
+}
+
+int bt_ctf_validate_identifier(const char *input_string)
+{
+ int ret = 0;
+ char *string = NULL;
+ char *save_ptr, *token;
+
+ if (!input_string || input_string[0] == '\0') {
+ ret = -1;
+ goto end;
+ }
+
+ string = strdup(input_string);
+ if (!string) {
+ ret = -1;
+ goto end;
+ }
+
+ token = strtok_r(string, " ", &save_ptr);
+ while (token) {
+ if (g_hash_table_lookup_extended(reserved_keywords_set,
+ GINT_TO_POINTER(g_quark_from_string(token)),
+ NULL, NULL)) {
+ ret = -1;
+ goto end;
+ }
+
+ token = strtok_r(NULL, " ", &save_ptr);
+ }
+end:
+ free(string);
+ return ret;
+}
babeltrace/ctf-ir/event.h \
babeltrace/ctf-ir/stream.h \
babeltrace/ctf-ir/stream-class.h \
- babeltrace/ctf-ir/trace.h
+ babeltrace/ctf-ir/trace.h \
+ babeltrace/ctf-ir/utils.h
noinst_HEADERS = \
babeltrace/align.h \
unsigned int current_indentation_level;
};
-/* Checks that the string does not contain a reserved keyword */
-BT_HIDDEN
-int validate_identifier(const char *string);
-
BT_HIDDEN
const char *get_byte_order_string(int byte_order);
--- /dev/null
+#ifndef BABELTRACE_CTF_IR_UTILS_H
+#define BABELTRACE_CTF_IR_UTILS_H
+
+/*
+ * BabelTrace - CTF IR: Utilities
+ *
+ * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * The Common Trace Format (CTF) Specification is available at
+ * http://www.efficios.com/ctf
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * bt_ctf_validate_identifier: validate an identifier against the CTF spec.
+ *
+ * Validate that an identifier meets the CTF specification's restrictions on
+ * identifiers. An identifier will be rejected if it is a keyword defined
+ * in the CTF specification or if it does not meet any other requirement imposed
+ * on identifiers.
+ *
+ * Note that this will not check whether or not the identifier clashes with
+ * identifiers used in a given trace.
+ *
+ * Returns 0 if the identifier is valid, a negative value on error.
+ */
+extern int bt_ctf_validate_identifier(const char *identifier);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BABELTRACE_CTF_IR_UTILS_H */
projects / babeltrace.git / commitdiff
