#include <glib.h>
#include "common/common.h"
#include "common/uuid.h"
-#include <babeltrace2/trace-ir/event-const.h>
-#include <babeltrace2/trace-ir/packet-const.h>
-#include <babeltrace2/trace-ir/stream-const.h>
-#include <babeltrace2/current-thread.h>
+#include <babeltrace2/babeltrace.h>
#include "logging.h"
#include "assert-pre.h"
#include "assert-post.h"
#include "value.h"
+#include "integer-range-set.h"
#include "object-pool.h"
+#include "graph/interrupter.h"
#include "graph/component-class.h"
#include "graph/component-class-sink-colander.h"
#include "graph/component-filter.h"
}
case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
{
- const struct bt_field_class_static_array *array_fc =
+ const struct bt_field_class_array_static *array_fc =
(const void *) field_class;
format_array_field_class(buf_ch, extended, prefix, field_class);
}
case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
{
- const struct bt_field_class_dynamic_array *array_fc =
+ const struct bt_field_class_array_dynamic *array_fc =
(const void *) field_class;
format_array_field_class(buf_ch, extended, prefix, field_class);
break;
}
- case BT_FIELD_CLASS_TYPE_VARIANT:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR:
{
const struct bt_field_class_variant *var_fc =
(const void *) field_class;
PRFIELD(var_fc->common.named_fcs->len));
}
- if (var_fc->selector_fc) {
- SET_TMP_PREFIX("selector-fc-");
- format_field_class(buf_ch, extended, tmp_prefix,
- var_fc->selector_fc);
- }
+ if (field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR ||
+ field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR) {
+ const struct bt_field_class_variant_with_selector *var_with_sel_fc =
+ (const void *) var_fc;
- if (var_fc->selector_field_path) {
- SET_TMP_PREFIX("selector-field-path-");
- format_field_path(buf_ch, extended, tmp_prefix,
- var_fc->selector_field_path);
+ if (var_with_sel_fc->selector_fc) {
+ SET_TMP_PREFIX("selector-fc-");
+ format_field_class(buf_ch, extended, tmp_prefix,
+ var_with_sel_fc->selector_fc);
+ }
+
+ if (var_with_sel_fc->selector_field_path) {
+ SET_TMP_PREFIX("selector-field-path-");
+ format_field_path(buf_ch, extended, tmp_prefix,
+ var_with_sel_fc->selector_field_path);
+ }
}
break;
break;
}
- case BT_FIELD_CLASS_TYPE_VARIANT:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR:
{
const struct bt_field_variant *var_field = (const void *) field;
}
}
+static inline void format_interrupter(char **buf_ch, bool extended,
+ const char *prefix, const struct bt_interrupter *intr)
+{
+ BUF_APPEND(", %sis-set=%d", PRFIELD(intr->is_set));
+}
+
static inline void format_value(char **buf_ch, bool extended,
const char *prefix, const struct bt_value *value)
{
case BT_VALUE_TYPE_UNSIGNED_INTEGER:
{
BUF_APPEND(", %svalue=%" PRIu64,
- PRFIELD(bt_value_unsigned_integer_get(value)));
+ PRFIELD(bt_value_integer_unsigned_get(value)));
break;
}
case BT_VALUE_TYPE_SIGNED_INTEGER:
{
BUF_APPEND(", %svalue=%" PRId64,
- PRFIELD(bt_value_signed_integer_get(value)));
+ PRFIELD(bt_value_integer_signed_get(value)));
break;
}
case BT_VALUE_TYPE_REAL:
}
}
+static inline void format_integer_range_set(char **buf_ch, bool extended,
+ const char *prefix,
+ const struct bt_integer_range_set *range_set)
+{
+ BUF_APPEND(", %srange-count=%u", PRFIELD(range_set->ranges->len));
+
+ if (!extended) {
+ return;
+ }
+
+ BUF_APPEND(", %sis-frozen=%d", PRFIELD(range_set->frozen));
+}
+
static inline void format_message(char **buf_ch, bool extended,
const char *prefix, const struct bt_message *msg)
{
{
char tmp_prefix[TMP_PREFIX_LEN];
- BUF_APPEND(", %sis-canceled=%d, %scan-consume=%d, "
- "%sconfig-state=%s",
- PRFIELD(graph->canceled),
+ BUF_APPEND(", %scan-consume=%d, %sconfig-state=%s",
PRFIELD(graph->can_consume),
PRFIELD(bt_graph_configuration_state_string(graph->config_state)));
bool extended, const char *prefix,
const struct bt_message_iterator *iterator)
{
- const char *type;
char tmp_prefix[TMP_PREFIX_LEN];
+ const struct bt_self_component_port_input_message_iterator *
+ port_in_iter = (const void *) iterator;
- if (iterator->type == BT_MESSAGE_ITERATOR_TYPE_SELF_COMPONENT_PORT_INPUT) {
- type = "BT_MESSAGE_ITERATOR_TYPE_SELF_COMPONENT_PORT_INPUT";
- } else if (iterator->type == BT_MESSAGE_ITERATOR_TYPE_PORT_OUTPUT) {
- type = "BT_MESSAGE_ITERATOR_TYPE_PORT_OUTPUT";
- } else {
- type = "(unknown)";
+ if (port_in_iter->upstream_component) {
+ SET_TMP_PREFIX("upstream-comp-");
+ format_component(buf_ch, false, tmp_prefix,
+ port_in_iter->upstream_component);
}
- BUF_APPEND(", %stype=%s", PRFIELD(type));
-
- switch (iterator->type) {
- case BT_MESSAGE_ITERATOR_TYPE_SELF_COMPONENT_PORT_INPUT:
- {
- const struct bt_self_component_port_input_message_iterator *
- port_in_iter = (const void *) iterator;
-
- if (port_in_iter->upstream_component) {
- SET_TMP_PREFIX("upstream-comp-");
- format_component(buf_ch, false, tmp_prefix,
- port_in_iter->upstream_component);
- }
-
- if (port_in_iter->upstream_port) {
- SET_TMP_PREFIX("upstream-port-");
- format_port(buf_ch, false, tmp_prefix,
- port_in_iter->upstream_port);
- }
-
- if (port_in_iter->connection) {
- SET_TMP_PREFIX("upstream-conn-");
- format_connection(buf_ch, false, tmp_prefix,
- port_in_iter->connection);
- }
- break;
+ if (!extended) {
+ goto end;
}
- case BT_MESSAGE_ITERATOR_TYPE_PORT_OUTPUT:
- {
- const struct bt_port_output_message_iterator *port_out_iter =
- (const void *) iterator;
- if (port_out_iter->graph) {
- SET_TMP_PREFIX("graph-");
- format_graph(buf_ch, false, tmp_prefix,
- port_out_iter->graph);
- }
-
- if (port_out_iter->colander) {
- SET_TMP_PREFIX("colander-comp-");
- format_component(buf_ch, false, tmp_prefix,
- (void *) port_out_iter->colander);
- }
-
- break;
+ if (port_in_iter->upstream_port) {
+ SET_TMP_PREFIX("upstream-port-");
+ format_port(buf_ch, false, tmp_prefix,
+ port_in_iter->upstream_port);
}
- default:
- break;
+
+ if (port_in_iter->connection) {
+ SET_TMP_PREFIX("upstream-conn-");
+ format_connection(buf_ch, false, tmp_prefix,
+ port_in_iter->connection);
}
+
+end:
+ return;
}
static inline void format_plugin(char **buf_ch, bool extended,
case 'v':
format_value(buf_ch, extended, prefix, obj);
break;
+ case 'R':
+ format_integer_range_set(buf_ch, extended, prefix, obj);
+ break;
case 'n':
format_message(buf_ch, extended, prefix, obj);
break;
case 'g':
format_graph(buf_ch, extended, prefix, obj);
break;
+ case 'z':
+ format_interrupter(buf_ch, extended, prefix, obj);
+ break;
case 'o':
format_object_pool(buf_ch, extended, prefix, obj);
break;
projects / babeltrace.git / blobdiff