From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 9 Feb 2012 21:05:15 +0000 (-0500)
Subject: Fix clock freq
X-Git-Tag: v0.10~1
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=bf94ab2bcad1aa584a1ecc763ce390d583b62f0c

Fix clock freq

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

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index 5b26ec66..2d3361cb 100644
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -2160,7 +2160,7 @@ int ctf_clock_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
 			}
 			clock->name = g_quark_from_string(right);
 			g_free(right);
-			CTF_EVENT_SET_FIELD(clock, name);
+			CTF_CLOCK_SET_FIELD(clock, name);
 		} else if (!strcmp(left, "uuid")) {
 			char *right;
 
@@ -2191,7 +2191,7 @@ int ctf_clock_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
 			}
 			clock->description = right;
 		} else if (!strcmp(left, "freq")) {
-			if (clock->freq) {
+			if (CTF_CLOCK_FIELD_IS_SET(clock, freq)) {
 				fprintf(fd, "[error] %s: freq already declared in clock declaration\n", __func__);
 				ret = -EPERM;
 				goto error;
@@ -2202,6 +2202,7 @@ int ctf_clock_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
 				ret = -EINVAL;
 				goto error;
 			}
+			CTF_CLOCK_SET_FIELD(clock, freq);
 		} else if (!strcmp(left, "precision")) {
 			if (clock->precision) {
 				fprintf(fd, "[error] %s: precision already declared in clock declaration\n", __func__);
diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index 79af77a7..29d0fd49 100644
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -95,6 +95,7 @@ struct ctf_clock {
 
 	enum {					/* Fields populated mask */
 		CTF_CLOCK_name		=	(1U << 0),
+		CTF_CLOCK_freq		=	(1U << 1),
 	} field_mask;
 };