The CTF plugin source components now remove the `_` prefix from field
names, so that other downstream components should not expect it as it's
an escaping mechanism in CTF 1.8.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
int ret = 0;
ip_field = bt_field_type_structure_get_field_type_by_name(
int ret = 0;
ip_field = bt_field_type_structure_get_field_type_by_name(
- writer_event_context_type, "_ip");
+ writer_event_context_type, IP_FIELD_NAME);
/* No ip field, so no debug info. */
if (!ip_field) {
goto end;
/* No ip field, so no debug info. */
if (!ip_field) {
goto end;
int ret;
ret = get_stream_event_context_int_field_value(err, event,
int ret;
ret = get_stream_event_context_int_field_value(err, event,
+ VPID_FIELD_NAME, &vpid);
if (ret) {
goto end;
}
ret = get_stream_event_context_unsigned_int_field_value(err, event,
if (ret) {
goto end;
}
ret = get_stream_event_context_unsigned_int_field_value(err, event,
uint64_t build_id_len;
ret = get_stream_event_context_int_field_value(err,
uint64_t build_id_len;
ret = get_stream_event_context_int_field_value(err,
- event, "_vpid", &vpid);
+ event, VPID_FIELD_NAME, &vpid);
if (ret) {
goto end;
}
ret = get_payload_unsigned_int_field_value(err,
if (ret) {
goto end;
}
ret = get_payload_unsigned_int_field_value(err,
- event, "_baddr", &baddr);
+ event, BADDR_FIELD_NAME, &baddr);
- BT_LOGE_STR("Failed to get unsigned int value for _vpid field.");
+ BT_LOGE_STR("Failed to get unsigned int value for "
+ VPID_FIELD_NAME " field.");
- ret = get_payload_build_id_field_value(err, event, "_build_id",
+ ret = get_payload_build_id_field_value(err, event, BUILD_ID_FIELD_NAME,
&bin->build_id, &build_id_len);
if (ret) {
&bin->build_id, &build_id_len);
if (ret) {
- BT_LOGE_STR("Failed to get _build_id field value.");
+ BT_LOGE_STR("Failed to get " BUILD_ID_FIELD_NAME
+ " field value.");
goto end;
}
if (build_id_len > SIZE_MAX) {
goto end;
}
if (build_id_len > SIZE_MAX) {
int ret;
ret = get_stream_event_context_int_field_value(err, event,
int ret;
ret = get_stream_event_context_int_field_value(err, event,
+ VPID_FIELD_NAME, &vpid);
if (ret) {
goto end;
}
ret = get_payload_unsigned_int_field_value(err,
if (ret) {
goto end;
}
ret = get_payload_unsigned_int_field_value(err,
- event, "_baddr", &baddr);
+ event, BADDR_FIELD_NAME, &baddr);
- BT_LOGE_STR("Failed to get unsigned int value for _baddr field.");
+ BT_LOGE_STR("Failed to get unsigned int value for "
+ BADDR_FIELD_NAME " field.");
- ret = get_payload_unsigned_int_field_value(err, event, "_crc32", &tmp);
+ ret = get_payload_unsigned_int_field_value(err, event, CRC32_FIELD_NAME,
+ &tmp);
- BT_LOGE_STR("Failed to get unsigned int value for _crc32 field.");
+ BT_LOGE_STR("Failed to get unsigned int value for "
+ CRC32_FIELD_NAME " field.");
ret = -1;
goto end;
}
crc32 = (uint32_t) tmp;
ret = get_payload_string_field_value(err,
ret = -1;
goto end;
}
crc32 = (uint32_t) tmp;
ret = get_payload_string_field_value(err,
- event, "_filename", &filename);
+ event, FILENAME_FIELD_NAME, &filename);
- BT_LOGE_STR("Failed to get string value for _filename field.");
+ BT_LOGE_STR("Failed to get string value for "
+ FILENAME_FIELD_NAME " field.");
int ret;
ret = get_payload_unsigned_int_field_value(err,
int ret;
ret = get_payload_unsigned_int_field_value(err,
- event, "_baddr", &baddr);
+ event, BADDR_FIELD_NAME, &baddr);
- BT_LOGE_STR("Failed to get unsigned int value for _baddr field.");
+ BT_LOGE_STR("Failed to get unsigned int value for "
+ BADDR_FIELD_NAME " field.");
goto end;
}
ret = get_payload_unsigned_int_field_value(err,
goto end;
}
ret = get_payload_unsigned_int_field_value(err,
- event, "_memsz", &memsz);
+ event, MEMSZ_FIELD_NAME, &memsz);
- BT_LOGE_STR("Failed to get unsigned int value for _memsz field.");
+ BT_LOGE_STR("Failed to get unsigned int value for "
+ MEMSZ_FIELD_NAME " field.");
* lttng-ust 2.9.
*/
ret = get_payload_string_field_value(err,
* lttng-ust 2.9.
*/
ret = get_payload_string_field_value(err,
- event, "_path", &path);
+ event, PATH_FIELD_NAME, &path);
if (ret || !path) {
goto end;
}
if (ret || !path) {
goto end;
}
uint64_t tmp;
ret = get_payload_unsigned_int_field_value(err,
uint64_t tmp;
ret = get_payload_unsigned_int_field_value(err,
- event, "_is_pic", &tmp);
+ event, IS_PIC_FIELD_NAME, &tmp);
- BT_LOGE_STR("Failed to get unsigned int value for _is_pic field.");
+ BT_LOGE_STR("Failed to get unsigned int value for "
+ IS_PIC_FIELD_NAME " field.");
- ret = get_stream_event_context_int_field_value(err, event, "_vpid",
- &vpid);
+ ret = get_stream_event_context_int_field_value(err, event,
+ VPID_FIELD_NAME, &vpid);
int ret;
ret = get_payload_unsigned_int_field_value(err,
int ret;
ret = get_payload_unsigned_int_field_value(err,
- event, "_baddr", &baddr);
+ event, BADDR_FIELD_NAME, &baddr);
- BT_LOGE_STR("Failed to get unsigned int value for _baddr field.");
+ BT_LOGE_STR("Failed to get unsigned int value for "
+ BADDR_FIELD_NAME " field.");
- ret = get_stream_event_context_int_field_value(err, event, "_vpid",
- &vpid);
+ ret = get_stream_event_context_int_field_value(err, event,
+ VPID_FIELD_NAME, &vpid);
int ret;
ret = get_stream_event_context_int_field_value(err, event,
int ret;
ret = get_stream_event_context_int_field_value(err, event,
+ VPID_FIELD_NAME, &vpid);
#include <babeltrace/babeltrace-internal.h>
#include <babeltrace/babeltrace.h>
#include <babeltrace/babeltrace-internal.h>
#include <babeltrace/babeltrace.h>
+#define VPID_FIELD_NAME "vpid"
+#define IP_FIELD_NAME "ip"
+#define BADDR_FIELD_NAME "baddr"
+#define CRC32_FIELD_NAME "crc32"
+#define BUILD_ID_FIELD_NAME "build_id"
+#define FILENAME_FIELD_NAME "filename"
+#define IS_PIC_FIELD_NAME "is_pic"
+#define MEMSZ_FIELD_NAME "memsz"
+#define PATH_FIELD_NAME "path"
+
enum debug_info_stream_state {
/*
* We know the stream exists but we have never received a
enum debug_info_stream_state {
/*
* We know the stream exists but we have never received a