struct declaration_integer *integer_declaration =
container_of(elem, struct declaration_integer, p);
- if (integer_declaration->encoding == CTF_STRING_UTF8
- || integer_declaration->encoding == CTF_STRING_ASCII) {
+ if (bt_int_is_char(elem)) {
+ if (!ctf_align_pos(pos, integer_declaration->p.alignment))
+ return -EFAULT;
+ if (!ctf_pos_access_ok(pos, array_declaration->len * CHAR_BIT))
+ return -EFAULT;
- if (integer_declaration->len == CHAR_BIT
- && integer_declaration->p.alignment == CHAR_BIT) {
-
- if (!ctf_align_pos(pos, integer_declaration->p.alignment))
- return -EFAULT;
- if (!ctf_pos_access_ok(pos, array_declaration->len * CHAR_BIT))
- return -EFAULT;
-
- g_string_assign(array_definition->string, "");
- g_string_insert_len(array_definition->string,
- 0, (char *) ctf_get_pos_addr(pos),
- array_declaration->len);
- /*
- * We want to populate both the string
- * and the underlying values, so carry
- * on calling bt_array_rw().
- */
- }
+ g_string_assign(array_definition->string, "");
+ g_string_insert_len(array_definition->string,
+ 0, (char *) ctf_get_pos_addr(pos),
+ array_declaration->len);
+ /*
+ * We want to populate both the string
+ * and the underlying values, so carry
+ * on calling bt_array_rw().
+ */
}
}
return bt_array_rw(ppos, definition);
struct declaration_integer *integer_declaration =
container_of(elem, struct declaration_integer, p);
- if (integer_declaration->encoding == CTF_STRING_UTF8
- || integer_declaration->encoding == CTF_STRING_ASCII) {
-
- if (integer_declaration->len == CHAR_BIT
- && integer_declaration->p.alignment == CHAR_BIT) {
-
- if (!ctf_align_pos(pos, integer_declaration->p.alignment))
- return -EFAULT;
- if (!ctf_pos_access_ok(pos, array_declaration->len * CHAR_BIT))
- return -EFAULT;
+ if (bt_int_is_char(elem)) {
+ if (!ctf_align_pos(pos, integer_declaration->p.alignment))
+ return -EFAULT;
+ if (!ctf_pos_access_ok(pos, array_declaration->len * CHAR_BIT))
+ return -EFAULT;
- memcpy((char *) ctf_get_pos_addr(pos),
- array_definition->string->str,
- array_declaration->len);
- if (!ctf_move_pos(pos, array_declaration->len * CHAR_BIT))
- return -EFAULT;
- return 0;
- }
+ memcpy((char *) ctf_get_pos_addr(pos),
+ array_definition->string->str,
+ array_declaration->len);
+ if (!ctf_move_pos(pos, array_declaration->len * CHAR_BIT))
+ return -EFAULT;
+ return 0;
}
}
return bt_array_rw(ppos, definition);
struct declaration_integer *integer_declaration =
container_of(elem, struct declaration_integer, p);
- if (integer_declaration->encoding == CTF_STRING_UTF8
- || integer_declaration->encoding == CTF_STRING_ASCII) {
+ if (bt_int_is_char(elem)) {
+ uint64_t len = bt_sequence_len(sequence_definition);
- if (integer_declaration->len == CHAR_BIT
- && integer_declaration->p.alignment == CHAR_BIT) {
- uint64_t len = bt_sequence_len(sequence_definition);
+ if (!ctf_align_pos(pos, integer_declaration->p.alignment))
+ return -EFAULT;
+ if (!ctf_pos_access_ok(pos, len * CHAR_BIT))
+ return -EFAULT;
- if (!ctf_align_pos(pos, integer_declaration->p.alignment))
- return -EFAULT;
- if (!ctf_pos_access_ok(pos, len * CHAR_BIT))
- return -EFAULT;
-
- g_string_assign(sequence_definition->string, "");
- g_string_insert_len(sequence_definition->string,
- 0, (char *) ctf_get_pos_addr(pos), len);
- if (!ctf_move_pos(pos, len * CHAR_BIT))
- return -EFAULT;
- return 0;
- }
+ g_string_assign(sequence_definition->string, "");
+ g_string_insert_len(sequence_definition->string,
+ 0, (char *) ctf_get_pos_addr(pos), len);
}
}
return bt_sequence_rw(ppos, definition);
struct declaration_integer *integer_declaration =
container_of(elem, struct declaration_integer, p);
- if (integer_declaration->encoding == CTF_STRING_UTF8
- || integer_declaration->encoding == CTF_STRING_ASCII) {
-
- if (integer_declaration->len == CHAR_BIT
- && integer_declaration->p.alignment == CHAR_BIT) {
- uint64_t len = bt_sequence_len(sequence_definition);
+ if (bt_int_is_char(elem)) {
+ uint64_t len = bt_sequence_len(sequence_definition);
- if (!ctf_align_pos(pos, integer_declaration->p.alignment))
- return -EFAULT;
- if (!ctf_pos_access_ok(pos, len * CHAR_BIT))
- return -EFAULT;
+ if (!ctf_align_pos(pos, integer_declaration->p.alignment))
+ return -EFAULT;
+ if (!ctf_pos_access_ok(pos, len * CHAR_BIT))
+ return -EFAULT;
- memcpy((char *) ctf_get_pos_addr(pos),
- sequence_definition->string->str, len);
- if (!ctf_move_pos(pos, len * CHAR_BIT))
- return -EFAULT;
- return 0;
- }
+ memcpy((char *) ctf_get_pos_addr(pos),
+ sequence_definition->string->str, len);
+ if (!ctf_move_pos(pos, len * CHAR_BIT))
+ return -EFAULT;
+ return 0;
}
}
return bt_sequence_rw(ppos, definition);
int bt_get_int_byte_order(const struct bt_definition *field);
int bt_get_int_base(const struct bt_definition *field);
size_t bt_get_int_len(const struct bt_definition *field); /* in bits */
+bool bt_int_is_char(const struct bt_declaration *field);
enum ctf_string_encoding bt_get_int_encoding(const struct bt_definition *field);
/*
array->string = NULL;
array->elems = NULL;
- if (array_declaration->elem->id == CTF_TYPE_INTEGER) {
- struct declaration_integer *integer_declaration =
- container_of(array_declaration->elem, struct declaration_integer, p);
-
- if (integer_declaration->encoding == CTF_STRING_UTF8
- || integer_declaration->encoding == CTF_STRING_ASCII) {
-
- array->string = g_string_new("");
- }
+ if (array_declaration->elem->id == CTF_TYPE_INTEGER &&
+ bt_int_is_char(array_declaration->elem)) {
+ array->string = g_string_new("");
}
array->elems = g_ptr_array_sized_new(array_declaration->len);
array_definition = container_of(field, struct definition_array, p);
array_declaration = array_definition->declaration;
elem = array_declaration->elem;
- if (elem->id == CTF_TYPE_INTEGER) {
- struct declaration_integer *integer_declaration =
- container_of(elem, struct declaration_integer, p);
-
- if (integer_declaration->encoding == CTF_STRING_UTF8
- || integer_declaration->encoding == CTF_STRING_ASCII) {
-
- if (integer_declaration->len == CHAR_BIT
- && integer_declaration->p.alignment == CHAR_BIT) {
-
- return array_definition->string;
- }
- }
+ if (elem->id == CTF_TYPE_INTEGER && bt_int_is_char(elem)) {
+ return array_definition->string;
}
fprintf(stderr, "[warning] Extracting string\n");
return NULL;
g_quark_to_string(field->name));
return (int64_t)integer_definition->value._unsigned;
}
+
+bool bt_int_is_char(const struct bt_declaration *field)
+{
+ bool ret;
+ struct declaration_integer *integer_declaration =
+ container_of(field, struct declaration_integer, p);
+
+ /* Integer must be ASCII or encoded as UTF-8. */
+ ret = integer_declaration->encoding == CTF_STRING_UTF8 ||
+ integer_declaration->encoding == CTF_STRING_ASCII;
+ /* Integer must be aligned on a byte boundary and be byte-sized. */
+ ret &= integer_declaration->len == CHAR_BIT &&
+ integer_declaration->p.alignment == CHAR_BIT;
+
+ return ret;
+}
sequence->string = NULL;
sequence->elems = NULL;
- if (sequence_declaration->elem->id == CTF_TYPE_INTEGER) {
- struct declaration_integer *integer_declaration =
- container_of(sequence_declaration->elem, struct declaration_integer, p);
-
- if (integer_declaration->encoding == CTF_STRING_UTF8
- || integer_declaration->encoding == CTF_STRING_ASCII) {
-
- sequence->string = g_string_new("");
-
- if (integer_declaration->len == CHAR_BIT
- && integer_declaration->p.alignment == CHAR_BIT) {
- return &sequence->p;
- }
- }
+ if (sequence_declaration->elem->id == CTF_TYPE_INTEGER &&
+ bt_int_is_char(sequence_declaration->elem)) {
+ sequence->string = g_string_new("");
}
sequence->elems = g_ptr_array_new();