projects
/
babeltrace.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a21d1cb
)
lib: add aliases for Babeltrace enumeration types
author
Philippe Proulx
<eeppeliteloop@gmail.com>
Sat, 8 Dec 2018 21:09:46 +0000
(16:09 -0500)
committer
Francis Deslauriers
<francis.deslauriers@efficios.com>
Thu, 2 May 2019 20:50:15 +0000
(20:50 +0000)
And uses aliases in CLI, plugins, and tests.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
104 files changed:
cli/babeltrace-cfg-cli-args.c
patch
|
blob
|
blame
|
history
cli/babeltrace-cfg.h
patch
|
blob
|
blame
|
history
cli/babeltrace.c
patch
|
blob
|
blame
|
history
include/babeltrace/graph/component-class-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/component-class-filter.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/component-class-sink.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/component-class-source.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/component-class.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/component-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/graph-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/graph.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/message-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/message-inactivity-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/message-iterator.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/message-stream-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/port-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/port-input-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/port-output-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/port-output-message-iterator.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/query-executor-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/query-executor.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/self-component-filter.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/self-component-port-input-message-iterator.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/self-component-port-input.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/self-component-port-output.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/self-component-port.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/self-component-sink.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/self-component-source.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/self-component.h
patch
|
blob
|
blame
|
history
include/babeltrace/graph/self-message-iterator.h
patch
|
blob
|
blame
|
history
include/babeltrace/logging.h
patch
|
blob
|
blame
|
history
include/babeltrace/plugin/plugin-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/plugin/plugin-dev.h
patch
|
blob
|
blame
|
history
include/babeltrace/property.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/clock-class-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/clock-class.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/clock-snapshot-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/event-class-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/event-class.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/event-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/event.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/field-class-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/field-class.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/field-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/field-path-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/field.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/packet-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/packet.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/stream-class-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/stream-class.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/stream-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/stream.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/trace-class-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/trace-class.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/trace-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/trace-ir/trace.h
patch
|
blob
|
blame
|
history
include/babeltrace/value-const.h
patch
|
blob
|
blame
|
history
include/babeltrace/value.h
patch
|
blob
|
blame
|
history
plugins/ctf/common/metadata/ctf-meta-resolve.c
patch
|
blob
|
blame
|
history
plugins/ctf/common/metadata/ctf-meta.h
patch
|
blob
|
blame
|
history
plugins/ctf/common/metadata/visitor-generate-ir.c
patch
|
blob
|
blame
|
history
plugins/ctf/fs-sink/write.c
patch
|
blob
|
blame
|
history
plugins/ctf/fs-sink/writer.c
patch
|
blob
|
blame
|
history
plugins/ctf/fs-sink/writer.h
patch
|
blob
|
blame
|
history
plugins/ctf/fs-src/data-stream-file.c
patch
|
blob
|
blame
|
history
plugins/ctf/fs-src/data-stream-file.h
patch
|
blob
|
blame
|
history
plugins/ctf/fs-src/fs.c
patch
|
blob
|
blame
|
history
plugins/ctf/fs-src/fs.h
patch
|
blob
|
blame
|
history
plugins/ctf/fs-src/query.c
patch
|
blob
|
blame
|
history
plugins/ctf/fs-src/query.h
patch
|
blob
|
blame
|
history
plugins/ctf/lttng-live/data-stream.c
patch
|
blob
|
blame
|
history
plugins/ctf/lttng-live/data-stream.h
patch
|
blob
|
blame
|
history
plugins/ctf/lttng-live/lttng-live-internal.h
patch
|
blob
|
blame
|
history
plugins/ctf/lttng-live/lttng-live.c
patch
|
blob
|
blame
|
history
plugins/ctf/lttng-live/metadata.c
patch
|
blob
|
blame
|
history
plugins/ctf/lttng-live/metadata.h
patch
|
blob
|
blame
|
history
plugins/ctf/lttng-live/viewer-connection.c
patch
|
blob
|
blame
|
history
plugins/libctfcopytrace/ctfcopytrace.c
patch
|
blob
|
blame
|
history
plugins/libctfcopytrace/ctfcopytrace.h
patch
|
blob
|
blame
|
history
plugins/lttng-utils/copy.c
patch
|
blob
|
blame
|
history
plugins/lttng-utils/plugin.c
patch
|
blob
|
blame
|
history
plugins/text/dmesg/dmesg.c
patch
|
blob
|
blame
|
history
plugins/text/dmesg/dmesg.h
patch
|
blob
|
blame
|
history
plugins/text/pretty/pretty.c
patch
|
blob
|
blame
|
history
plugins/text/pretty/pretty.h
patch
|
blob
|
blame
|
history
plugins/text/pretty/print.c
patch
|
blob
|
blame
|
history
plugins/utils/counter/counter.c
patch
|
blob
|
blame
|
history
plugins/utils/counter/counter.h
patch
|
blob
|
blame
|
history
plugins/utils/dummy/dummy.c
patch
|
blob
|
blame
|
history
plugins/utils/dummy/dummy.h
patch
|
blob
|
blame
|
history
plugins/utils/muxer/muxer.c
patch
|
blob
|
blame
|
history
plugins/utils/muxer/muxer.h
patch
|
blob
|
blame
|
history
plugins/utils/trimmer/copy.c
patch
|
blob
|
blame
|
history
plugins/utils/trimmer/copy.h
patch
|
blob
|
blame
|
history
plugins/utils/trimmer/iterator.c
patch
|
blob
|
blame
|
history
plugins/utils/trimmer/iterator.h
patch
|
blob
|
blame
|
history
plugins/utils/trimmer/trimmer.c
patch
|
blob
|
blame
|
history
plugins/utils/trimmer/trimmer.h
patch
|
blob
|
blame
|
history
tests/lib/test-plugin-plugins/minimal.c
patch
|
blob
|
blame
|
history
tests/lib/test-plugin-plugins/sfs.c
patch
|
blob
|
blame
|
history
tests/lib/test_bt_message_iterator.c
patch
|
blob
|
blame
|
history
tests/lib/test_bt_values.c
patch
|
blob
|
blame
|
history
tests/lib/test_graph_topo.c
patch
|
blob
|
blame
|
history
tests/lib/test_plugin.c
patch
|
blob
|
blame
|
history
diff --git
a/cli/babeltrace-cfg-cli-args.c
b/cli/babeltrace-cfg-cli-args.c
index 1a41bcbf29859707cf45c772521d931c7a42f488..c3d7250d737c63122e35256d606f4ddb07e55405 100644
(file)
--- a/
cli/babeltrace-cfg-cli-args.c
+++ b/
cli/babeltrace-cfg-cli-args.c
@@
-596,7
+596,7
@@
end:
*/
static
void plugin_comp_cls_names(const char *arg, char **name, char **plugin,
*/
static
void plugin_comp_cls_names(const char *arg, char **name, char **plugin,
- char **comp_cls,
enum
bt_component_class_type *comp_cls_type)
+ char **comp_cls, bt_component_class_type *comp_cls_type)
{
const char *at = arg;
GString *gs_name = NULL;
{
const char *at = arg;
GString *gs_name = NULL;
@@
-775,7
+775,7
@@
end:
*/
static
struct bt_config_component *bt_config_component_create(
*/
static
struct bt_config_component *bt_config_component_create(
-
enum
bt_component_class_type type,
+ bt_component_class_type type,
const char *plugin_name, const char *comp_cls_name)
{
struct bt_config_component *cfg_component = NULL;
const char *plugin_name, const char *comp_cls_name)
{
struct bt_config_component *cfg_component = NULL;
@@
-834,7
+834,7
@@
struct bt_config_component *bt_config_component_from_arg(const char *arg)
char *name = NULL;
char *plugin_name = NULL;
char *comp_cls_name = NULL;
char *name = NULL;
char *plugin_name = NULL;
char *comp_cls_name = NULL;
-
enum
bt_component_class_type type;
+ bt_component_class_type type;
plugin_comp_cls_names(arg, &name, &plugin_name, &comp_cls_name, &type);
if (!plugin_name || !comp_cls_name) {
plugin_comp_cls_names(arg, &name, &plugin_name, &comp_cls_name, &type);
if (!plugin_name || !comp_cls_name) {
@@
-2379,7
+2379,7
@@
struct bt_config *bt_config_run_from_args(int argc, const char *argv[],
GString *cur_param_key = NULL;
char error_buf[256] = { 0 };
long retry_duration = -1;
GString *cur_param_key = NULL;
char error_buf[256] = { 0 };
long retry_duration = -1;
-
enum
bt_value_status status;
+ bt_value_status status;
struct poptOption run_long_options[] = {
{ "base-params", 'b', POPT_ARG_STRING, NULL, OPT_BASE_PARAMS, NULL, NULL },
{ "component", 'c', POPT_ARG_STRING, NULL, OPT_COMPONENT, NULL, NULL },
struct poptOption run_long_options[] = {
{ "base-params", 'b', POPT_ARG_STRING, NULL, OPT_BASE_PARAMS, NULL, NULL },
{ "component", 'c', POPT_ARG_STRING, NULL, OPT_COMPONENT, NULL, NULL },
@@
-3518,7
+3518,7
@@
int fill_implicit_ctf_inputs_args(GPtrArray *implicit_ctf_inputs_args,
{
int ret = 0;
GList *leftover;
{
int ret = 0;
GList *leftover;
-
enum
bt_value_status status;
+ bt_value_status status;
for (leftover = leftovers; leftover != NULL;
leftover = g_list_next(leftover)) {
for (leftover = leftovers; leftover != NULL;
leftover = g_list_next(leftover)) {
@@
-3737,7
+3737,7
@@
struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
switch (opt) {
case OPT_COMPONENT:
{
switch (opt) {
case OPT_COMPONENT:
{
-
enum
bt_component_class_type type;
+ bt_component_class_type type;
const char *type_prefix;
/* Append current component's name if needed */
const char *type_prefix;
/* Append current component's name if needed */
diff --git
a/cli/babeltrace-cfg.h
b/cli/babeltrace-cfg.h
index 7ccf9515580493e0816c2f9ab9481b7c6617a083..6d98cd3398daa9803841e817ba22a268beda3d60 100644
(file)
--- a/
cli/babeltrace-cfg.h
+++ b/
cli/babeltrace-cfg.h
@@
-45,7
+45,7
@@
enum bt_config_command {
struct bt_config_component {
bt_object base;
struct bt_config_component {
bt_object base;
-
enum
bt_component_class_type type;
+ bt_component_class_type type;
GString *plugin_name;
GString *comp_cls_name;
bt_value *params;
GString *plugin_name;
GString *comp_cls_name;
bt_value *params;
diff --git
a/cli/babeltrace.c
b/cli/babeltrace.c
index 5abbcd0d8c065a3a3c51966f367de2245b66b6c6..29f811f4e9c804d7e4855c85f666df4252c86a4b 100644
(file)
--- a/
cli/babeltrace.c
+++ b/
cli/babeltrace.c
@@
-174,7
+174,7
@@
int query(const bt_component_class *comp_cls, const char *obj,
const char **fail_reason)
{
const bt_value *result = NULL;
const char **fail_reason)
{
const bt_value *result = NULL;
-
enum
bt_query_executor_status status;
+ bt_query_executor_status status;
*fail_reason = "unknown error";
int ret = 0;
*fail_reason = "unknown error";
int ret = 0;
@@
-360,7
+360,7
@@
const bt_component_class_sink *find_sink_component_class(
static
const bt_component_class *find_component_class(const char *plugin_name,
const char *comp_class_name,
static
const bt_component_class *find_component_class(const char *plugin_name,
const char *comp_class_name,
-
enum
bt_component_class_type comp_class_type)
+ bt_component_class_type comp_class_type)
{
const bt_component_class *comp_cls = NULL;
{
const bt_component_class *comp_cls = NULL;
@@
-392,7
+392,7
@@
void print_indent(FILE *fp, size_t indent)
}
static
}
static
-const char *component_type_str(
enum
bt_component_class_type type)
+const char *component_type_str(bt_component_class_type type)
{
switch (type) {
case BT_COMPONENT_CLASS_TYPE_SOURCE:
{
switch (type) {
case BT_COMPONENT_CLASS_TYPE_SOURCE:
@@
-408,7
+408,7
@@
const char *component_type_str(enum bt_component_class_type type)
static
void print_plugin_comp_cls_opt(FILE *fh, const char *plugin_name,
static
void print_plugin_comp_cls_opt(FILE *fh, const char *plugin_name,
- const char *comp_cls_name,
enum
bt_component_class_type type)
+ const char *comp_cls_name, bt_component_class_type type)
{
GString *shell_plugin_name = NULL;
GString *shell_comp_cls_name = NULL;
{
GString *shell_plugin_name = NULL;
GString *shell_comp_cls_name = NULL;
@@
-883,7
+883,7
@@
void print_plugin_info(const bt_plugin *plugin)
{
unsigned int major, minor, patch;
const char *extra;
{
unsigned int major, minor, patch;
const char *extra;
-
enum
bt_property_availability version_avail;
+ bt_property_availability version_avail;
const char *plugin_name;
const char *path;
const char *author;
const char *plugin_name;
const char *path;
const char *author;
@@
-1010,7
+1010,7
@@
void print_component_class_help(const char *plugin_name,
bt_component_class_get_description(comp_cls);
const char *comp_class_help =
bt_component_class_get_help(comp_cls);
bt_component_class_get_description(comp_cls);
const char *comp_class_help =
bt_component_class_get_help(comp_cls);
-
enum
bt_component_class_type type =
+ bt_component_class_type type =
bt_component_class_get_type(comp_cls);
print_plugin_comp_cls_opt(stdout, plugin_name, comp_class_name, type);
bt_component_class_get_type(comp_cls);
print_plugin_comp_cls_opt(stdout, plugin_name, comp_class_name, type);
@@
-1128,7
+1128,7
@@
void cmd_list_plugins_print_component_classes(const bt_plugin *plugin,
bt_component_class_get_name(comp_class);
const char *comp_class_description =
bt_component_class_get_description(comp_class);
bt_component_class_get_name(comp_class);
const char *comp_class_description =
bt_component_class_get_description(comp_class);
-
enum
bt_component_class_type type =
+ bt_component_class_type type =
bt_component_class_get_type(comp_class);
printf(" ");
bt_component_class_get_type(comp_class);
printf(" ");
@@
-1219,7
+1219,7
@@
int cmd_print_lttng_live_sessions(struct bt_config *cfg)
const bt_value *v = NULL;
static const char * const plugin_name = "ctf";
static const char * const comp_cls_name = "lttng-live";
const bt_value *v = NULL;
static const char * const plugin_name = "ctf";
static const char * const comp_cls_name = "lttng-live";
- static const
enum
bt_component_class_type comp_cls_type =
+ static const bt_component_class_type comp_cls_type =
BT_COMPONENT_CLASS_TYPE_SOURCE;
int64_t array_size, i;
const char *fail_reason = NULL;
BT_COMPONENT_CLASS_TYPE_SOURCE;
int64_t array_size, i;
const char *fail_reason = NULL;
@@
-1371,7
+1371,7
@@
int cmd_print_ctf_metadata(struct bt_config *cfg)
const char *metadata_text = NULL;
static const char * const plugin_name = "ctf";
static const char * const comp_cls_name = "fs";
const char *metadata_text = NULL;
static const char * const plugin_name = "ctf";
static const char * const comp_cls_name = "fs";
- static const
enum
bt_component_class_type comp_cls_type =
+ static const bt_component_class_type comp_cls_type =
BT_COMPONENT_CLASS_TYPE_SOURCE;
const char *fail_reason = NULL;
FILE *out_stream = stdout;
BT_COMPONENT_CLASS_TYPE_SOURCE;
const char *fail_reason = NULL;
FILE *out_stream = stdout;
@@
-1610,7
+1610,7
@@
int cmd_run_ctx_connect_upstream_port_to_downstream_component(
uint64_t i;
input_port_count_func_t port_count_fn;
borrow_input_port_by_index_func_t port_by_index_fn;
uint64_t i;
input_port_count_func_t port_count_fn;
borrow_input_port_by_index_func_t port_by_index_fn;
-
enum
bt_graph_status status = BT_GRAPH_STATUS_ERROR;
+ bt_graph_status status = BT_GRAPH_STATUS_ERROR;
bool insert_trimmer = false;
bt_value *trimmer_params = NULL;
char *intersection_begin = NULL;
bool insert_trimmer = false;
bt_value *trimmer_params = NULL;
char *intersection_begin = NULL;
@@
-1636,7
+1636,7
@@
int cmd_run_ctx_connect_upstream_port_to_downstream_component(
range = (struct trace_range *) g_hash_table_lookup(
ctx->intersections, &port_id);
if (range) {
range = (struct trace_range *) g_hash_table_lookup(
ctx->intersections, &port_id);
if (range) {
-
enum
bt_value_status status;
+ bt_value_status status;
intersection_begin = s_from_ns(
range->intersection_range_begin_ns);
intersection_begin = s_from_ns(
range->intersection_range_begin_ns);
@@
-1756,7
+1756,7
@@
int cmd_run_ctx_connect_upstream_port_to_downstream_component(
* source and the trimmer.
*/
char *trimmer_name = NULL;
* source and the trimmer.
*/
char *trimmer_name = NULL;
-
enum
bt_graph_status graph_status;
+ bt_graph_status graph_status;
ret = asprintf(&trimmer_name,
"stream-intersection-trimmer-%s",
ret = asprintf(&trimmer_name,
"stream-intersection-trimmer-%s",
@@
-2076,7
+2076,7
@@
static
int cmd_run_ctx_init(struct cmd_run_ctx *ctx, struct bt_config *cfg)
{
int ret = 0;
int cmd_run_ctx_init(struct cmd_run_ctx *ctx, struct bt_config *cfg)
{
int ret = 0;
-
enum
bt_graph_status status;
+ bt_graph_status status;
ctx->cfg = cfg;
ctx->connect_ports = false;
ctx->cfg = cfg;
ctx->connect_ports = false;
@@
-2147,7
+2147,7
@@
int set_stream_intersections(struct cmd_run_ctx *ctx,
int ret = 0;
uint64_t trace_idx;
int64_t trace_count;
int ret = 0;
uint64_t trace_idx;
int64_t trace_count;
-
enum
bt_value_status value_status;
+ bt_value_status value_status;
const char *path = NULL;
const bt_value *component_path_value = NULL;
bt_value *query_params = NULL;
const char *path = NULL;
const bt_value *component_path_value = NULL;
bt_value *query_params = NULL;
@@
-2619,7
+2619,7
@@
end:
}
static inline
}
static inline
-const char *bt_graph_status_str(
enum
bt_graph_status status)
+const char *bt_graph_status_str(bt_graph_status status)
{
switch (status) {
case BT_GRAPH_STATUS_OK:
{
switch (status) {
case BT_GRAPH_STATUS_OK:
@@
-2693,7
+2693,7
@@
int cmd_run(struct bt_config *cfg)
/* Run the graph */
while (true) {
/* Run the graph */
while (true) {
-
enum
bt_graph_status graph_status = bt_graph_run(ctx.graph);
+ bt_graph_status graph_status = bt_graph_run(ctx.graph);
/*
* Reset console in case something messed with console
/*
* Reset console in case something messed with console
diff --git
a/include/babeltrace/graph/component-class-const.h
b/include/babeltrace/graph/component-class-const.h
index 9e4e6c7f800ca929b7fdca7ee7d1ed05de969c8e..1c54f6e9ce3d8c3501c78d4a81c035680a6e3735 100644
(file)
--- a/
include/babeltrace/graph/component-class-const.h
+++ b/
include/babeltrace/graph/component-class-const.h
@@
-31,11
+31,11
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_component_class_type {
- BT_COMPONENT_CLASS_TYPE_SOURCE =
0,
- BT_COMPONENT_CLASS_TYPE_FILTER =
1,
- BT_COMPONENT_CLASS_TYPE_SINK =
2,
-};
+
typedef
enum bt_component_class_type {
+ BT_COMPONENT_CLASS_TYPE_SOURCE = 0,
+ BT_COMPONENT_CLASS_TYPE_FILTER = 1,
+ BT_COMPONENT_CLASS_TYPE_SINK = 2,
+}
bt_component_class_type
;
extern const char *bt_component_class_get_name(
const bt_component_class *component_class);
extern const char *bt_component_class_get_name(
const bt_component_class *component_class);
@@
-46,7
+46,7
@@
extern const char *bt_component_class_get_description(
extern const char *bt_component_class_get_help(
const bt_component_class *component_class);
extern const char *bt_component_class_get_help(
const bt_component_class *component_class);
-extern
enum
bt_component_class_type bt_component_class_get_type(
+extern bt_component_class_type bt_component_class_get_type(
const bt_component_class *component_class);
static inline
const bt_component_class *component_class);
static inline
diff --git
a/include/babeltrace/graph/component-class-filter.h
b/include/babeltrace/graph/component-class-filter.h
index 80aeeb7475d06404a0d788c73e8c187d7b5f04ee..56d0443717cd4015fd2f9b38aec512ee14eca2c3 100644
(file)
--- a/
include/babeltrace/graph/component-class-filter.h
+++ b/
include/babeltrace/graph/component-class-filter.h
@@
-26,13
+26,13
@@
#include <stdint.h>
#include <stdint.h>
-/* For
enum
bt_self_component_status */
+/* For bt_self_component_status */
#include <babeltrace/graph/self-component.h>
#include <babeltrace/graph/self-component.h>
-/* For
enum
bt_self_message_iterator_status */
+/* For bt_self_message_iterator_status */
#include <babeltrace/graph/self-message-iterator.h>
#include <babeltrace/graph/self-message-iterator.h>
-/* For
enum
bt_query_status */
+/* For bt_query_status */
#include <babeltrace/graph/component-class.h>
/*
#include <babeltrace/graph/component-class.h>
/*
@@
-47,7
+47,7
@@
extern "C" {
#endif
extern "C" {
#endif
-typedef
enum
bt_self_component_status
+typedef bt_self_component_status
(*bt_component_class_filter_init_method)(
bt_self_component_filter *self_component,
const bt_value *params, void *init_method_data);
(*bt_component_class_filter_init_method)(
bt_self_component_filter *self_component,
const bt_value *params, void *init_method_data);
@@
-55,7
+55,7
@@
typedef enum bt_self_component_status
typedef void (*bt_component_class_filter_finalize_method)(
bt_self_component_filter *self_component);
typedef void (*bt_component_class_filter_finalize_method)(
bt_self_component_filter *self_component);
-typedef
enum
bt_self_message_iterator_status
+typedef bt_self_message_iterator_status
(*bt_component_class_filter_message_iterator_init_method)(
bt_self_message_iterator *message_iterator,
bt_self_component_filter *self_component,
(*bt_component_class_filter_message_iterator_init_method)(
bt_self_message_iterator *message_iterator,
bt_self_component_filter *self_component,
@@
-65,38
+65,38
@@
typedef void
(*bt_component_class_filter_message_iterator_finalize_method)(
bt_self_message_iterator *message_iterator);
(*bt_component_class_filter_message_iterator_finalize_method)(
bt_self_message_iterator *message_iterator);
-typedef
enum
bt_self_message_iterator_status
+typedef bt_self_message_iterator_status
(*bt_component_class_filter_message_iterator_next_method)(
bt_self_message_iterator *message_iterator,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count);
(*bt_component_class_filter_message_iterator_next_method)(
bt_self_message_iterator *message_iterator,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count);
-typedef
enum
bt_query_status
+typedef bt_query_status
(*bt_component_class_filter_query_method)(
bt_self_component_class_filter *comp_class,
const bt_query_executor *query_executor,
const char *object, const bt_value *params,
const bt_value **result);
(*bt_component_class_filter_query_method)(
bt_self_component_class_filter *comp_class,
const bt_query_executor *query_executor,
const char *object, const bt_value *params,
const bt_value **result);
-typedef
enum
bt_self_component_status
+typedef bt_self_component_status
(*bt_component_class_filter_accept_input_port_connection_method)(
bt_self_component_filter *self_component,
bt_self_component_port_input *self_port,
const bt_port_output *other_port);
(*bt_component_class_filter_accept_input_port_connection_method)(
bt_self_component_filter *self_component,
bt_self_component_port_input *self_port,
const bt_port_output *other_port);
-typedef
enum
bt_self_component_status
+typedef bt_self_component_status
(*bt_component_class_filter_accept_output_port_connection_method)(
bt_self_component_filter *self_component,
bt_self_component_port_output *self_port,
const bt_port_input *other_port);
(*bt_component_class_filter_accept_output_port_connection_method)(
bt_self_component_filter *self_component,
bt_self_component_port_output *self_port,
const bt_port_input *other_port);
-typedef
enum
bt_self_component_status
+typedef bt_self_component_status
(*bt_component_class_filter_input_port_connected_method)(
bt_self_component_filter *self_component,
bt_self_component_port_input *self_port,
const bt_port_output *other_port);
(*bt_component_class_filter_input_port_connected_method)(
bt_self_component_filter *self_component,
bt_self_component_port_input *self_port,
const bt_port_output *other_port);
-typedef
enum
bt_self_component_status
+typedef bt_self_component_status
(*bt_component_class_filter_output_port_connected_method)(
bt_self_component_filter *self_component,
bt_self_component_port_output *self_port,
(*bt_component_class_filter_output_port_connected_method)(
bt_self_component_filter *self_component,
bt_self_component_port_output *self_port,
diff --git
a/include/babeltrace/graph/component-class-sink.h
b/include/babeltrace/graph/component-class-sink.h
index b57abc94cf713092634490bb8200dd0160b22af0..6ed027512033e56aeff3d5f162aac75694afa426 100644
(file)
--- a/
include/babeltrace/graph/component-class-sink.h
+++ b/
include/babeltrace/graph/component-class-sink.h
@@
-26,10
+26,10
@@
#include <stdint.h>
#include <stdint.h>
-/* For
enum
bt_self_component_status */
+/* For bt_self_component_status */
#include <babeltrace/graph/self-component.h>
#include <babeltrace/graph/self-component.h>
-/* For
enum
bt_query_status */
+/* For bt_query_status */
#include <babeltrace/graph/component-class.h>
/*
#include <babeltrace/graph/component-class.h>
/*
@@
-43,28
+43,27
@@
extern "C" {
#endif
extern "C" {
#endif
-typedef enum bt_self_component_status
-(*bt_component_class_sink_init_method)(
+typedef bt_self_component_status (*bt_component_class_sink_init_method)(
bt_self_component_sink *self_component,
const bt_value *params, void *init_method_data);
typedef void (*bt_component_class_sink_finalize_method)(
bt_self_component_sink *self_component);
bt_self_component_sink *self_component,
const bt_value *params, void *init_method_data);
typedef void (*bt_component_class_sink_finalize_method)(
bt_self_component_sink *self_component);
-typedef
enum
bt_query_status
+typedef bt_query_status
(*bt_component_class_sink_query_method)(
bt_self_component_class_sink *comp_class,
const bt_query_executor *query_executor,
const char *object, const bt_value *params,
const bt_value **result);
(*bt_component_class_sink_query_method)(
bt_self_component_class_sink *comp_class,
const bt_query_executor *query_executor,
const char *object, const bt_value *params,
const bt_value **result);
-typedef
enum
bt_self_component_status
+typedef bt_self_component_status
(*bt_component_class_sink_accept_input_port_connection_method)(
bt_self_component_sink *self_component,
bt_self_component_port_input *self_port,
const bt_port_output *other_port);
(*bt_component_class_sink_accept_input_port_connection_method)(
bt_self_component_sink *self_component,
bt_self_component_port_input *self_port,
const bt_port_output *other_port);
-typedef
enum
bt_self_component_status
+typedef bt_self_component_status
(*bt_component_class_sink_input_port_connected_method)(
bt_self_component_sink *self_component,
bt_self_component_port_input *self_port,
(*bt_component_class_sink_input_port_connected_method)(
bt_self_component_sink *self_component,
bt_self_component_port_input *self_port,
@@
-75,8
+74,7
@@
typedef void
bt_self_component_sink *self_component,
bt_self_component_port_input *self_port);
bt_self_component_sink *self_component,
bt_self_component_port_input *self_port);
-typedef enum bt_self_component_status
-(*bt_component_class_sink_consume_method)(
+typedef bt_self_component_status (*bt_component_class_sink_consume_method)(
bt_self_component_sink *self_component);
static inline
bt_self_component_sink *self_component);
static inline
diff --git
a/include/babeltrace/graph/component-class-source.h
b/include/babeltrace/graph/component-class-source.h
index d0fed047dbc89037ce6d2688679a46d09d8231f7..4c94918194e6ccd5fad9d88fc880394a5982f106 100644
(file)
--- a/
include/babeltrace/graph/component-class-source.h
+++ b/
include/babeltrace/graph/component-class-source.h
@@
-26,13
+26,13
@@
#include <stdint.h>
#include <stdint.h>
-/* For
enum
bt_self_component_status */
+/* For bt_self_component_status */
#include <babeltrace/graph/self-component.h>
#include <babeltrace/graph/self-component.h>
-/* For
enum
bt_self_message_iterator_status */
+/* For bt_self_message_iterator_status */
#include <babeltrace/graph/self-message-iterator.h>
#include <babeltrace/graph/self-message-iterator.h>
-/* For
enum
bt_query_status */
+/* For bt_query_status */
#include <babeltrace/graph/component-class.h>
/*
#include <babeltrace/graph/component-class.h>
/*
@@
-47,7
+47,7
@@
extern "C" {
#endif
extern "C" {
#endif
-typedef
enum
bt_self_component_status
+typedef bt_self_component_status
(*bt_component_class_source_init_method)(
bt_self_component_source *self_component,
const bt_value *params, void *init_method_data);
(*bt_component_class_source_init_method)(
bt_self_component_source *self_component,
const bt_value *params, void *init_method_data);
@@
-55,7
+55,7
@@
typedef enum bt_self_component_status
typedef void (*bt_component_class_source_finalize_method)(
bt_self_component_source *self_component);
typedef void (*bt_component_class_source_finalize_method)(
bt_self_component_source *self_component);
-typedef
enum
bt_self_message_iterator_status
+typedef bt_self_message_iterator_status
(*bt_component_class_source_message_iterator_init_method)(
bt_self_message_iterator *message_iterator,
bt_self_component_source *self_component,
(*bt_component_class_source_message_iterator_init_method)(
bt_self_message_iterator *message_iterator,
bt_self_component_source *self_component,
@@
-65,33
+65,31
@@
typedef void
(*bt_component_class_source_message_iterator_finalize_method)(
bt_self_message_iterator *message_iterator);
(*bt_component_class_source_message_iterator_finalize_method)(
bt_self_message_iterator *message_iterator);
-typedef
enum
bt_self_message_iterator_status
+typedef bt_self_message_iterator_status
(*bt_component_class_source_message_iterator_next_method)(
bt_self_message_iterator *message_iterator,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count);
(*bt_component_class_source_message_iterator_next_method)(
bt_self_message_iterator *message_iterator,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count);
-typedef enum bt_query_status
-(*bt_component_class_source_query_method)(
+typedef bt_query_status (*bt_component_class_source_query_method)(
bt_self_component_class_source *comp_class,
const bt_query_executor *query_executor,
const char *object, const bt_value *params,
const bt_value **result);
bt_self_component_class_source *comp_class,
const bt_query_executor *query_executor,
const char *object, const bt_value *params,
const bt_value **result);
-typedef
enum
bt_self_component_status
+typedef bt_self_component_status
(*bt_component_class_source_accept_output_port_connection_method)(
bt_self_component_source *self_component,
bt_self_component_port_output *self_port,
const bt_port_input *other_port);
(*bt_component_class_source_accept_output_port_connection_method)(
bt_self_component_source *self_component,
bt_self_component_port_output *self_port,
const bt_port_input *other_port);
-typedef
enum
bt_self_component_status
+typedef bt_self_component_status
(*bt_component_class_source_output_port_connected_method)(
bt_self_component_source *self_component,
bt_self_component_port_output *self_port,
const bt_port_input *other_port);
(*bt_component_class_source_output_port_connected_method)(
bt_self_component_source *self_component,
bt_self_component_port_output *self_port,
const bt_port_input *other_port);
-typedef void
-(*bt_component_class_source_output_port_disconnected_method)(
+typedef void (*bt_component_class_source_output_port_disconnected_method)(
bt_self_component_source *self_component,
bt_self_component_port_output *self_port);
bt_self_component_source *self_component,
bt_self_component_port_output *self_port);
diff --git
a/include/babeltrace/graph/component-class.h
b/include/babeltrace/graph/component-class.h
index bc278ce16ebac937707d3bc1216483b97c5f5fba..bfd2d08f697c326ae65ac52c12d869502148532d 100644
(file)
--- a/
include/babeltrace/graph/component-class.h
+++ b/
include/babeltrace/graph/component-class.h
@@
-24,7
+24,7
@@
* SOFTWARE.
*/
* SOFTWARE.
*/
-/* For
enum bt_query_executor_status
*/
+/* For
BT_QUERY_EXECUTOR_STATUS_*
*/
#include <babeltrace/graph/query-executor-const.h>
/* For bt_component_class */
#include <babeltrace/graph/query-executor-const.h>
/* For bt_component_class */
@@
-34,14
+34,14
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_query_status {
+
typedef
enum bt_query_status {
BT_QUERY_STATUS_OK = BT_QUERY_EXECUTOR_STATUS_OK,
BT_QUERY_STATUS_AGAIN = BT_QUERY_EXECUTOR_STATUS_AGAIN,
BT_QUERY_STATUS_ERROR = BT_QUERY_EXECUTOR_STATUS_ERROR,
BT_QUERY_STATUS_NOMEM = BT_QUERY_EXECUTOR_STATUS_NOMEM,
BT_QUERY_STATUS_INVALID_OBJECT = BT_QUERY_EXECUTOR_STATUS_INVALID_OBJECT,
BT_QUERY_STATUS_INVALID_PARAMS = BT_QUERY_EXECUTOR_STATUS_INVALID_PARAMS,
BT_QUERY_STATUS_OK = BT_QUERY_EXECUTOR_STATUS_OK,
BT_QUERY_STATUS_AGAIN = BT_QUERY_EXECUTOR_STATUS_AGAIN,
BT_QUERY_STATUS_ERROR = BT_QUERY_EXECUTOR_STATUS_ERROR,
BT_QUERY_STATUS_NOMEM = BT_QUERY_EXECUTOR_STATUS_NOMEM,
BT_QUERY_STATUS_INVALID_OBJECT = BT_QUERY_EXECUTOR_STATUS_INVALID_OBJECT,
BT_QUERY_STATUS_INVALID_PARAMS = BT_QUERY_EXECUTOR_STATUS_INVALID_PARAMS,
-};
+}
bt_query_status
;
extern int bt_component_class_set_description(
bt_component_class *component_class,
extern int bt_component_class_set_description(
bt_component_class *component_class,
diff --git
a/include/babeltrace/graph/component-const.h
b/include/babeltrace/graph/component-const.h
index 8a3f2add55a068507ffc7c05bf7fcb3d890f01b8..a01874775992c16f3e89a2e671c2934b901398f7 100644
(file)
--- a/
include/babeltrace/graph/component-const.h
+++ b/
include/babeltrace/graph/component-const.h
@@
-24,7
+24,7
@@
* SOFTWARE.
*/
* SOFTWARE.
*/
-/* For
enum
bt_component_class_type */
+/* For bt_component_class_type */
#include <babeltrace/graph/component-class-const.h>
/*
#include <babeltrace/graph/component-class-const.h>
/*
@@
-54,7
+54,7
@@
extern const char *bt_component_get_name(const bt_component *component);
extern const bt_component_class *bt_component_borrow_class_const(
const bt_component *component);
extern const bt_component_class *bt_component_borrow_class_const(
const bt_component *component);
-extern
enum
bt_component_class_type bt_component_get_class_type(
+extern bt_component_class_type bt_component_get_class_type(
const bt_component *component);
static inline
const bt_component *component);
static inline
diff --git
a/include/babeltrace/graph/graph-const.h
b/include/babeltrace/graph/graph-const.h
index 1ce433ea3b50d24e72ba16005934563d4d463455..a8c5a5148b83e157341b09ac31bf98fe855907e2 100644
(file)
--- a/
include/babeltrace/graph/graph-const.h
+++ b/
include/babeltrace/graph/graph-const.h
@@
-31,7
+31,7
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_graph_status {
+
typedef
enum bt_graph_status {
BT_GRAPH_STATUS_OK = 0,
BT_GRAPH_STATUS_END = 1,
BT_GRAPH_STATUS_AGAIN = 11,
BT_GRAPH_STATUS_OK = 0,
BT_GRAPH_STATUS_END = 1,
BT_GRAPH_STATUS_AGAIN = 11,
@@
-40,7
+40,7
@@
enum bt_graph_status {
BT_GRAPH_STATUS_ERROR = -1,
BT_GRAPH_STATUS_NO_SINK = -6,
BT_GRAPH_STATUS_NOMEM = -12,
BT_GRAPH_STATUS_ERROR = -1,
BT_GRAPH_STATUS_NO_SINK = -6,
BT_GRAPH_STATUS_NOMEM = -12,
-};
+}
bt_graph_status
;
extern bt_bool bt_graph_is_canceled(const bt_graph *graph);
extern bt_bool bt_graph_is_canceled(const bt_graph *graph);
diff --git
a/include/babeltrace/graph/graph.h
b/include/babeltrace/graph/graph.h
index 2b0e4eb1fe3be9f7f015fc9563e114a07a7af19b..d3a9a875985861011fc8ea0be08fa7737cbda6cd 100644
(file)
--- a/
include/babeltrace/graph/graph.h
+++ b/
include/babeltrace/graph/graph.h
@@
-33,7
+33,7
@@
*/
#include <babeltrace/types.h>
*/
#include <babeltrace/types.h>
-/* For
enum
bt_graph_status */
+/* For bt_graph_status */
#include <babeltrace/graph/graph-const.h>
#ifdef __cplusplus
#include <babeltrace/graph/graph-const.h>
#ifdef __cplusplus
@@
-115,158
+115,150
@@
typedef void (* bt_graph_listener_removed_func)(void *data);
extern bt_graph *bt_graph_create(void);
extern bt_graph *bt_graph_create(void);
-extern enum bt_graph_status bt_graph_add_source_component(
- bt_graph *graph,
+extern bt_graph_status bt_graph_add_source_component(bt_graph *graph,
const bt_component_class_source *component_class,
const char *name, const bt_value *params,
const bt_component_source **component);
const bt_component_class_source *component_class,
const char *name, const bt_value *params,
const bt_component_source **component);
-extern enum bt_graph_status
-bt_graph_add_source_component_with_init_method_data(
+extern bt_graph_status bt_graph_add_source_component_with_init_method_data(
bt_graph *graph,
const bt_component_class_source *component_class,
const char *name, const bt_value *params,
void *init_method_data,
const bt_component_source **component);
bt_graph *graph,
const bt_component_class_source *component_class,
const char *name, const bt_value *params,
void *init_method_data,
const bt_component_source **component);
-extern enum bt_graph_status bt_graph_add_filter_component(
- bt_graph *graph,
+extern bt_graph_status bt_graph_add_filter_component(bt_graph *graph,
const bt_component_class_filter *component_class,
const char *name, const bt_value *params,
const bt_component_filter **component);
const bt_component_class_filter *component_class,
const char *name, const bt_value *params,
const bt_component_filter **component);
-extern enum bt_graph_status
-bt_graph_add_filter_component_with_init_method_data(
+extern bt_graph_status bt_graph_add_filter_component_with_init_method_data(
bt_graph *graph,
const bt_component_class_filter *component_class,
const char *name, const bt_value *params,
void *init_method_data,
const bt_component_filter **component);
bt_graph *graph,
const bt_component_class_filter *component_class,
const char *name, const bt_value *params,
void *init_method_data,
const bt_component_filter **component);
-extern enum bt_graph_status bt_graph_add_sink_component(
- bt_graph *graph,
- const bt_component_class_sink *component_class,
+extern bt_graph_status bt_graph_add_sink_component(
+ bt_graph *graph, const bt_component_class_sink *component_class,
const char *name, const bt_value *params,
const bt_component_sink **component);
const char *name, const bt_value *params,
const bt_component_sink **component);
-extern enum bt_graph_status
-bt_graph_add_sink_component_with_init_method_data(
- bt_graph *graph,
- const bt_component_class_sink *component_class,
+extern bt_graph_status bt_graph_add_sink_component_with_init_method_data(
+ bt_graph *graph, const bt_component_class_sink *component_class,
const char *name, const bt_value *params,
void *init_method_data,
const bt_component_sink **component);
const char *name, const bt_value *params,
void *init_method_data,
const bt_component_sink **component);
-extern enum bt_graph_status bt_graph_connect_ports(
- bt_graph *graph,
+extern bt_graph_status bt_graph_connect_ports(bt_graph *graph,
const bt_port_output *upstream,
const bt_port_input *downstream,
const bt_connection **connection);
const bt_port_output *upstream,
const bt_port_input *downstream,
const bt_connection **connection);
-extern
enum
bt_graph_status bt_graph_run(bt_graph *graph);
+extern bt_graph_status bt_graph_run(bt_graph *graph);
-extern
enum
bt_graph_status bt_graph_consume(
+extern bt_graph_status bt_graph_consume(
bt_graph *graph);
bt_graph *graph);
-extern
enum
bt_graph_status
+extern bt_graph_status
bt_graph_add_filter_component_input_port_added_listener(
bt_graph *graph,
bt_graph_filter_component_input_port_added_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
bt_graph_add_filter_component_input_port_added_listener(
bt_graph *graph,
bt_graph_filter_component_input_port_added_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
-extern
enum
bt_graph_status
+extern bt_graph_status
bt_graph_add_sink_component_input_port_added_listener(
bt_graph *graph,
bt_graph_sink_component_input_port_added_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
bt_graph_add_sink_component_input_port_added_listener(
bt_graph *graph,
bt_graph_sink_component_input_port_added_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
-extern
enum
bt_graph_status
+extern bt_graph_status
bt_graph_add_source_component_output_port_added_listener(
bt_graph *graph,
bt_graph_source_component_output_port_added_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
bt_graph_add_source_component_output_port_added_listener(
bt_graph *graph,
bt_graph_source_component_output_port_added_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
-extern
enum
bt_graph_status
+extern bt_graph_status
bt_graph_add_filter_component_output_port_added_listener(
bt_graph *graph,
bt_graph_filter_component_output_port_added_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
bt_graph_add_filter_component_output_port_added_listener(
bt_graph *graph,
bt_graph_filter_component_output_port_added_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
-extern
enum
bt_graph_status
+extern bt_graph_status
bt_graph_add_filter_component_input_port_removed_listener(
bt_graph *graph,
bt_graph_filter_component_input_port_removed_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
bt_graph_add_filter_component_input_port_removed_listener(
bt_graph *graph,
bt_graph_filter_component_input_port_removed_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
-extern
enum
bt_graph_status
+extern bt_graph_status
bt_graph_add_sink_component_input_port_removed_listener(
bt_graph *graph,
bt_graph_sink_component_input_port_removed_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
bt_graph_add_sink_component_input_port_removed_listener(
bt_graph *graph,
bt_graph_sink_component_input_port_removed_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
-extern
enum
bt_graph_status
+extern bt_graph_status
bt_graph_add_source_component_output_port_removed_listener(
bt_graph *graph,
bt_graph_source_component_output_port_removed_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
bt_graph_add_source_component_output_port_removed_listener(
bt_graph *graph,
bt_graph_source_component_output_port_removed_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
-extern
enum
bt_graph_status
+extern bt_graph_status
bt_graph_add_filter_component_output_port_removed_listener(
bt_graph *graph,
bt_graph_filter_component_output_port_removed_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
bt_graph_add_filter_component_output_port_removed_listener(
bt_graph *graph,
bt_graph_filter_component_output_port_removed_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
-extern
enum
bt_graph_status
+extern bt_graph_status
bt_graph_add_source_filter_component_ports_connected_listener(
bt_graph *graph,
bt_graph_source_filter_component_ports_connected_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
bt_graph_add_source_filter_component_ports_connected_listener(
bt_graph *graph,
bt_graph_source_filter_component_ports_connected_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
-extern
enum
bt_graph_status
+extern bt_graph_status
bt_graph_add_source_sink_component_ports_connected_listener(
bt_graph *graph,
bt_graph_source_sink_component_ports_connected_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
bt_graph_add_source_sink_component_ports_connected_listener(
bt_graph *graph,
bt_graph_source_sink_component_ports_connected_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
-extern
enum
bt_graph_status
+extern bt_graph_status
bt_graph_add_filter_sink_component_ports_connected_listener(
bt_graph *graph,
bt_graph_filter_sink_component_ports_connected_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
bt_graph_add_filter_sink_component_ports_connected_listener(
bt_graph *graph,
bt_graph_filter_sink_component_ports_connected_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
-extern
enum
bt_graph_status
+extern bt_graph_status
bt_graph_add_source_filter_component_ports_disconnected_listener(
bt_graph *graph,
bt_graph_source_filter_component_ports_disconnected_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
bt_graph_add_source_filter_component_ports_disconnected_listener(
bt_graph *graph,
bt_graph_source_filter_component_ports_disconnected_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
-extern
enum
bt_graph_status
+extern bt_graph_status
bt_graph_add_source_sink_component_ports_disconnected_listener(
bt_graph *graph,
bt_graph_source_sink_component_ports_disconnected_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
bt_graph_add_source_sink_component_ports_disconnected_listener(
bt_graph *graph,
bt_graph_source_sink_component_ports_disconnected_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
-extern
enum
bt_graph_status
+extern bt_graph_status
bt_graph_add_filter_sink_component_ports_disconnected_listener(
bt_graph *graph,
bt_graph_filter_sink_component_ports_disconnected_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
bt_graph_add_filter_sink_component_ports_disconnected_listener(
bt_graph *graph,
bt_graph_filter_sink_component_ports_disconnected_listener_func listener,
bt_graph_listener_removed_func listener_removed, void *data,
int *listener_id);
-extern
enum
bt_graph_status bt_graph_cancel(bt_graph *graph);
+extern bt_graph_status bt_graph_cancel(bt_graph *graph);
#ifdef __cplusplus
}
#ifdef __cplusplus
}
diff --git
a/include/babeltrace/graph/message-const.h
b/include/babeltrace/graph/message-const.h
index e345ca4d2e0cc81872a5403e25c585c996366972..d445e5f7c15268885af6c11a047ffa14a5a7ab2f 100644
(file)
--- a/
include/babeltrace/graph/message-const.h
+++ b/
include/babeltrace/graph/message-const.h
@@
-34,14
+34,14
@@
extern "C" {
/**
* Message types. Unhandled message types should be ignored.
*/
/**
* Message types. Unhandled message types should be ignored.
*/
-enum bt_message_type {
+
typedef
enum bt_message_type {
BT_MESSAGE_TYPE_EVENT = 0,
BT_MESSAGE_TYPE_INACTIVITY = 1,
BT_MESSAGE_TYPE_STREAM_BEGINNING = 2,
BT_MESSAGE_TYPE_STREAM_END = 3,
BT_MESSAGE_TYPE_PACKET_BEGINNING = 4,
BT_MESSAGE_TYPE_PACKET_END = 5,
BT_MESSAGE_TYPE_EVENT = 0,
BT_MESSAGE_TYPE_INACTIVITY = 1,
BT_MESSAGE_TYPE_STREAM_BEGINNING = 2,
BT_MESSAGE_TYPE_STREAM_END = 3,
BT_MESSAGE_TYPE_PACKET_BEGINNING = 4,
BT_MESSAGE_TYPE_PACKET_END = 5,
-};
+}
bt_message_type
;
/**
* Get a message's type.
/**
* Get a message's type.
@@
-49,8
+49,7
@@
enum bt_message_type {
* @param message Message instance
* @returns One of #bt_message_type
*/
* @param message Message instance
* @returns One of #bt_message_type
*/
-extern enum bt_message_type bt_message_get_type(
- const bt_message *message);
+extern bt_message_type bt_message_get_type(const bt_message *message);
extern void bt_message_get_ref(const bt_message *message);
extern void bt_message_get_ref(const bt_message *message);
diff --git
a/include/babeltrace/graph/message-inactivity-const.h
b/include/babeltrace/graph/message-inactivity-const.h
index 0642c4099c544cb2d6969251acd4254ba7730b4a..b473b849c32afe38825d5a0c786948391a77948b 100644
(file)
--- a/
include/babeltrace/graph/message-inactivity-const.h
+++ b/
include/babeltrace/graph/message-inactivity-const.h
@@
-26,14
+26,14
@@
/* For bt_message, bt_clock_snapshot */
#include <babeltrace/types.h>
/* For bt_message, bt_clock_snapshot */
#include <babeltrace/types.h>
-/* For
enum
bt_clock_snapshot_state */
+/* For bt_clock_snapshot_state */
#include <babeltrace/trace-ir/clock-snapshot-const.h>
#ifdef __cplusplus
extern "C" {
#endif
#include <babeltrace/trace-ir/clock-snapshot-const.h>
#ifdef __cplusplus
extern "C" {
#endif
-extern
enum
bt_clock_snapshot_state
+extern bt_clock_snapshot_state
bt_message_inactivity_borrow_default_clock_snapshot_const(
const bt_message *msg, const bt_clock_snapshot **snapshot);
bt_message_inactivity_borrow_default_clock_snapshot_const(
const bt_message *msg, const bt_clock_snapshot **snapshot);
diff --git
a/include/babeltrace/graph/message-iterator.h
b/include/babeltrace/graph/message-iterator.h
index b54df9cd8eccf2e0edf2bf23f1ac5a0e655959e1..d26cc768fd2bc27104434de2fc12074373fff230 100644
(file)
--- a/
include/babeltrace/graph/message-iterator.h
+++ b/
include/babeltrace/graph/message-iterator.h
@@
-31,14
+31,14
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_message_iterator_status {
+
typedef
enum bt_message_iterator_status {
BT_MESSAGE_ITERATOR_STATUS_OK = 0,
BT_MESSAGE_ITERATOR_STATUS_END = 1,
BT_MESSAGE_ITERATOR_STATUS_AGAIN = 11,
BT_MESSAGE_ITERATOR_STATUS_CANCELED = 125,
BT_MESSAGE_ITERATOR_STATUS_ERROR = -1,
BT_MESSAGE_ITERATOR_STATUS_NOMEM = -12,
BT_MESSAGE_ITERATOR_STATUS_OK = 0,
BT_MESSAGE_ITERATOR_STATUS_END = 1,
BT_MESSAGE_ITERATOR_STATUS_AGAIN = 11,
BT_MESSAGE_ITERATOR_STATUS_CANCELED = 125,
BT_MESSAGE_ITERATOR_STATUS_ERROR = -1,
BT_MESSAGE_ITERATOR_STATUS_NOMEM = -12,
-};
+}
bt_message_iterator_status
;
#ifdef __cplusplus
}
#ifdef __cplusplus
}
diff --git
a/include/babeltrace/graph/message-stream-const.h
b/include/babeltrace/graph/message-stream-const.h
index 7b902f0732661b94a7c68db4e9a119c4d7db25d7..a7bf8d7b298dbd9ad68a1322776e0e1b55c9b56c 100644
(file)
--- a/
include/babeltrace/graph/message-stream-const.h
+++ b/
include/babeltrace/graph/message-stream-const.h
@@
-27,7
+27,7
@@
/* For bt_message, bt_clock_snapshot, bt_stream */
#include <babeltrace/types.h>
/* For bt_message, bt_clock_snapshot, bt_stream */
#include <babeltrace/types.h>
-/* For
enum
bt_clock_snapshot_state */
+/* For bt_clock_snapshot_state */
#include <babeltrace/trace-ir/clock-snapshot-const.h>
#ifdef __cplusplus
#include <babeltrace/trace-ir/clock-snapshot-const.h>
#ifdef __cplusplus
@@
-37,14
+37,14
@@
extern "C" {
extern const bt_stream *bt_message_stream_beginning_borrow_stream_const(
const bt_message *message);
extern const bt_stream *bt_message_stream_beginning_borrow_stream_const(
const bt_message *message);
-extern
enum
bt_clock_snapshot_state
+extern bt_clock_snapshot_state
bt_message_stream_beginning_borrow_default_clock_snapshot_const(
const bt_message *msg, const bt_clock_snapshot **snapshot);
extern const bt_stream *bt_message_stream_end_borrow_stream_const(
const bt_message *message);
bt_message_stream_beginning_borrow_default_clock_snapshot_const(
const bt_message *msg, const bt_clock_snapshot **snapshot);
extern const bt_stream *bt_message_stream_end_borrow_stream_const(
const bt_message *message);
-extern
enum
bt_clock_snapshot_state
+extern bt_clock_snapshot_state
bt_message_stream_end_borrow_default_clock_snapshot_const(
const bt_message *msg, const bt_clock_snapshot **snapshot);
bt_message_stream_end_borrow_default_clock_snapshot_const(
const bt_message *msg, const bt_clock_snapshot **snapshot);
diff --git
a/include/babeltrace/graph/port-const.h
b/include/babeltrace/graph/port-const.h
index cb290cdbb999dd17ca48d59c4db3a84f186c3936..fdc0cd696897de3c0a9978e38beb8ee714808911 100644
(file)
--- a/
include/babeltrace/graph/port-const.h
+++ b/
include/babeltrace/graph/port-const.h
@@
-33,14
+33,14
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_port_type {
+
typedef
enum bt_port_type {
BT_PORT_TYPE_INPUT = 0,
BT_PORT_TYPE_OUTPUT = 1,
BT_PORT_TYPE_INPUT = 0,
BT_PORT_TYPE_OUTPUT = 1,
-};
+}
bt_port_type
;
extern const char *bt_port_get_name(const bt_port *port);
extern const char *bt_port_get_name(const bt_port *port);
-extern
enum
bt_port_type bt_port_get_type(const bt_port *port);
+extern bt_port_type bt_port_get_type(const bt_port *port);
extern const bt_connection *bt_port_borrow_connection_const(
const bt_port *port);
extern const bt_connection *bt_port_borrow_connection_const(
const bt_port *port);
diff --git
a/include/babeltrace/graph/port-input-const.h
b/include/babeltrace/graph/port-input-const.h
index 51aef4732697b89a1dadaa79274233fea855a526..c98972e803238565a7e39944c0ae7e2e7f0d1e59 100644
(file)
--- a/
include/babeltrace/graph/port-input-const.h
+++ b/
include/babeltrace/graph/port-input-const.h
@@
-34,8
+34,7
@@
extern "C" {
#endif
static inline
#endif
static inline
-const bt_port *bt_port_input_as_port_const(
- const bt_port_input *port_input)
+const bt_port *bt_port_input_as_port_const(const bt_port_input *port_input)
{
return (const void *) port_input;
}
{
return (const void *) port_input;
}
diff --git
a/include/babeltrace/graph/port-output-const.h
b/include/babeltrace/graph/port-output-const.h
index 7c6e801fa9763e9e65198d861cf411e43d5cf295..19a5db51c1d20cc18d3a81acb63b15387fa19865 100644
(file)
--- a/
include/babeltrace/graph/port-output-const.h
+++ b/
include/babeltrace/graph/port-output-const.h
@@
-34,8
+34,7
@@
extern "C" {
#endif
static inline
#endif
static inline
-const bt_port *bt_port_output_as_port_const(
- const bt_port_output *port_output)
+const bt_port *bt_port_output_as_port_const(const bt_port_output *port_output)
{
return (const void *) port_output;
}
{
return (const void *) port_output;
}
diff --git
a/include/babeltrace/graph/port-output-message-iterator.h
b/include/babeltrace/graph/port-output-message-iterator.h
index 41d8d288016b5e42556aa00a7dc65cc01eaa63f7..08cc225b1b22cd293b84c95dd996e5ac14de67c7 100644
(file)
--- a/
include/babeltrace/graph/port-output-message-iterator.h
+++ b/
include/babeltrace/graph/port-output-message-iterator.h
@@
-25,7
+25,7
@@
#include <stdint.h>
#include <stdint.h>
-/* For
enum
bt_message_iterator_status */
+/* For bt_message_iterator_status */
#include <babeltrace/graph/message-iterator.h>
/*
#include <babeltrace/graph/message-iterator.h>
/*
@@
-52,7
+52,7
@@
bt_port_output_message_iterator_create(
bt_graph *graph,
const bt_port_output *output_port);
bt_graph *graph,
const bt_port_output *output_port);
-extern
enum
bt_message_iterator_status
+extern bt_message_iterator_status
bt_port_output_message_iterator_next(
bt_port_output_message_iterator *iterator,
bt_message_array_const *msgs, uint64_t *count);
bt_port_output_message_iterator_next(
bt_port_output_message_iterator *iterator,
bt_message_array_const *msgs, uint64_t *count);
diff --git
a/include/babeltrace/graph/query-executor-const.h
b/include/babeltrace/graph/query-executor-const.h
index ab6dc242c8211eb95f515db7eed0902901a2817f..faec5f8c3ace52228b0487b98ffbeab72b8d5453 100644
(file)
--- a/
include/babeltrace/graph/query-executor-const.h
+++ b/
include/babeltrace/graph/query-executor-const.h
@@
-30,7
+30,7
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_query_executor_status {
+
typedef
enum bt_query_executor_status {
BT_QUERY_EXECUTOR_STATUS_OK = 0,
BT_QUERY_EXECUTOR_STATUS_AGAIN = 11,
BT_QUERY_EXECUTOR_STATUS_UNSUPPORTED = 95,
BT_QUERY_EXECUTOR_STATUS_OK = 0,
BT_QUERY_EXECUTOR_STATUS_AGAIN = 11,
BT_QUERY_EXECUTOR_STATUS_UNSUPPORTED = 95,
@@
-39,7
+39,7
@@
enum bt_query_executor_status {
BT_QUERY_EXECUTOR_STATUS_NOMEM = -12,
BT_QUERY_EXECUTOR_STATUS_INVALID_OBJECT = -23,
BT_QUERY_EXECUTOR_STATUS_INVALID_PARAMS = -24,
BT_QUERY_EXECUTOR_STATUS_NOMEM = -12,
BT_QUERY_EXECUTOR_STATUS_INVALID_OBJECT = -23,
BT_QUERY_EXECUTOR_STATUS_INVALID_PARAMS = -24,
-};
+}
bt_query_executor_status
;
extern
bt_bool bt_query_executor_is_canceled(
extern
bt_bool bt_query_executor_is_canceled(
diff --git
a/include/babeltrace/graph/query-executor.h
b/include/babeltrace/graph/query-executor.h
index ef1b09e275793f45b974ec62f450f0a36b11262d..336de60e1e1292bedd646e10248b6826cdc9bc52 100644
(file)
--- a/
include/babeltrace/graph/query-executor.h
+++ b/
include/babeltrace/graph/query-executor.h
@@
-23,7
+23,7
@@
* SOFTWARE.
*/
* SOFTWARE.
*/
-/* For
enum
bt_query_executor_status */
+/* For bt_query_executor_status */
#include <babeltrace/graph/query-executor.h>
/* For bt_query_executor, bt_component_class, bt_value */
#include <babeltrace/graph/query-executor.h>
/* For bt_query_executor, bt_component_class, bt_value */
@@
-37,14
+37,14
@@
extern
bt_query_executor *bt_query_executor_create(void);
extern
bt_query_executor *bt_query_executor_create(void);
extern
-
enum
bt_query_executor_status bt_query_executor_query(
+bt_query_executor_status bt_query_executor_query(
bt_query_executor *query_executor,
const bt_component_class *component_class,
const char *object, const bt_value *params,
const bt_value **result);
extern
bt_query_executor *query_executor,
const bt_component_class *component_class,
const char *object, const bt_value *params,
const bt_value **result);
extern
-
enum
bt_query_executor_status bt_query_executor_cancel(
+bt_query_executor_status bt_query_executor_cancel(
bt_query_executor *query_executor);
#ifdef __cplusplus
bt_query_executor *query_executor);
#ifdef __cplusplus
diff --git
a/include/babeltrace/graph/self-component-filter.h
b/include/babeltrace/graph/self-component-filter.h
index 13a976f4b3e2e68aa3917eeeff5a7c86b49f3753..36ac696cd4507e162599934efb35f6d30bcc04ba 100644
(file)
--- a/
include/babeltrace/graph/self-component-filter.h
+++ b/
include/babeltrace/graph/self-component-filter.h
@@
-26,7
+26,7
@@
#include <stdint.h>
#include <stdint.h>
-/* For
enum
bt_self_component_status */
+/* For bt_self_component_status */
#include <babeltrace/graph/self-component.h>
/*
#include <babeltrace/graph/self-component.h>
/*
@@
-67,7
+67,7
@@
bt_self_component_filter_borrow_output_port_by_index(
bt_self_component_filter *self_component,
uint64_t index);
bt_self_component_filter *self_component,
uint64_t index);
-extern
enum
bt_self_component_status
+extern bt_self_component_status
bt_self_component_filter_add_output_port(
bt_self_component_filter *self_component,
const char *name, void *data,
bt_self_component_filter_add_output_port(
bt_self_component_filter *self_component,
const char *name, void *data,
@@
-83,7
+83,7
@@
bt_self_component_filter_borrow_input_port_by_index(
bt_self_component_filter *self_component,
uint64_t index);
bt_self_component_filter *self_component,
uint64_t index);
-extern
enum
bt_self_component_status
+extern bt_self_component_status
bt_self_component_filter_add_input_port(
bt_self_component_filter *self_component,
const char *name, void *data,
bt_self_component_filter_add_input_port(
bt_self_component_filter *self_component,
const char *name, void *data,
diff --git
a/include/babeltrace/graph/self-component-port-input-message-iterator.h
b/include/babeltrace/graph/self-component-port-input-message-iterator.h
index c952f520b2049f163af068977cc79234f8879b28..480c1430e78a91123219884c6774fad86023f6af 100644
(file)
--- a/
include/babeltrace/graph/self-component-port-input-message-iterator.h
+++ b/
include/babeltrace/graph/self-component-port-input-message-iterator.h
@@
-25,7
+25,7
@@
#include <stdint.h>
#include <stdint.h>
-/* For
enum
bt_message_iterator_status */
+/* For bt_message_iterator_status */
#include <babeltrace/graph/message-iterator.h>
/*
#include <babeltrace/graph/message-iterator.h>
/*
@@
-55,7
+55,7
@@
extern bt_component *
bt_self_component_port_input_message_iterator_borrow_component(
bt_self_component_port_input_message_iterator *iterator);
bt_self_component_port_input_message_iterator_borrow_component(
bt_self_component_port_input_message_iterator *iterator);
-extern
enum
bt_message_iterator_status
+extern bt_message_iterator_status
bt_self_component_port_input_message_iterator_next(
bt_self_component_port_input_message_iterator *iterator,
bt_message_array_const *msgs, uint64_t *count);
bt_self_component_port_input_message_iterator_next(
bt_self_component_port_input_message_iterator *iterator,
bt_message_array_const *msgs, uint64_t *count);
diff --git
a/include/babeltrace/graph/self-component-port-input.h
b/include/babeltrace/graph/self-component-port-input.h
index ab8694b180dc793fa2a65750240aa5f35dad92a6..ba3991b28ab6151297a44234fa40d485de0cd512 100644
(file)
--- a/
include/babeltrace/graph/self-component-port-input.h
+++ b/
include/babeltrace/graph/self-component-port-input.h
@@
-23,9
+23,6
@@
* SOFTWARE.
*/
* SOFTWARE.
*/
-/* For enum bt_self_component_port_status */
-#include <babeltrace/graph/self-component-port.h>
-
/*
* For bt_port_input, bt_self_component_port,
* bt_self_component_port_input
/*
* For bt_port_input, bt_self_component_port,
* bt_self_component_port_input
diff --git
a/include/babeltrace/graph/self-component-port-output.h
b/include/babeltrace/graph/self-component-port-output.h
index 6fd4b138fb88b48ba5c796573d1e462b10087c6c..293f705bf4a2a1707824128a955532a5a7a0fe4f 100644
(file)
--- a/
include/babeltrace/graph/self-component-port-output.h
+++ b/
include/babeltrace/graph/self-component-port-output.h
@@
-23,9
+23,6
@@
* SOFTWARE.
*/
* SOFTWARE.
*/
-/* For enum bt_self_component_port_status */
-#include <babeltrace/graph/self-component-port.h>
-
/*
* For bt_port_output, bt_self_component_port,
* bt_self_component_port_output
/*
* For bt_port_output, bt_self_component_port,
* bt_self_component_port_output
diff --git
a/include/babeltrace/graph/self-component-port.h
b/include/babeltrace/graph/self-component-port.h
index 4a79409b587f1df57a134be55e122dac2058cd71..b396afff3321fd6c1a8284b780a78ff61630af2f 100644
(file)
--- a/
include/babeltrace/graph/self-component-port.h
+++ b/
include/babeltrace/graph/self-component-port.h
@@
-32,9
+32,9
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_self_component_port_status {
+
typedef
enum bt_self_component_port_status {
BT_SELF_PORT_STATUS_OK = 0,
BT_SELF_PORT_STATUS_OK = 0,
-};
+}
bt_self_component_port_status
;
static inline
const bt_port *bt_self_component_port_as_port(
static inline
const bt_port *bt_self_component_port_as_port(
@@
-46,7
+46,7
@@
const bt_port *bt_self_component_port_as_port(
extern bt_self_component *bt_self_component_port_borrow_component(
bt_self_component_port *self_port);
extern bt_self_component *bt_self_component_port_borrow_component(
bt_self_component_port *self_port);
-extern
enum
bt_self_component_port_status
+extern bt_self_component_port_status
bt_self_component_port_remove_from_component(
bt_self_component_port *self_port);
bt_self_component_port_remove_from_component(
bt_self_component_port *self_port);
diff --git
a/include/babeltrace/graph/self-component-sink.h
b/include/babeltrace/graph/self-component-sink.h
index 720a9919b8390fe493db00b1557f4fb756bbdc07..9f2d6bd6d7504d9b11b68339fb2788407ad5da8b 100644
(file)
--- a/
include/babeltrace/graph/self-component-sink.h
+++ b/
include/babeltrace/graph/self-component-sink.h
@@
-25,7
+25,7
@@
#include <stdint.h>
#include <stdint.h>
-/* For
enum
bt_self_component_status */
+/* For bt_self_component_status */
#include <babeltrace/graph/self-component.h>
/*
#include <babeltrace/graph/self-component.h>
/*
@@
-62,7
+62,7
@@
extern bt_self_component_port_input *
bt_self_component_sink_borrow_input_port_by_index(
bt_self_component_sink *self_component, uint64_t index);
bt_self_component_sink_borrow_input_port_by_index(
bt_self_component_sink *self_component, uint64_t index);
-extern
enum
bt_self_component_status
+extern bt_self_component_status
bt_self_component_sink_add_input_port(
bt_self_component_sink *self_component,
const char *name, void *user_data,
bt_self_component_sink_add_input_port(
bt_self_component_sink *self_component,
const char *name, void *user_data,
diff --git
a/include/babeltrace/graph/self-component-source.h
b/include/babeltrace/graph/self-component-source.h
index ed2676e7e60fcb9264679e7e9d59ec7d6d8a8c72..3b96af1e2592b085aaf51b42f5bbbd8db642a808 100644
(file)
--- a/
include/babeltrace/graph/self-component-source.h
+++ b/
include/babeltrace/graph/self-component-source.h
@@
-25,7
+25,7
@@
#include <stdint.h>
#include <stdint.h>
-/* For
enum
bt_self_component_status */
+/* For bt_self_component_status */
#include <babeltrace/graph/self-component.h>
/*
#include <babeltrace/graph/self-component.h>
/*
@@
-63,7
+63,7
@@
bt_self_component_source_borrow_output_port_by_index(
bt_self_component_source *self_component,
uint64_t index);
bt_self_component_source *self_component,
uint64_t index);
-extern
enum
bt_self_component_status
+extern bt_self_component_status
bt_self_component_source_add_output_port(
bt_self_component_source *self_component,
const char *name, void *user_data,
bt_self_component_source_add_output_port(
bt_self_component_source *self_component,
const char *name, void *user_data,
diff --git
a/include/babeltrace/graph/self-component.h
b/include/babeltrace/graph/self-component.h
index 3461eace7af5433e84ab6c2cb5b4a1d4ad5cce88..c11d8e456e8230646125e05898c2af05ded0bc90 100644
(file)
--- a/
include/babeltrace/graph/self-component.h
+++ b/
include/babeltrace/graph/self-component.h
@@
-30,14
+30,14
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_self_component_status {
+
typedef
enum bt_self_component_status {
BT_SELF_COMPONENT_STATUS_OK = 0,
BT_SELF_COMPONENT_STATUS_END = 1,
BT_SELF_COMPONENT_STATUS_AGAIN = 11,
BT_SELF_COMPONENT_STATUS_REFUSE_PORT_CONNECTION = 111,
BT_SELF_COMPONENT_STATUS_ERROR = -1,
BT_SELF_COMPONENT_STATUS_NOMEM = -12,
BT_SELF_COMPONENT_STATUS_OK = 0,
BT_SELF_COMPONENT_STATUS_END = 1,
BT_SELF_COMPONENT_STATUS_AGAIN = 11,
BT_SELF_COMPONENT_STATUS_REFUSE_PORT_CONNECTION = 111,
BT_SELF_COMPONENT_STATUS_ERROR = -1,
BT_SELF_COMPONENT_STATUS_NOMEM = -12,
-};
+}
bt_self_component_status
;
static inline
const bt_component *bt_self_component_as_component(
static inline
const bt_component *bt_self_component_as_component(
diff --git
a/include/babeltrace/graph/self-message-iterator.h
b/include/babeltrace/graph/self-message-iterator.h
index 90143e30728fd077e1870837c3c6a05d7486757b..a66234bd5080a4cb8d1eba872bc55a1888044984 100644
(file)
--- a/
include/babeltrace/graph/self-message-iterator.h
+++ b/
include/babeltrace/graph/self-message-iterator.h
@@
-33,13
+33,13
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_self_message_iterator_status {
+
typedef
enum bt_self_message_iterator_status {
BT_SELF_MESSAGE_ITERATOR_STATUS_OK = BT_MESSAGE_ITERATOR_STATUS_OK,
BT_SELF_MESSAGE_ITERATOR_STATUS_END = BT_MESSAGE_ITERATOR_STATUS_END,
BT_SELF_MESSAGE_ITERATOR_STATUS_AGAIN = BT_MESSAGE_ITERATOR_STATUS_AGAIN,
BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR = BT_MESSAGE_ITERATOR_STATUS_ERROR,
BT_SELF_MESSAGE_ITERATOR_STATUS_NOMEM = BT_MESSAGE_ITERATOR_STATUS_NOMEM,
BT_SELF_MESSAGE_ITERATOR_STATUS_OK = BT_MESSAGE_ITERATOR_STATUS_OK,
BT_SELF_MESSAGE_ITERATOR_STATUS_END = BT_MESSAGE_ITERATOR_STATUS_END,
BT_SELF_MESSAGE_ITERATOR_STATUS_AGAIN = BT_MESSAGE_ITERATOR_STATUS_AGAIN,
BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR = BT_MESSAGE_ITERATOR_STATUS_ERROR,
BT_SELF_MESSAGE_ITERATOR_STATUS_NOMEM = BT_MESSAGE_ITERATOR_STATUS_NOMEM,
-};
+}
bt_self_message_iterator_status
;
extern bt_self_component *
bt_self_message_iterator_borrow_component(
extern bt_self_component *
bt_self_message_iterator_borrow_component(
diff --git
a/include/babeltrace/logging.h
b/include/babeltrace/logging.h
index 69efddcd728e50550f807f01a04bec2a032a8cfe..f137057741144040b3fafeba911671e36ec3342b 100644
(file)
--- a/
include/babeltrace/logging.h
+++ b/
include/babeltrace/logging.h
@@
-60,7
+60,7
@@
current global log level and the minimal log level are not executed.
/**
@brief Log levels.
*/
/**
@brief Log levels.
*/
-enum bt_logging_level {
+
typedef
enum bt_logging_level {
/// Additional, low-level debugging context information.
BT_LOGGING_LEVEL_VERBOSE = 1,
/// Additional, low-level debugging context information.
BT_LOGGING_LEVEL_VERBOSE = 1,
@@
-100,7
+100,7
@@
enum bt_logging_level {
/// Logging is disabled.
BT_LOGGING_LEVEL_NONE = 0xff,
/// Logging is disabled.
BT_LOGGING_LEVEL_NONE = 0xff,
-};
+}
bt_logging_level
;
/**
@brief Returns the minimal log level of the Babeltrace library.
/**
@brief Returns the minimal log level of the Babeltrace library.
@@
-114,7
+114,7
@@
global log level with bt_logging_set_global_level() below this level.
@sa bt_logging_get_global_level(): Returns the current global log level.
*/
@sa bt_logging_get_global_level(): Returns the current global log level.
*/
-extern
enum
bt_logging_level bt_logging_get_minimal_level(void);
+extern bt_logging_level bt_logging_get_minimal_level(void);
/**
@brief Returns the current global log level of the Babeltrace library.
/**
@brief Returns the current global log level of the Babeltrace library.
@@
-124,7
+124,7
@@
extern enum bt_logging_level bt_logging_get_minimal_level(void);
@sa bt_logging_set_global_level(): Sets the current global log level.
@sa bt_logging_get_minimal_level(): Returns the minimal log level.
*/
@sa bt_logging_set_global_level(): Sets the current global log level.
@sa bt_logging_get_minimal_level(): Returns the minimal log level.
*/
-extern
enum
bt_logging_level bt_logging_get_global_level(void);
+extern bt_logging_level bt_logging_get_global_level(void);
/**
@brief Sets the current global log level of the Babeltrace library
/**
@brief Sets the current global log level of the Babeltrace library
@@
-138,7
+138,7
@@
log level cannot be executed.
@sa bt_logging_get_global_level(): Returns the global log level.
*/
@sa bt_logging_get_global_level(): Returns the global log level.
*/
-extern void bt_logging_set_global_level(
enum
bt_logging_level log_level);
+extern void bt_logging_set_global_level(bt_logging_level log_level);
/** @} */
/** @} */
diff --git
a/include/babeltrace/plugin/plugin-const.h
b/include/babeltrace/plugin/plugin-const.h
index f19da61d28a1acebec1516800c0a03a708f8785c..1c6c49f152bcd03d3505625561ed537875ffa178 100644
(file)
--- a/
include/babeltrace/plugin/plugin-const.h
+++ b/
include/babeltrace/plugin/plugin-const.h
@@
-36,19
+36,7
@@
*/
#include <babeltrace/types.h>
*/
#include <babeltrace/types.h>
-/* For enum bt_component_class_type */
-#include <babeltrace/graph/component-class.h>
-
-/* For enum bt_component_class_source */
-#include <babeltrace/graph/component-class-source.h>
-
-/* For enum bt_component_class_filter */
-#include <babeltrace/graph/component-class-filter.h>
-
-/* For enum bt_component_class_sink */
-#include <babeltrace/graph/component-class-sink.h>
-
-/* For enum bt_property_availability */
+/* For bt_property_availability */
#include <babeltrace/property.h>
#ifdef __cplusplus
#include <babeltrace/property.h>
#ifdef __cplusplus
@@
-75,7
+63,7
@@
extern const char *bt_plugin_get_description(const bt_plugin *plugin);
extern const char *bt_plugin_get_path(const bt_plugin *plugin);
extern const char *bt_plugin_get_path(const bt_plugin *plugin);
-extern
enum
bt_property_availability bt_plugin_get_version(
+extern bt_property_availability bt_plugin_get_version(
const bt_plugin *plugin, unsigned int *major,
unsigned int *minor, unsigned int *patch, const char **extra);
const bt_plugin *plugin, unsigned int *major,
unsigned int *minor, unsigned int *patch, const char **extra);
diff --git
a/include/babeltrace/plugin/plugin-dev.h
b/include/babeltrace/plugin/plugin-dev.h
index 1ddbf9d6fffbafa1ccf7d00e779509322fa96c9f..5b941a3bbe7dc2ab9c308bafffdfb8001b3f0d7f 100644
(file)
--- a/
include/babeltrace/plugin/plugin-dev.h
+++ b/
include/babeltrace/plugin/plugin-dev.h
@@
-32,13
+32,13
@@
/* For enum bt_plugin_status */
#include <babeltrace/plugin/plugin-const.h>
/* For enum bt_plugin_status */
#include <babeltrace/plugin/plugin-const.h>
-/* For
enum
bt_component_class_type */
+/* For bt_component_class_type */
#include <babeltrace/graph/component-class-const.h>
/* For component class method type definitions */
#include <babeltrace/graph/component-class-const.h>
/* For component class method type definitions */
-#include <babeltrace/graph/component-class-source
-const
.h>
-#include <babeltrace/graph/component-class-filter
-const
.h>
-#include <babeltrace/graph/component-class-sink
-const
.h>
+#include <babeltrace/graph/component-class-source.h>
+#include <babeltrace/graph/component-class-filter.h>
+#include <babeltrace/graph/component-class-sink.h>
/*
* _BT_HIDDEN: set the hidden attribute for internal functions
/*
* _BT_HIDDEN: set the hidden attribute for internal functions
@@
-63,15
+63,15
@@
extern "C" {
#define __BT_PLUGIN_VERSION_MINOR 0
/* Plugin initialization function type */
#define __BT_PLUGIN_VERSION_MINOR 0
/* Plugin initialization function type */
-enum bt_self_plugin_status {
+
typedef
enum bt_self_plugin_status {
BT_SELF_PLUGIN_STATUS_OK = 0,
BT_SELF_PLUGIN_STATUS_NOMEM = -12,
BT_SELF_PLUGIN_STATUS_ERROR = -1,
BT_SELF_PLUGIN_STATUS_OK = 0,
BT_SELF_PLUGIN_STATUS_NOMEM = -12,
BT_SELF_PLUGIN_STATUS_ERROR = -1,
-};
+}
bt_self_plugin_status
;
typedef struct bt_self_plugin bt_self_plugin;
typedef struct bt_self_plugin bt_self_plugin;
-typedef
enum
bt_self_plugin_status (*bt_plugin_init_func)(
+typedef bt_self_plugin_status (*bt_plugin_init_func)(
bt_self_plugin *plugin);
/* Plugin exit function type */
bt_self_plugin *plugin);
/* Plugin exit function type */
@@
-152,7
+152,7
@@
struct __bt_plugin_component_class_descriptor {
const char *name;
/* Component class type */
const char *name;
/* Component class type */
-
enum
bt_component_class_type type;
+ bt_component_class_type type;
/* Mandatory methods (depends on component class type) */
union {
/* Mandatory methods (depends on component class type) */
union {
diff --git
a/include/babeltrace/property.h
b/include/babeltrace/property.h
index 9d79d78e65fe54d34c76957fd26439fe2803f156..cc3906b449680c715f1384ec045335c9ee399b7c 100644
(file)
--- a/
include/babeltrace/property.h
+++ b/
include/babeltrace/property.h
@@
-27,10
+27,10
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_property_availability {
+
typedef
enum bt_property_availability {
BT_PROPERTY_AVAILABILITY_AVAILABLE,
BT_PROPERTY_AVAILABILITY_NOT_AVAILABLE,
BT_PROPERTY_AVAILABILITY_AVAILABLE,
BT_PROPERTY_AVAILABILITY_NOT_AVAILABLE,
-};
+}
bt_property_availability
;
#ifdef __cplusplus
}
#ifdef __cplusplus
}
diff --git
a/include/babeltrace/trace-ir/clock-class-const.h
b/include/babeltrace/trace-ir/clock-class-const.h
index f7afc24802b491d4e19628571b296da6dc2cfd4c..d609770d1a4652eb1333cca2d14c87c5963521f3 100644
(file)
--- a/
include/babeltrace/trace-ir/clock-class-const.h
+++ b/
include/babeltrace/trace-ir/clock-class-const.h
@@
-36,11
+36,11
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_clock_class_status {
+
typedef
enum bt_clock_class_status {
BT_CLOCK_CLASS_STATUS_OK = 0,
BT_CLOCK_CLASS_STATUS_NOMEM = -12,
BT_CLOCK_CLASS_STATUS_OVERFLOW = -75,
BT_CLOCK_CLASS_STATUS_OK = 0,
BT_CLOCK_CLASS_STATUS_NOMEM = -12,
BT_CLOCK_CLASS_STATUS_OVERFLOW = -75,
-};
+}
bt_clock_class_status
;
extern const char *bt_clock_class_get_name(
const bt_clock_class *clock_class);
extern const char *bt_clock_class_get_name(
const bt_clock_class *clock_class);
@@
-63,7
+63,7
@@
extern bt_bool bt_clock_class_is_absolute(
extern bt_uuid bt_clock_class_get_uuid(
const bt_clock_class *clock_class);
extern bt_uuid bt_clock_class_get_uuid(
const bt_clock_class *clock_class);
-extern
enum
bt_clock_class_status bt_clock_class_cycles_to_ns_from_origin(
+extern bt_clock_class_status bt_clock_class_cycles_to_ns_from_origin(
const bt_clock_class *clock_class,
uint64_t cycles, int64_t *ns_from_origin);
const bt_clock_class *clock_class,
uint64_t cycles, int64_t *ns_from_origin);
diff --git
a/include/babeltrace/trace-ir/clock-class.h
b/include/babeltrace/trace-ir/clock-class.h
index e0d877308c203b3be9bf925118c0ad85f9126e7f..c2bc7fde7299331a1ff0ad8f9184887cf9763890 100644
(file)
--- a/
include/babeltrace/trace-ir/clock-class.h
+++ b/
include/babeltrace/trace-ir/clock-class.h
@@
-32,7
+32,7
@@
/* For bt_bool, bt_uuid, bt_clock_class */
#include <babeltrace/types.h>
/* For bt_bool, bt_uuid, bt_clock_class */
#include <babeltrace/types.h>
-/* For
enum
bt_clock_class_status */
+/* For bt_clock_class_status */
#include <babeltrace/trace-ir/clock-class-const.h>
#ifdef __cplusplus
#include <babeltrace/trace-ir/clock-class-const.h>
#ifdef __cplusplus
@@
-41,10
+41,10
@@
extern "C" {
extern bt_clock_class *bt_clock_class_create(void);
extern bt_clock_class *bt_clock_class_create(void);
-extern
enum
bt_clock_class_status bt_clock_class_set_name(
+extern bt_clock_class_status bt_clock_class_set_name(
bt_clock_class *clock_class, const char *name);
bt_clock_class *clock_class, const char *name);
-extern
enum
bt_clock_class_status bt_clock_class_set_description(
+extern bt_clock_class_status bt_clock_class_set_description(
bt_clock_class *clock_class, const char *description);
extern void bt_clock_class_set_frequency(bt_clock_class *clock_class,
bt_clock_class *clock_class, const char *description);
extern void bt_clock_class_set_frequency(bt_clock_class *clock_class,
diff --git
a/include/babeltrace/trace-ir/clock-snapshot-const.h
b/include/babeltrace/trace-ir/clock-snapshot-const.h
index e0f5f05fcd221d3431fa301d31d2435eaac5a02e..73ddb5be1adc7a9cb3d685778709751860ab0e7c 100644
(file)
--- a/
include/babeltrace/trace-ir/clock-snapshot-const.h
+++ b/
include/babeltrace/trace-ir/clock-snapshot-const.h
@@
-36,15
+36,15
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_clock_snapshot_state {
+
typedef
enum bt_clock_snapshot_state {
BT_CLOCK_SNAPSHOT_STATE_KNOWN,
BT_CLOCK_SNAPSHOT_STATE_UNKNOWN,
BT_CLOCK_SNAPSHOT_STATE_KNOWN,
BT_CLOCK_SNAPSHOT_STATE_UNKNOWN,
-};
+}
bt_clock_snapshot_state
;
-enum bt_clock_snapshot_status {
+
typedef
enum bt_clock_snapshot_status {
BT_CLOCK_SNAPSHOT_STATUS_OK = 0,
BT_CLOCK_SNAPSHOT_STATUS_OVERFLOW = -75,
BT_CLOCK_SNAPSHOT_STATUS_OK = 0,
BT_CLOCK_SNAPSHOT_STATUS_OVERFLOW = -75,
-};
+}
bt_clock_snapshot_status
;
extern const bt_clock_class *bt_clock_snapshot_borrow_clock_class_const(
const bt_clock_snapshot *clock_snapshot);
extern const bt_clock_class *bt_clock_snapshot_borrow_clock_class_const(
const bt_clock_snapshot *clock_snapshot);
@@
-52,7
+52,7
@@
extern const bt_clock_class *bt_clock_snapshot_borrow_clock_class_const(
extern uint64_t bt_clock_snapshot_get_value(
const bt_clock_snapshot *clock_snapshot);
extern uint64_t bt_clock_snapshot_get_value(
const bt_clock_snapshot *clock_snapshot);
-extern
enum
bt_clock_snapshot_status bt_clock_snapshot_get_ns_from_origin(
+extern bt_clock_snapshot_status bt_clock_snapshot_get_ns_from_origin(
const bt_clock_snapshot *clock_snapshot,
int64_t *ns_from_origin);
const bt_clock_snapshot *clock_snapshot,
int64_t *ns_from_origin);
diff --git
a/include/babeltrace/trace-ir/event-class-const.h
b/include/babeltrace/trace-ir/event-class-const.h
index b7e559e24b1b13d113f35a4adb9c788c3c83079b..a8408b59c5496da1462c4d669ecc332d338d6c39 100644
(file)
--- a/
include/babeltrace/trace-ir/event-class-const.h
+++ b/
include/babeltrace/trace-ir/event-class-const.h
@@
-27,7
+27,7
@@
* http://www.efficios.com/ctf
*/
* http://www.efficios.com/ctf
*/
-/* For
enum
bt_property_availability */
+/* For bt_property_availability */
#include <babeltrace/property.h>
/* For bt_event_class, bt_field_class, bt_stream_class */
#include <babeltrace/property.h>
/* For bt_event_class, bt_field_class, bt_stream_class */
@@
-40,12
+40,12
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_event_class_status {
+
typedef
enum bt_event_class_status {
BT_EVENT_CLASS_STATUS_OK = 0,
BT_EVENT_CLASS_STATUS_NOMEM = -12,
BT_EVENT_CLASS_STATUS_OK = 0,
BT_EVENT_CLASS_STATUS_NOMEM = -12,
-};
+}
bt_event_class_status
;
-enum bt_event_class_log_level {
+
typedef
enum bt_event_class_log_level {
BT_EVENT_CLASS_LOG_LEVEL_EMERGENCY,
BT_EVENT_CLASS_LOG_LEVEL_ALERT,
BT_EVENT_CLASS_LOG_LEVEL_CRITICAL,
BT_EVENT_CLASS_LOG_LEVEL_EMERGENCY,
BT_EVENT_CLASS_LOG_LEVEL_ALERT,
BT_EVENT_CLASS_LOG_LEVEL_CRITICAL,
@@
-61,7
+61,7
@@
enum bt_event_class_log_level {
BT_EVENT_CLASS_LOG_LEVEL_DEBUG_FUNCTION,
BT_EVENT_CLASS_LOG_LEVEL_DEBUG_LINE,
BT_EVENT_CLASS_LOG_LEVEL_DEBUG,
BT_EVENT_CLASS_LOG_LEVEL_DEBUG_FUNCTION,
BT_EVENT_CLASS_LOG_LEVEL_DEBUG_LINE,
BT_EVENT_CLASS_LOG_LEVEL_DEBUG,
-};
+}
bt_event_class_log_level
;
extern const bt_stream_class *bt_event_class_borrow_stream_class_const(
const bt_event_class *event_class);
extern const bt_stream_class *bt_event_class_borrow_stream_class_const(
const bt_event_class *event_class);
@@
-70,9
+70,9
@@
extern const char *bt_event_class_get_name(const bt_event_class *event_class);
extern uint64_t bt_event_class_get_id(const bt_event_class *event_class);
extern uint64_t bt_event_class_get_id(const bt_event_class *event_class);
-extern
enum
bt_property_availability bt_event_class_get_log_level(
+extern bt_property_availability bt_event_class_get_log_level(
const bt_event_class *event_class,
const bt_event_class *event_class,
-
enum
bt_event_class_log_level *log_level);
+ bt_event_class_log_level *log_level);
extern const char *bt_event_class_get_emf_uri(
const bt_event_class *event_class);
extern const char *bt_event_class_get_emf_uri(
const bt_event_class *event_class);
diff --git
a/include/babeltrace/trace-ir/event-class.h
b/include/babeltrace/trace-ir/event-class.h
index be6bcf9b11b6614b3fc4aff40b8b397fd5dbbf85..7067b582ed5c0d1bef0e4a6e5af0a0e1132c4b50 100644
(file)
--- a/
include/babeltrace/trace-ir/event-class.h
+++ b/
include/babeltrace/trace-ir/event-class.h
@@
-27,7
+27,7
@@
* http://www.efficios.com/ctf
*/
* http://www.efficios.com/ctf
*/
-/* For
enum bt_event_class_status, enum
bt_event_class_log_level */
+/* For
bt_event_class_status,
bt_event_class_log_level */
#include <babeltrace/trace-ir/event-class-const.h>
/* For bt_event_class, bt_stream_class */
#include <babeltrace/trace-ir/event-class-const.h>
/* For bt_event_class, bt_stream_class */
@@
-48,22
+48,20
@@
extern bt_event_class *bt_event_class_create_with_id(
extern bt_stream_class *bt_event_class_borrow_stream_class(
bt_event_class *event_class);
extern bt_stream_class *bt_event_class_borrow_stream_class(
bt_event_class *event_class);
-extern
enum
bt_event_class_status bt_event_class_set_name(
+extern bt_event_class_status bt_event_class_set_name(
bt_event_class *event_class, const char *name);
bt_event_class *event_class, const char *name);
-extern void bt_event_class_set_log_level(
- bt_event_class *event_class,
- enum bt_event_class_log_level log_level);
+extern void bt_event_class_set_log_level(bt_event_class *event_class,
+ bt_event_class_log_level log_level);
-extern enum bt_event_class_status bt_event_class_set_emf_uri(
- bt_event_class *event_class,
- const char *emf_uri);
+extern bt_event_class_status bt_event_class_set_emf_uri(
+ bt_event_class *event_class, const char *emf_uri);
-extern
enum
bt_event_class_status
+extern bt_event_class_status
bt_event_class_set_specific_context_field_class(bt_event_class *event_class,
bt_field_class *field_class);
bt_event_class_set_specific_context_field_class(bt_event_class *event_class,
bt_field_class *field_class);
-extern
enum
bt_event_class_status bt_event_class_set_payload_field_class(
+extern bt_event_class_status bt_event_class_set_payload_field_class(
bt_event_class *event_class,
bt_field_class *field_class);
bt_event_class *event_class,
bt_field_class *field_class);
diff --git
a/include/babeltrace/trace-ir/event-const.h
b/include/babeltrace/trace-ir/event-const.h
index 680e459fb09658ac448e6498f67c68c5a1fb2f3a..3fafc484f824a0f8a68ce26140105ecc5c21be00 100644
(file)
--- a/
include/babeltrace/trace-ir/event-const.h
+++ b/
include/babeltrace/trace-ir/event-const.h
@@
-27,7
+27,7
@@
* http://www.efficios.com/ctf
*/
* http://www.efficios.com/ctf
*/
-/* For
enum
bt_clock_snapshot_state */
+/* For bt_clock_snapshot_state */
#include <babeltrace/trace-ir/clock-snapshot-const.h>
/* For bt_event, bt_clock_snapshot, bt_event_class, bt_field, bt_packet */
#include <babeltrace/trace-ir/clock-snapshot-const.h>
/* For bt_event, bt_clock_snapshot, bt_event_class, bt_field, bt_packet */
@@
-37,10
+37,10
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_event_status {
+
typedef
enum bt_event_status {
BT_EVENT_STATUS_OK = 0,
BT_EVENT_STATUS_NOMEM = -12,
BT_EVENT_STATUS_OK = 0,
BT_EVENT_STATUS_NOMEM = -12,
-};
+}
bt_event_status
;
extern const bt_event_class *bt_event_borrow_class_const(
const bt_event *event);
extern const bt_event_class *bt_event_borrow_class_const(
const bt_event *event);
@@
-63,7
+63,7
@@
extern const bt_field *bt_event_borrow_specific_context_field_const(
extern const bt_field *bt_event_borrow_payload_field_const(
const bt_event *event);
extern const bt_field *bt_event_borrow_payload_field_const(
const bt_event *event);
-extern
enum
bt_clock_snapshot_state bt_event_borrow_default_clock_snapshot_const(
+extern bt_clock_snapshot_state bt_event_borrow_default_clock_snapshot_const(
const bt_event *event,
const bt_clock_snapshot **clock_snapshot);
const bt_event *event,
const bt_clock_snapshot **clock_snapshot);
diff --git
a/include/babeltrace/trace-ir/event.h
b/include/babeltrace/trace-ir/event.h
index 2e97972cba28f4e77c76029baac84f797509c437..cf18584a08ce7f7d66a1f0922f36c9ddcc03ca20 100644
(file)
--- a/
include/babeltrace/trace-ir/event.h
+++ b/
include/babeltrace/trace-ir/event.h
@@
-30,7
+30,7
@@
/* For bt_event, bt_event_header_field, bt_event_class, bt_field, bt_packet */
#include <babeltrace/types.h>
/* For bt_event, bt_event_header_field, bt_event_class, bt_field, bt_packet */
#include <babeltrace/types.h>
-/* For
enum
bt_event_status */
+/* For bt_event_status */
#include <babeltrace/trace-ir/event-const.h>
#ifdef __cplusplus
#include <babeltrace/trace-ir/event-const.h>
#ifdef __cplusplus
@@
-45,7
+45,7
@@
extern bt_stream *bt_event_borrow_stream(bt_event *event);
extern bt_field *bt_event_borrow_header_field(bt_event *event);
extern bt_field *bt_event_borrow_header_field(bt_event *event);
-extern
enum
bt_event_status bt_event_move_header_field(bt_event *event,
+extern bt_event_status bt_event_move_header_field(bt_event *event,
bt_event_header_field *header);
extern bt_field *
bt_event_header_field *header);
extern bt_field *
diff --git
a/include/babeltrace/trace-ir/field-class-const.h
b/include/babeltrace/trace-ir/field-class-const.h
index cb369b37f21118879df3f5455b4e24eb11d650f9..c3c2d8eccaca20c4cb37a7a0b8b5b17bf2c35932 100644
(file)
--- a/
include/babeltrace/trace-ir/field-class-const.h
+++ b/
include/babeltrace/trace-ir/field-class-const.h
@@
-42,12
+42,12
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_field_class_status {
+
typedef
enum bt_field_class_status {
BT_FIELD_CLASS_STATUS_OK = 0,
BT_FIELD_CLASS_STATUS_NOMEM = -12,
BT_FIELD_CLASS_STATUS_OK = 0,
BT_FIELD_CLASS_STATUS_NOMEM = -12,
-};
+}
bt_field_class_status
;
-enum bt_field_class_type {
+
typedef
enum bt_field_class_type {
BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER,
BT_FIELD_CLASS_TYPE_SIGNED_INTEGER,
BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION,
BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER,
BT_FIELD_CLASS_TYPE_SIGNED_INTEGER,
BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION,
@@
-58,22
+58,22
@@
enum bt_field_class_type {
BT_FIELD_CLASS_TYPE_STATIC_ARRAY,
BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY,
BT_FIELD_CLASS_TYPE_VARIANT,
BT_FIELD_CLASS_TYPE_STATIC_ARRAY,
BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY,
BT_FIELD_CLASS_TYPE_VARIANT,
-};
+}
bt_field_class_type
;
-enum bt_field_class_integer_preferred_display_base {
+
typedef
enum bt_field_class_integer_preferred_display_base {
BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_BINARY,
BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_OCTAL,
BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_DECIMAL,
BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_HEXADECIMAL,
BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_BINARY,
BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_OCTAL,
BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_DECIMAL,
BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_HEXADECIMAL,
-};
+}
bt_field_class_integer_preferred_display_base
;
-extern
enum
bt_field_class_type bt_field_class_get_type(
+extern bt_field_class_type bt_field_class_get_type(
const bt_field_class *field_class);
extern uint64_t bt_field_class_integer_get_field_value_range(
const bt_field_class *field_class);
const bt_field_class *field_class);
extern uint64_t bt_field_class_integer_get_field_value_range(
const bt_field_class *field_class);
-extern
enum
bt_field_class_integer_preferred_display_base
+extern bt_field_class_integer_preferred_display_base
bt_field_class_integer_get_preferred_display_base(
const bt_field_class *field_class);
bt_field_class_integer_get_preferred_display_base(
const bt_field_class *field_class);
@@
-111,13
+111,13
@@
bt_field_class_signed_enumeration_mapping_ranges_get_range_by_index(
const bt_field_class_unsigned_enumeration_mapping_ranges *ranges,
uint64_t index, int64_t *lower, int64_t *upper);
const bt_field_class_unsigned_enumeration_mapping_ranges *ranges,
uint64_t index, int64_t *lower, int64_t *upper);
-extern
enum
bt_field_class_status
+extern bt_field_class_status
bt_field_class_unsigned_enumeration_get_mapping_labels_by_value(
const bt_field_class *field_class, uint64_t value,
bt_field_class_enumeration_mapping_label_array *label_array,
uint64_t *count);
bt_field_class_unsigned_enumeration_get_mapping_labels_by_value(
const bt_field_class *field_class, uint64_t value,
bt_field_class_enumeration_mapping_label_array *label_array,
uint64_t *count);
-extern
enum
bt_field_class_status
+extern bt_field_class_status
bt_field_class_signed_enumeration_get_mapping_labels_by_value(
const bt_field_class *field_class, int64_t value,
bt_field_class_enumeration_mapping_label_array *label_array,
bt_field_class_signed_enumeration_get_mapping_labels_by_value(
const bt_field_class *field_class, int64_t value,
bt_field_class_enumeration_mapping_label_array *label_array,
diff --git
a/include/babeltrace/trace-ir/field-class.h
b/include/babeltrace/trace-ir/field-class.h
index 71942862e45a99daaee20b9894b483e1606dd012..c770f81ab3e7fd4b406639b6a1363987e30968a6 100644
(file)
--- a/
include/babeltrace/trace-ir/field-class.h
+++ b/
include/babeltrace/trace-ir/field-class.h
@@
-31,8
+31,8
@@
#include <babeltrace/types.h>
/*
#include <babeltrace/types.h>
/*
- * For
enum
bt_field_class_status,
- *
enum
bt_field_class_integer_preferred_display_base
+ * For bt_field_class_status,
+ * bt_field_class_integer_preferred_display_base
*/
#include <babeltrace/trace-ir/field-class-const.h>
*/
#include <babeltrace/trace-ir/field-class-const.h>
@@
-52,7
+52,7
@@
extern void bt_field_class_integer_set_field_value_range(
extern void bt_field_class_integer_set_preferred_display_base(
bt_field_class *field_class,
extern void bt_field_class_integer_set_preferred_display_base(
bt_field_class *field_class,
-
enum
bt_field_class_integer_preferred_display_base base);
+ bt_field_class_integer_preferred_display_base base);
extern bt_field_class *bt_field_class_real_create(void);
extern bt_field_class *bt_field_class_real_create(void);
@@
-64,11
+64,11
@@
extern bt_field_class *bt_field_class_unsigned_enumeration_create(void);
extern bt_field_class *bt_field_class_signed_enumeration_create(void);
extern bt_field_class *bt_field_class_signed_enumeration_create(void);
-extern
enum
bt_field_class_status bt_field_class_unsigned_enumeration_map_range(
+extern bt_field_class_status bt_field_class_unsigned_enumeration_map_range(
bt_field_class *field_class, const char *label,
uint64_t range_lower, uint64_t range_upper);
bt_field_class *field_class, const char *label,
uint64_t range_lower, uint64_t range_upper);
-extern
enum
bt_field_class_status bt_field_class_signed_enumeration_map_range(
+extern bt_field_class_status bt_field_class_signed_enumeration_map_range(
bt_field_class *field_class, const char *label,
int64_t range_lower, int64_t range_upper);
bt_field_class *field_class, const char *label,
int64_t range_lower, int64_t range_upper);
@@
-76,7
+76,7
@@
extern bt_field_class *bt_field_class_string_create(void);
extern bt_field_class *bt_field_class_structure_create(void);
extern bt_field_class *bt_field_class_structure_create(void);
-extern
enum
bt_field_class_status bt_field_class_structure_append_member(
+extern bt_field_class_status bt_field_class_structure_append_member(
bt_field_class *struct_field_class,
const char *name, bt_field_class *field_class);
bt_field_class *struct_field_class,
const char *name, bt_field_class *field_class);
@@
-86,18
+86,18
@@
extern bt_field_class *bt_field_class_static_array_create(
extern bt_field_class *bt_field_class_dynamic_array_create(
bt_field_class *elem_field_class);
extern bt_field_class *bt_field_class_dynamic_array_create(
bt_field_class *elem_field_class);
-extern
enum
bt_field_class_status
+extern bt_field_class_status
bt_field_class_dynamic_array_set_length_field_class(
bt_field_class *field_class,
bt_field_class *length_field_class);
extern bt_field_class *bt_field_class_variant_create(void);
bt_field_class_dynamic_array_set_length_field_class(
bt_field_class *field_class,
bt_field_class *length_field_class);
extern bt_field_class *bt_field_class_variant_create(void);
-extern
enum
bt_field_class_status
+extern bt_field_class_status
bt_field_class_variant_set_selector_field_class(bt_field_class *field_class,
bt_field_class *selector_field_class);
bt_field_class_variant_set_selector_field_class(bt_field_class *field_class,
bt_field_class *selector_field_class);
-extern
enum
bt_field_class_status bt_field_class_variant_append_option(
+extern bt_field_class_status bt_field_class_variant_append_option(
bt_field_class *var_field_class,
const char *name, bt_field_class *field_class);
bt_field_class *var_field_class,
const char *name, bt_field_class *field_class);
diff --git
a/include/babeltrace/trace-ir/field-const.h
b/include/babeltrace/trace-ir/field-const.h
index e44e8328933b447def38804dd472cf8285ef1131..880cde9797c62b79c6a20056c27f54ec43adfe76 100644
(file)
--- a/
include/babeltrace/trace-ir/field-const.h
+++ b/
include/babeltrace/trace-ir/field-const.h
@@
-29,7
+29,7
@@
#include <stdint.h>
#include <stdint.h>
-/* For
enum
bt_field_class_type */
+/* For bt_field_class_type */
#include <babeltrace/trace-ir/field-class.h>
/* For bt_field, bt_field_class */
#include <babeltrace/trace-ir/field-class.h>
/* For bt_field, bt_field_class */
@@
-39,15
+39,15
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_field_status {
+
typedef
enum bt_field_status {
BT_FIELD_STATUS_OK = 0,
BT_FIELD_STATUS_NOMEM = -12,
BT_FIELD_STATUS_OK = 0,
BT_FIELD_STATUS_NOMEM = -12,
-};
+}
bt_field_status
;
extern const bt_field_class *bt_field_borrow_class_const(
const bt_field *field);
extern const bt_field_class *bt_field_borrow_class_const(
const bt_field *field);
-extern
enum
bt_field_class_type bt_field_get_class_type(
+extern bt_field_class_type bt_field_get_class_type(
const bt_field *field);
extern int64_t bt_field_signed_integer_get_value(const bt_field *field);
const bt_field *field);
extern int64_t bt_field_signed_integer_get_value(const bt_field *field);
@@
-57,12
+57,12
@@
extern uint64_t bt_field_unsigned_integer_get_value(
extern double bt_field_real_get_value(const bt_field *field);
extern double bt_field_real_get_value(const bt_field *field);
-extern
enum
bt_field_status bt_field_unsigned_enumeration_get_mapping_labels(
+extern bt_field_status bt_field_unsigned_enumeration_get_mapping_labels(
const bt_field *field,
bt_field_class_enumeration_mapping_label_array *label_array,
uint64_t *count);
const bt_field *field,
bt_field_class_enumeration_mapping_label_array *label_array,
uint64_t *count);
-extern
enum
bt_field_status bt_field_signed_enumeration_get_mapping_labels(
+extern bt_field_status bt_field_signed_enumeration_get_mapping_labels(
const bt_field *field,
bt_field_class_enumeration_mapping_label_array *label_array,
uint64_t *count);
const bt_field *field,
bt_field_class_enumeration_mapping_label_array *label_array,
uint64_t *count);
diff --git
a/include/babeltrace/trace-ir/field-path-const.h
b/include/babeltrace/trace-ir/field-path-const.h
index 1d80f9399f9f1828708eb9bf710991b3d8a61167..fe5bef6f5c9ebc57d82ba8caad1004da5e0b31b5 100644
(file)
--- a/
include/babeltrace/trace-ir/field-path-const.h
+++ b/
include/babeltrace/trace-ir/field-path-const.h
@@
-35,16
+35,16
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_scope {
+
typedef
enum bt_scope {
BT_SCOPE_PACKET_HEADER,
BT_SCOPE_PACKET_CONTEXT,
BT_SCOPE_EVENT_HEADER,
BT_SCOPE_EVENT_COMMON_CONTEXT,
BT_SCOPE_EVENT_SPECIFIC_CONTEXT,
BT_SCOPE_EVENT_PAYLOAD,
BT_SCOPE_PACKET_HEADER,
BT_SCOPE_PACKET_CONTEXT,
BT_SCOPE_EVENT_HEADER,
BT_SCOPE_EVENT_COMMON_CONTEXT,
BT_SCOPE_EVENT_SPECIFIC_CONTEXT,
BT_SCOPE_EVENT_PAYLOAD,
-};
+}
bt_scope
;
-extern
enum
bt_scope bt_field_path_get_root_scope(
+extern bt_scope bt_field_path_get_root_scope(
const bt_field_path *field_path);
extern uint64_t bt_field_path_get_index_count(
const bt_field_path *field_path);
extern uint64_t bt_field_path_get_index_count(
diff --git
a/include/babeltrace/trace-ir/field.h
b/include/babeltrace/trace-ir/field.h
index 9c2d6e1812b805389f31c0a94c0f967ed0f7ea0e..274794ebf535eeb8edd7525656f5fa2063cccc3f 100644
(file)
--- a/
include/babeltrace/trace-ir/field.h
+++ b/
include/babeltrace/trace-ir/field.h
@@
-32,7
+32,7
@@
/* For bt_field, bt_field_class */
#include <babeltrace/types.h>
/* For bt_field, bt_field_class */
#include <babeltrace/types.h>
-/* For
enum
bt_field_status */
+/* For bt_field_status */
#include <babeltrace/trace-ir/field-const.h>
#ifdef __cplusplus
#include <babeltrace/trace-ir/field-const.h>
#ifdef __cplusplus
@@
-47,16
+47,16
@@
extern void bt_field_unsigned_integer_set_value(bt_field *field,
extern void bt_field_real_set_value(bt_field *field, double value);
extern void bt_field_real_set_value(bt_field *field, double value);
-extern
enum
bt_field_status bt_field_string_set_value(bt_field *field,
+extern bt_field_status bt_field_string_set_value(bt_field *field,
const char *value);
const char *value);
-extern
enum
bt_field_status bt_field_string_append(bt_field *field,
+extern bt_field_status bt_field_string_append(bt_field *field,
const char *value);
const char *value);
-extern
enum
bt_field_status bt_field_string_append_with_length(bt_field *field,
+extern bt_field_status bt_field_string_append_with_length(bt_field *field,
const char *value, uint64_t length);
const char *value, uint64_t length);
-extern
enum
bt_field_status bt_field_string_clear(bt_field *field);
+extern bt_field_status bt_field_string_clear(bt_field *field);
extern bt_field *bt_field_structure_borrow_member_field_by_index(
bt_field *field, uint64_t index);
extern bt_field *bt_field_structure_borrow_member_field_by_index(
bt_field *field, uint64_t index);
@@
-67,10
+67,10
@@
extern bt_field *bt_field_structure_borrow_member_field_by_name(
extern bt_field *bt_field_array_borrow_element_field_by_index(
bt_field *field, uint64_t index);
extern bt_field *bt_field_array_borrow_element_field_by_index(
bt_field *field, uint64_t index);
-extern
enum
bt_field_status bt_field_dynamic_array_set_length(bt_field *field,
+extern bt_field_status bt_field_dynamic_array_set_length(bt_field *field,
uint64_t length);
uint64_t length);
-extern
enum
bt_field_status bt_field_variant_select_option_field(
+extern bt_field_status bt_field_variant_select_option_field(
bt_field *field, uint64_t index);
extern bt_field *bt_field_variant_borrow_selected_option_field(
bt_field *field, uint64_t index);
extern bt_field *bt_field_variant_borrow_selected_option_field(
diff --git
a/include/babeltrace/trace-ir/packet-const.h
b/include/babeltrace/trace-ir/packet-const.h
index 1f90f0104c09694e3d35773b9a1d057edb1f1789..f2369177aca6808c0d9594fd48a2fcc7429a714a 100644
(file)
--- a/
include/babeltrace/trace-ir/packet-const.h
+++ b/
include/babeltrace/trace-ir/packet-const.h
@@
-28,10
+28,10
@@
#include <stdint.h>
#include <stdint.h>
-/* For
enum
bt_property_availability */
+/* For bt_property_availability */
#include <babeltrace/property.h>
#include <babeltrace/property.h>
-/* For
enum
bt_clock_snapshot_state */
+/* For bt_clock_snapshot_state */
#include <babeltrace/trace-ir/clock-snapshot-const.h>
/*
#include <babeltrace/trace-ir/clock-snapshot-const.h>
/*
@@
-44,10
+44,10
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_packet_status {
+
typedef
enum bt_packet_status {
BT_PACKET_STATUS_OK = 0,
BT_PACKET_STATUS_NOMEM = -12,
BT_PACKET_STATUS_OK = 0,
BT_PACKET_STATUS_NOMEM = -12,
-};
+}
bt_packet_status
;
extern const bt_stream *bt_packet_borrow_stream_const(
const bt_packet *packet);
extern const bt_stream *bt_packet_borrow_stream_const(
const bt_packet *packet);
@@
-61,22
+61,21
@@
const bt_field *bt_packet_borrow_context_field_const(
const bt_packet *packet);
extern
const bt_packet *packet);
extern
-enum bt_clock_snapshot_state
-bt_packet_borrow_default_beginning_clock_snapshot_const(
+bt_clock_snapshot_state bt_packet_borrow_default_beginning_clock_snapshot_const(
const bt_packet *packet,
const bt_clock_snapshot **clock_snapshot);
extern
const bt_packet *packet,
const bt_clock_snapshot **clock_snapshot);
extern
-
enum
bt_clock_snapshot_state bt_packet_borrow_default_end_clock_snapshot_const(
+bt_clock_snapshot_state bt_packet_borrow_default_end_clock_snapshot_const(
const bt_packet *packet,
const bt_clock_snapshot **clock_snapshot);
extern
const bt_packet *packet,
const bt_clock_snapshot **clock_snapshot);
extern
-
enum
bt_property_availability bt_packet_get_discarded_event_counter_snapshot(
+bt_property_availability bt_packet_get_discarded_event_counter_snapshot(
const bt_packet *packet, uint64_t *value);
extern
const bt_packet *packet, uint64_t *value);
extern
-
enum
bt_property_availability bt_packet_get_packet_counter_snapshot(
+bt_property_availability bt_packet_get_packet_counter_snapshot(
const bt_packet *packet, uint64_t *value);
extern void bt_packet_get_ref(const bt_packet *packet);
const bt_packet *packet, uint64_t *value);
extern void bt_packet_get_ref(const bt_packet *packet);
diff --git
a/include/babeltrace/trace-ir/packet.h
b/include/babeltrace/trace-ir/packet.h
index 3de1edfead574f5366da38ae4e4442fc1aa525fb..eebe600a4c9db3c59e7eaa631df30247df6572c0 100644
(file)
--- a/
include/babeltrace/trace-ir/packet.h
+++ b/
include/babeltrace/trace-ir/packet.h
@@
-29,7
+29,7
@@
/* For bt_packet, bt_packet_header_field, bt_packet_context_field, bt_stream */
#include <babeltrace/types.h>
/* For bt_packet, bt_packet_header_field, bt_packet_context_field, bt_stream */
#include <babeltrace/types.h>
-/* For
enum
bt_packet_status */
+/* For bt_packet_status */
#include <babeltrace/trace-ir/packet-const.h>
#include <stdint.h>
#include <babeltrace/trace-ir/packet-const.h>
#include <stdint.h>
@@
-46,14
+46,14
@@
extern
bt_field *bt_packet_borrow_header_field(bt_packet *packet);
extern
bt_field *bt_packet_borrow_header_field(bt_packet *packet);
extern
-
enum
bt_packet_status bt_packet_move_header_field(bt_packet *packet,
+bt_packet_status bt_packet_move_header_field(bt_packet *packet,
bt_packet_header_field *header);
extern
bt_field *bt_packet_borrow_context_field(bt_packet *packet);
extern
bt_packet_header_field *header);
extern
bt_field *bt_packet_borrow_context_field(bt_packet *packet);
extern
-
enum
bt_packet_status bt_packet_move_context_field(bt_packet *packet,
+bt_packet_status bt_packet_move_context_field(bt_packet *packet,
bt_packet_context_field *context);
extern
bt_packet_context_field *context);
extern
diff --git
a/include/babeltrace/trace-ir/stream-class-const.h
b/include/babeltrace/trace-ir/stream-class-const.h
index dee6fbde478319c502b49e846cf98f95843dea1a..c4307cf3c0f43feb94f14faa0c74f61de47fa70a 100644
(file)
--- a/
include/babeltrace/trace-ir/stream-class-const.h
+++ b/
include/babeltrace/trace-ir/stream-class-const.h
@@
-39,10
+39,10
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_stream_class_status {
+
typedef
enum bt_stream_class_status {
BT_STREAM_CLASS_STATUS_OK = 0,
BT_STREAM_CLASS_STATUS_NOMEM = -12,
BT_STREAM_CLASS_STATUS_OK = 0,
BT_STREAM_CLASS_STATUS_NOMEM = -12,
-};
+}
bt_stream_class_status
;
extern const bt_trace_class *bt_stream_class_borrow_trace_class_const(
const bt_stream_class *stream_class);
extern const bt_trace_class *bt_stream_class_borrow_trace_class_const(
const bt_stream_class *stream_class);
diff --git
a/include/babeltrace/trace-ir/stream-class.h
b/include/babeltrace/trace-ir/stream-class.h
index c8a8c98bfba15a829db765dbf94c9ca64253cc95..7895568b811b099d542ae30f166679102f8b9297 100644
(file)
--- a/
include/babeltrace/trace-ir/stream-class.h
+++ b/
include/babeltrace/trace-ir/stream-class.h
@@
-35,7
+35,7
@@
*/
#include <babeltrace/types.h>
*/
#include <babeltrace/types.h>
-/* For
enum
bt_stream_class_status */
+/* For bt_stream_class_status */
#include <babeltrace/trace-ir/stream-class-const.h>
#ifdef __cplusplus
#include <babeltrace/trace-ir/stream-class-const.h>
#ifdef __cplusplus
@@
-51,7
+51,7
@@
extern bt_stream_class *bt_stream_class_create_with_id(
extern bt_trace_class *bt_stream_class_borrow_trace_class(
bt_stream_class *stream_class);
extern bt_trace_class *bt_stream_class_borrow_trace_class(
bt_stream_class *stream_class);
-extern
enum
bt_stream_class_status bt_stream_class_set_name(
+extern bt_stream_class_status bt_stream_class_set_name(
bt_stream_class *stream_class, const char *name);
extern void bt_stream_class_set_assigns_automatic_event_class_id(
bt_stream_class *stream_class, const char *name);
extern void bt_stream_class_set_assigns_automatic_event_class_id(
@@
-60,17
+60,17
@@
extern void bt_stream_class_set_assigns_automatic_event_class_id(
extern void bt_stream_class_set_assigns_automatic_stream_id(
bt_stream_class *stream_class, bt_bool value);
extern void bt_stream_class_set_assigns_automatic_stream_id(
bt_stream_class *stream_class, bt_bool value);
-extern
enum
bt_stream_class_status
+extern bt_stream_class_status
bt_stream_class_set_packet_context_field_class(
bt_stream_class *stream_class,
bt_field_class *field_class);
bt_stream_class_set_packet_context_field_class(
bt_stream_class *stream_class,
bt_field_class *field_class);
-extern
enum
bt_stream_class_status
+extern bt_stream_class_status
bt_stream_class_set_event_header_field_class(
bt_stream_class *stream_class,
bt_field_class *field_class);
bt_stream_class_set_event_header_field_class(
bt_stream_class *stream_class,
bt_field_class *field_class);
-extern
enum
bt_stream_class_status
+extern bt_stream_class_status
bt_stream_class_set_event_common_context_field_class(
bt_stream_class *stream_class,
bt_field_class *field_class);
bt_stream_class_set_event_common_context_field_class(
bt_stream_class *stream_class,
bt_field_class *field_class);
@@
-86,7
+86,7
@@
bt_stream_class_borrow_event_class_by_id(
extern bt_clock_class *bt_stream_class_borrow_default_clock_class(
bt_stream_class *stream_class);
extern bt_clock_class *bt_stream_class_borrow_default_clock_class(
bt_stream_class *stream_class);
-extern
enum
bt_stream_class_status bt_stream_class_set_default_clock_class(
+extern bt_stream_class_status bt_stream_class_set_default_clock_class(
bt_stream_class *stream_class,
bt_clock_class *clock_class);
bt_stream_class *stream_class,
bt_clock_class *clock_class);
diff --git
a/include/babeltrace/trace-ir/stream-const.h
b/include/babeltrace/trace-ir/stream-const.h
index 0edbdac1e3231b2e3482636e6443b6c05b1db633..875b9ddfae7b79fd154ba598588ddfc81246c226 100644
(file)
--- a/
include/babeltrace/trace-ir/stream-const.h
+++ b/
include/babeltrace/trace-ir/stream-const.h
@@
-36,10
+36,10
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_stream_status {
+
typedef
enum bt_stream_status {
BT_STREAM_STATUS_OK = 0,
BT_STREAM_STATUS_NOMEM = -12,
BT_STREAM_STATUS_OK = 0,
BT_STREAM_STATUS_NOMEM = -12,
-};
+}
bt_stream_status
;
extern const bt_stream_class *bt_stream_borrow_class_const(
const bt_stream *stream);
extern const bt_stream_class *bt_stream_borrow_class_const(
const bt_stream *stream);
diff --git
a/include/babeltrace/trace-ir/stream.h
b/include/babeltrace/trace-ir/stream.h
index ba3921a8480ab93412a7396a6bad69fbafd92cf3..71d2171469d63e1adf93b3d048cc07d307778948 100644
(file)
--- a/
include/babeltrace/trace-ir/stream.h
+++ b/
include/babeltrace/trace-ir/stream.h
@@
-30,7
+30,7
@@
/* For bt_trace, bt_stream, bt_stream_class */
#include <babeltrace/types.h>
/* For bt_trace, bt_stream, bt_stream_class */
#include <babeltrace/types.h>
-/* For
enum
bt_stream_status */
+/* For bt_stream_status */
#include <babeltrace/trace-ir/stream-const.h>
#include <stdint.h>
#include <babeltrace/trace-ir/stream-const.h>
#include <stdint.h>
@@
-50,7
+50,7
@@
extern bt_trace *bt_stream_borrow_trace(bt_stream *stream);
extern bt_stream_class *bt_stream_borrow_class(bt_stream *stream);
extern bt_stream_class *bt_stream_borrow_class(bt_stream *stream);
-extern
enum
bt_stream_status bt_stream_set_name(bt_stream *stream,
+extern bt_stream_status bt_stream_set_name(bt_stream *stream,
const char *name);
#ifdef __cplusplus
const char *name);
#ifdef __cplusplus
diff --git
a/include/babeltrace/trace-ir/trace-class-const.h
b/include/babeltrace/trace-ir/trace-class-const.h
index 0cc1ebb38869d9c2feb9b7e21c79c09fdcd49284..c438799847f9434f493a9c7c1f7001bccb33d132 100644
(file)
--- a/
include/babeltrace/trace-ir/trace-class-const.h
+++ b/
include/babeltrace/trace-ir/trace-class-const.h
@@
-39,10
+39,10
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_trace_class_status {
+
typedef
enum bt_trace_class_status {
BT_TRACE_CLASS_STATUS_OK = 0,
BT_TRACE_CLASS_STATUS_NOMEM = -12,
BT_TRACE_CLASS_STATUS_OK = 0,
BT_TRACE_CLASS_STATUS_NOMEM = -12,
-};
+}
bt_trace_class_status
;
extern bt_bool bt_trace_class_assigns_automatic_stream_class_id(
const bt_trace_class *trace_class);
extern bt_bool bt_trace_class_assigns_automatic_stream_class_id(
const bt_trace_class *trace_class);
diff --git
a/include/babeltrace/trace-ir/trace-class.h
b/include/babeltrace/trace-ir/trace-class.h
index a22ff1aa7b1a7e0493c4a7ea23d6aaf51340c7a5..5cbabc0330ebc85fa6d5ad27952552221ededbe7 100644
(file)
--- a/
include/babeltrace/trace-ir/trace-class.h
+++ b/
include/babeltrace/trace-ir/trace-class.h
@@
-30,7
+30,7
@@
/* For bt_bool, bt_uuid, bt_trace_class, bt_stream_class, bt_field_class */
#include <babeltrace/types.h>
/* For bt_bool, bt_uuid, bt_trace_class, bt_stream_class, bt_field_class */
#include <babeltrace/types.h>
-/* For
enum
bt_trace_class_status */
+/* For bt_trace_class_status */
#include <babeltrace/trace-ir/trace-class-const.h>
#include <stdint.h>
#include <babeltrace/trace-ir/trace-class-const.h>
#include <stdint.h>
@@
-44,21
+44,21
@@
extern bt_trace_class *bt_trace_class_create(void);
extern void bt_trace_class_set_assigns_automatic_stream_class_id(
bt_trace_class *trace_class, bt_bool value);
extern void bt_trace_class_set_assigns_automatic_stream_class_id(
bt_trace_class *trace_class, bt_bool value);
-extern
enum
bt_trace_class_status bt_trace_class_set_name(
+extern bt_trace_class_status bt_trace_class_set_name(
bt_trace_class *trace_class, const char *name);
extern void bt_trace_class_set_uuid(bt_trace_class *trace_class,
bt_uuid uuid);
bt_trace_class *trace_class, const char *name);
extern void bt_trace_class_set_uuid(bt_trace_class *trace_class,
bt_uuid uuid);
-extern
enum
bt_trace_class_status bt_trace_class_set_environment_entry_integer(
+extern bt_trace_class_status bt_trace_class_set_environment_entry_integer(
bt_trace_class *trace_class,
const char *name, int64_t value);
bt_trace_class *trace_class,
const char *name, int64_t value);
-extern
enum
bt_trace_class_status bt_trace_class_set_environment_entry_string(
+extern bt_trace_class_status bt_trace_class_set_environment_entry_string(
bt_trace_class *trace_class,
const char *name, const char *value);
bt_trace_class *trace_class,
const char *name, const char *value);
-extern
enum
bt_trace_class_status bt_trace_class_set_packet_header_field_class(
+extern bt_trace_class_status bt_trace_class_set_packet_header_field_class(
bt_trace_class *trace_class,
bt_field_class *packet_header_field_class);
bt_trace_class *trace_class,
bt_field_class *packet_header_field_class);
diff --git
a/include/babeltrace/trace-ir/trace-const.h
b/include/babeltrace/trace-ir/trace-const.h
index 42a80a792185b6a0006c482aa0624c0f68de3084..adb382401c964af440ab27cecc96f94af53fdfa7 100644
(file)
--- a/
include/babeltrace/trace-ir/trace-const.h
+++ b/
include/babeltrace/trace-ir/trace-const.h
@@
-39,10
+39,10
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_trace_status {
+
typedef
enum bt_trace_status {
BT_TRACE_STATUS_OK = 0,
BT_TRACE_STATUS_NOMEM = -12,
BT_TRACE_STATUS_OK = 0,
BT_TRACE_STATUS_NOMEM = -12,
-};
+}
bt_trace_status
;
typedef void (* bt_trace_is_static_listener_func)(const bt_trace *trace,
void *data);
typedef void (* bt_trace_is_static_listener_func)(const bt_trace *trace,
void *data);
@@
-65,13
+65,13
@@
extern const bt_stream *bt_trace_borrow_stream_by_id_const(
extern bt_bool bt_trace_is_static(const bt_trace *trace);
extern bt_bool bt_trace_is_static(const bt_trace *trace);
-extern
enum
bt_trace_status bt_trace_add_is_static_listener(
+extern bt_trace_status bt_trace_add_is_static_listener(
const bt_trace *trace,
bt_trace_is_static_listener_func listener,
bt_trace_listener_removed_func listener_removed, void *data,
uint64_t *listener_id);
const bt_trace *trace,
bt_trace_is_static_listener_func listener,
bt_trace_listener_removed_func listener_removed, void *data,
uint64_t *listener_id);
-extern
enum
bt_trace_status bt_trace_remove_is_static_listener(
+extern bt_trace_status bt_trace_remove_is_static_listener(
const bt_trace *trace, uint64_t listener_id);
extern void bt_trace_get_ref(const bt_trace *trace);
const bt_trace *trace, uint64_t listener_id);
extern void bt_trace_get_ref(const bt_trace *trace);
diff --git
a/include/babeltrace/trace-ir/trace.h
b/include/babeltrace/trace-ir/trace.h
index 460c4b7db1f00e3c52782cd284f16e856fe8eeb3..0ae25f9ae401d8af9ed3679835dde3a374e00101 100644
(file)
--- a/
include/babeltrace/trace-ir/trace.h
+++ b/
include/babeltrace/trace-ir/trace.h
@@
-30,7
+30,7
@@
/* For bt_bool, bt_trace, bt_trace_class, bt_stream */
#include <babeltrace/types.h>
/* For bt_bool, bt_trace, bt_trace_class, bt_stream */
#include <babeltrace/types.h>
-/* For
enum
bt_trace_status */
+/* For bt_trace_status */
#include <babeltrace/trace-ir/trace-const.h>
#include <stdint.h>
#include <babeltrace/trace-ir/trace-const.h>
#include <stdint.h>
@@
-43,7
+43,7
@@
extern bt_trace_class *bt_trace_borrow_class(bt_trace *trace);
extern bt_trace *bt_trace_create(bt_trace_class *trace_class);
extern bt_trace *bt_trace_create(bt_trace_class *trace_class);
-extern
enum
bt_trace_status bt_trace_set_name(bt_trace *trace,
+extern bt_trace_status bt_trace_set_name(bt_trace *trace,
const char *name);
extern bt_stream *bt_trace_borrow_stream_by_index(bt_trace *trace,
const char *name);
extern bt_stream *bt_trace_borrow_stream_by_index(bt_trace *trace,
@@
-52,7
+52,7
@@
extern bt_stream *bt_trace_borrow_stream_by_index(bt_trace *trace,
extern bt_stream *bt_trace_borrow_stream_by_id(bt_trace *trace,
uint64_t id);
extern bt_stream *bt_trace_borrow_stream_by_id(bt_trace *trace,
uint64_t id);
-extern
enum
bt_trace_status bt_trace_make_static(bt_trace *trace);
+extern bt_trace_status bt_trace_make_static(bt_trace *trace);
#ifdef __cplusplus
}
#ifdef __cplusplus
}
diff --git
a/include/babeltrace/value-const.h
b/include/babeltrace/value-const.h
index 8966194c249b53dc7672bd156eee2f688a34b002..e5ff39da546e578bd991a1b6841ed4eb93d160b6 100644
(file)
--- a/
include/babeltrace/value-const.h
+++ b/
include/babeltrace/value-const.h
@@
-33,7
+33,7
@@
extern "C" {
#endif
extern "C" {
#endif
-enum bt_value_status {
+
typedef
enum bt_value_status {
/// Operation canceled.
BT_VALUE_STATUS_CANCELED = 125,
/// Operation canceled.
BT_VALUE_STATUS_CANCELED = 125,
@@
-42,9
+42,9
@@
enum bt_value_status {
/// Okay, no error.
BT_VALUE_STATUS_OK = 0,
/// Okay, no error.
BT_VALUE_STATUS_OK = 0,
-};
+}
bt_value_status
;
-enum bt_value_type {
+
typedef
enum bt_value_type {
/// Null value object.
BT_VALUE_TYPE_NULL = 0,
/// Null value object.
BT_VALUE_TYPE_NULL = 0,
@@
-65,9
+65,9
@@
enum bt_value_type {
/// Map value object.
BT_VALUE_TYPE_MAP = 6,
/// Map value object.
BT_VALUE_TYPE_MAP = 6,
-};
+}
bt_value_type
;
-extern
enum
bt_value_type bt_value_get_type(const bt_value *object);
+extern bt_value_type bt_value_get_type(const bt_value *object);
static inline
bt_bool bt_value_is_null(const bt_value *object)
static inline
bt_bool bt_value_is_null(const bt_value *object)
@@
-111,7
+111,7
@@
bt_bool bt_value_is_map(const bt_value *object)
return bt_value_get_type(object) == BT_VALUE_TYPE_MAP;
}
return bt_value_get_type(object) == BT_VALUE_TYPE_MAP;
}
-extern
enum
bt_value_status bt_value_copy(const bt_value *object,
+extern bt_value_status bt_value_copy(const bt_value *object,
bt_value **copy);
extern bt_bool bt_value_compare(const bt_value *object_a,
bt_value **copy);
extern bt_bool bt_value_compare(const bt_value *object_a,
@@
-150,14
+150,14
@@
extern const bt_value *bt_value_map_borrow_entry_value_const(
typedef bt_bool (* bt_value_map_foreach_entry_const_func)(const char *key,
const bt_value *object, void *data);
typedef bt_bool (* bt_value_map_foreach_entry_const_func)(const char *key,
const bt_value *object, void *data);
-extern
enum
bt_value_status bt_value_map_foreach_entry_const(
+extern bt_value_status bt_value_map_foreach_entry_const(
const bt_value *map_obj,
bt_value_map_foreach_entry_const_func func, void *data);
extern bt_bool bt_value_map_has_entry(const bt_value *map_obj,
const char *key);
const bt_value *map_obj,
bt_value_map_foreach_entry_const_func func, void *data);
extern bt_bool bt_value_map_has_entry(const bt_value *map_obj,
const char *key);
-extern
enum
bt_value_status bt_value_map_extend(
+extern bt_value_status bt_value_map_extend(
const bt_value *base_map_obj,
const bt_value *extension_map_obj,
bt_value **extended_map_obj);
const bt_value *base_map_obj,
const bt_value *extension_map_obj,
bt_value **extended_map_obj);
diff --git
a/include/babeltrace/value.h
b/include/babeltrace/value.h
index 9db6da2208753a7016ff15383966cd5dce86bf39..1e6bdc47c468b9398a0870d5e05a4b64fab323b5 100644
(file)
--- a/
include/babeltrace/value.h
+++ b/
include/babeltrace/value.h
@@
-29,7
+29,7
@@
/* For bt_bool, bt_value */
#include <babeltrace/types.h>
/* For bt_bool, bt_value */
#include <babeltrace/types.h>
-/* For
enum bt_value_status, enum
bt_value_type */
+/* For
bt_value_status,
bt_value_type */
#include <babeltrace/value-const.h>
#ifdef __cplusplus
#include <babeltrace/value-const.h>
#ifdef __cplusplus
@@
-61,7
+61,7
@@
extern bt_value *bt_value_string_create(void);
extern bt_value *bt_value_string_create_init(const char *val);
extern bt_value *bt_value_string_create_init(const char *val);
-extern
enum
bt_value_status bt_value_string_set(bt_value *string_obj,
+extern bt_value_status bt_value_string_set(bt_value *string_obj,
const char *val);
extern bt_value *bt_value_array_create(void);
const char *val);
extern bt_value *bt_value_array_create(void);
@@
-69,29
+69,29
@@
extern bt_value *bt_value_array_create(void);
extern bt_value *bt_value_array_borrow_element_by_index(
bt_value *array_obj, uint64_t index);
extern bt_value *bt_value_array_borrow_element_by_index(
bt_value *array_obj, uint64_t index);
-extern
enum
bt_value_status bt_value_array_append_element(
+extern bt_value_status bt_value_array_append_element(
bt_value *array_obj,
bt_value *element_obj);
bt_value *array_obj,
bt_value *element_obj);
-extern
enum
bt_value_status bt_value_array_append_bool_element(
+extern bt_value_status bt_value_array_append_bool_element(
bt_value *array_obj, bt_bool val);
bt_value *array_obj, bt_bool val);
-extern
enum
bt_value_status bt_value_array_append_integer_element(
+extern bt_value_status bt_value_array_append_integer_element(
bt_value *array_obj, int64_t val);
bt_value *array_obj, int64_t val);
-extern
enum
bt_value_status bt_value_array_append_real_element(
+extern bt_value_status bt_value_array_append_real_element(
bt_value *array_obj, double val);
bt_value *array_obj, double val);
-extern
enum
bt_value_status bt_value_array_append_string_element(
+extern bt_value_status bt_value_array_append_string_element(
bt_value *array_obj, const char *val);
bt_value *array_obj, const char *val);
-extern
enum
bt_value_status bt_value_array_append_empty_array_element(
+extern bt_value_status bt_value_array_append_empty_array_element(
bt_value *array_obj);
bt_value *array_obj);
-extern
enum
bt_value_status bt_value_array_append_empty_map_element(
+extern bt_value_status bt_value_array_append_empty_map_element(
bt_value *array_obj);
bt_value *array_obj);
-extern
enum
bt_value_status bt_value_array_set_element_by_index(
+extern bt_value_status bt_value_array_set_element_by_index(
bt_value *array_obj, uint64_t index,
bt_value *element_obj);
bt_value *array_obj, uint64_t index,
bt_value *element_obj);
@@
-103,31
+103,31
@@
extern bt_value *bt_value_map_borrow_entry_value(
typedef bt_bool (* bt_value_map_foreach_entry_func)(const char *key,
bt_value *object, void *data);
typedef bt_bool (* bt_value_map_foreach_entry_func)(const char *key,
bt_value *object, void *data);
-extern
enum
bt_value_status bt_value_map_foreach_entry(
+extern bt_value_status bt_value_map_foreach_entry(
bt_value *map_obj,
bt_value_map_foreach_entry_func func, void *data);
bt_value *map_obj,
bt_value_map_foreach_entry_func func, void *data);
-extern
enum
bt_value_status bt_value_map_insert_entry(
+extern bt_value_status bt_value_map_insert_entry(
bt_value *map_obj, const char *key,
bt_value *element_obj);
bt_value *map_obj, const char *key,
bt_value *element_obj);
-extern
enum
bt_value_status bt_value_map_insert_bool_entry(
+extern bt_value_status bt_value_map_insert_bool_entry(
bt_value *map_obj, const char *key, bt_bool val);
bt_value *map_obj, const char *key, bt_bool val);
-extern
enum
bt_value_status bt_value_map_insert_integer_entry(
+extern bt_value_status bt_value_map_insert_integer_entry(
bt_value *map_obj, const char *key, int64_t val);
bt_value *map_obj, const char *key, int64_t val);
-extern
enum
bt_value_status bt_value_map_insert_real_entry(
+extern bt_value_status bt_value_map_insert_real_entry(
bt_value *map_obj, const char *key, double val);
bt_value *map_obj, const char *key, double val);
-extern
enum
bt_value_status bt_value_map_insert_string_entry(
+extern bt_value_status bt_value_map_insert_string_entry(
bt_value *map_obj, const char *key,
const char *val);
bt_value *map_obj, const char *key,
const char *val);
-extern
enum
bt_value_status bt_value_map_insert_empty_array_entry(
+extern bt_value_status bt_value_map_insert_empty_array_entry(
bt_value *map_obj, const char *key);
bt_value *map_obj, const char *key);
-extern
enum
bt_value_status bt_value_map_insert_empty_map_entry(
+extern bt_value_status bt_value_map_insert_empty_map_entry(
bt_value *map_obj, const char *key);
#ifdef __cplusplus
bt_value *map_obj, const char *key);
#ifdef __cplusplus
diff --git
a/plugins/ctf/common/metadata/ctf-meta-resolve.c
b/plugins/ctf/common/metadata/ctf-meta-resolve.c
index 0292a7dfe479857feb7870ef9794ddfdc13122e4..ab2b44aa464bc7a3e9c825cd065d21f78adb183c 100644
(file)
--- a/
plugins/ctf/common/metadata/ctf-meta-resolve.c
+++ b/
plugins/ctf/common/metadata/ctf-meta-resolve.c
@@
-64,7
+64,7
@@
struct resolve_context {
} scopes;
/* Root scope being visited */
} scopes;
/* Root scope being visited */
-
enum
bt_scope root_scope;
+ bt_scope root_scope;
field_class_stack *field_class_stack;
struct ctf_field_class *cur_fc;
};
field_class_stack *field_class_stack;
struct ctf_field_class *cur_fc;
};
@@
-227,7
+227,7
@@
void field_class_stack_pop(field_class_stack *stack)
*/
static
struct ctf_field_class *borrow_class_from_ctx(struct resolve_context *ctx,
*/
static
struct ctf_field_class *borrow_class_from_ctx(struct resolve_context *ctx,
-
enum
bt_scope scope)
+ bt_scope scope)
{
switch (scope) {
case BT_SCOPE_PACKET_HEADER:
{
switch (scope) {
case BT_SCOPE_PACKET_HEADER:
@@
-254,10
+254,10
@@
struct ctf_field_class *borrow_class_from_ctx(struct resolve_context *ctx,
* is found to be relative.
*/
static
* is found to be relative.
*/
static
-
enum
bt_scope get_root_scope_from_absolute_pathstr(const char *pathstr)
+bt_scope get_root_scope_from_absolute_pathstr(const char *pathstr)
{
{
-
enum
bt_scope scope;
-
enum
bt_scope ret = -1;
+ bt_scope scope;
+ bt_scope ret = -1;
const size_t prefixes_count = sizeof(absolute_path_prefixes) /
sizeof(*absolute_path_prefixes);
const size_t prefixes_count = sizeof(absolute_path_prefixes) /
sizeof(*absolute_path_prefixes);
@@
-637,7
+637,7
@@
int pathstr_to_field_path(const char *pathstr,
struct ctf_field_path *field_path, struct resolve_context *ctx)
{
int ret = 0;
struct ctf_field_path *field_path, struct resolve_context *ctx)
{
int ret = 0;
-
enum
bt_scope root_scope;
+ bt_scope root_scope;
GList *ptokens = NULL;
/* Convert path string to path tokens */
GList *ptokens = NULL;
/* Convert path string to path tokens */
@@
-1148,7
+1148,7
@@
end:
* Resolves the root field class corresponding to the scope `root_scope`.
*/
static
* Resolves the root field class corresponding to the scope `root_scope`.
*/
static
-int resolve_root_class(
enum
bt_scope root_scope, struct resolve_context *ctx)
+int resolve_root_class(bt_scope root_scope, struct resolve_context *ctx)
{
int ret;
{
int ret;
diff --git
a/plugins/ctf/common/metadata/ctf-meta.h
b/plugins/ctf/common/metadata/ctf-meta.h
index b4d56a45d87b95cbb4b42daab10dfd10b31f04a4..bca30c7aa7c47f64c6c6ec66d1643f3cbaf769de 100644
(file)
--- a/
plugins/ctf/common/metadata/ctf-meta.h
+++ b/
plugins/ctf/common/metadata/ctf-meta.h
@@
-79,7
+79,7
@@
struct ctf_field_class_int {
struct ctf_field_class_bit_array base;
enum ctf_field_class_meaning meaning;
bool is_signed;
struct ctf_field_class_bit_array base;
enum ctf_field_class_meaning meaning;
bool is_signed;
-
enum
bt_field_class_integer_preferred_display_base disp_base;
+ bt_field_class_integer_preferred_display_base disp_base;
enum ctf_encoding encoding;
int64_t storing_index;
enum ctf_encoding encoding;
int64_t storing_index;
@@
-135,7
+135,7
@@
struct ctf_field_class_struct {
};
struct ctf_field_path {
};
struct ctf_field_path {
-
enum
bt_scope root;
+ bt_scope root;
/* Array of `int64_t` */
GArray *path;
/* Array of `int64_t` */
GArray *path;
@@
-188,7
+188,7
@@
struct ctf_event_class {
GString *name;
uint64_t id;
GString *emf_uri;
GString *name;
uint64_t id;
GString *emf_uri;
-
enum
bt_event_class_log_level log_level;
+ bt_event_class_log_level log_level;
bool is_translated;
/* Owned by this */
bool is_translated;
/* Owned by this */
diff --git
a/plugins/ctf/common/metadata/visitor-generate-ir.c
b/plugins/ctf/common/metadata/visitor-generate-ir.c
index 08c1e03b32d1ab103149cbeeda877916c947fb45..71957e20a4051d0c320300fe4ccecf5ef7f26b69 100644
(file)
--- a/
plugins/ctf/common/metadata/visitor-generate-ir.c
+++ b/
plugins/ctf/common/metadata/visitor-generate-ir.c
@@
-2352,7
+2352,7
@@
int visit_integer_decl(struct ctx *ctx,
uint64_t alignment = 0, size = 0;
bt_clock_class *mapped_clock_class = NULL;
enum ctf_encoding encoding = CTF_ENCODING_NONE;
uint64_t alignment = 0, size = 0;
bt_clock_class *mapped_clock_class = NULL;
enum ctf_encoding encoding = CTF_ENCODING_NONE;
-
enum
bt_field_class_integer_preferred_display_base base =
+ bt_field_class_integer_preferred_display_base base =
BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_DECIMAL;
enum ctf_byte_order byte_order = ctx->ctf_tc->default_byte_order;
BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_DECIMAL;
enum ctf_byte_order byte_order = ctx->ctf_tc->default_byte_order;
@@
-3252,7
+3252,7
@@
int visit_event_decl_entry(struct ctx *ctx, struct ctf_node *node,
_SET(set, _EVENT_FIELDS_SET);
} else if (!strcmp(left, "loglevel")) {
uint64_t loglevel_value;
_SET(set, _EVENT_FIELDS_SET);
} else if (!strcmp(left, "loglevel")) {
uint64_t loglevel_value;
-
enum
bt_event_class_log_level log_level = -1;
+ bt_event_class_log_level log_level = -1;
if (_IS_SET(set, _EVENT_LOG_LEVEL_SET)) {
_BT_LOGE_DUP_ATTR(node, "loglevel",
if (_IS_SET(set, _EVENT_LOG_LEVEL_SET)) {
_BT_LOGE_DUP_ATTR(node, "loglevel",
diff --git
a/plugins/ctf/fs-sink/write.c
b/plugins/ctf/fs-sink/write.c
index 05a75e5a4f5cdef29ce4ad83c7d848af0bf8c3ef..82057e025608b3b07d39f7e0fada9fcd406e504e 100644
(file)
--- a/
plugins/ctf/fs-sink/write.c
+++ b/
plugins/ctf/fs-sink/write.c
@@
-111,7
+111,7
@@
const bt_stream_class *insert_new_stream_class(
const bt_stream_class *writer_stream_class = NULL;
const bt_trace *trace = NULL, *writer_trace = NULL;
struct bt_ctf_writer *ctf_writer = fs_writer->writer;
const bt_stream_class *writer_stream_class = NULL;
const bt_trace *trace = NULL, *writer_trace = NULL;
struct bt_ctf_writer *ctf_writer = fs_writer->writer;
-
enum
bt_component_status ret;
+ bt_component_status ret;
trace = bt_stream_class_get_trace(stream_class);
BT_ASSERT(trace);
trace = bt_stream_class_get_trace(stream_class);
BT_ASSERT(trace);
@@
-285,7
+285,7
@@
struct fs_writer *insert_new_writer(
struct bt_ctf_writer *ctf_writer = NULL;
const bt_trace *writer_trace = NULL;
char trace_path[PATH_MAX];
struct bt_ctf_writer *ctf_writer = NULL;
const bt_trace *writer_trace = NULL;
char trace_path[PATH_MAX];
-
enum
bt_component_status ret;
+ bt_component_status ret;
const bt_stream *stream = NULL;
struct fs_writer *fs_writer = NULL;
int nr_stream, i;
const bt_stream *stream = NULL;
struct fs_writer *fs_writer = NULL;
int nr_stream, i;
@@
-530,14
+530,14
@@
void writer_close(struct writer_component *writer_component,
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_component_status writer_stream_begin(
+bt_component_status writer_stream_begin(
struct writer_component *writer_component,
const bt_stream *stream)
{
const bt_stream_class *stream_class = NULL;
struct fs_writer *fs_writer;
const bt_stream *writer_stream = NULL;
struct writer_component *writer_component,
const bt_stream *stream)
{
const bt_stream_class *stream_class = NULL;
struct fs_writer *fs_writer;
const bt_stream *writer_stream = NULL;
-
enum
bt_component_status ret = BT_COMPONENT_STATUS_OK;
+ bt_component_status ret = BT_COMPONENT_STATUS_OK;
enum fs_writer_stream_state *state;
stream_class = bt_stream_get_class(stream);
enum fs_writer_stream_state *state;
stream_class = bt_stream_get_class(stream);
@@
-582,14
+582,14
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_component_status writer_stream_end(
+bt_component_status writer_stream_end(
struct writer_component *writer_component,
const bt_stream *stream)
{
const bt_stream_class *stream_class = NULL;
struct fs_writer *fs_writer;
const bt_trace *trace = NULL;
struct writer_component *writer_component,
const bt_stream *stream)
{
const bt_stream_class *stream_class = NULL;
struct fs_writer *fs_writer;
const bt_trace *trace = NULL;
-
enum
bt_component_status ret = BT_COMPONENT_STATUS_OK;
+ bt_component_status ret = BT_COMPONENT_STATUS_OK;
enum fs_writer_stream_state *state;
stream_class = bt_stream_get_class(stream);
enum fs_writer_stream_state *state;
stream_class = bt_stream_get_class(stream);
@@
-633,12
+633,12
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_component_status writer_new_packet(
+bt_component_status writer_new_packet(
struct writer_component *writer_component,
const bt_packet *packet)
{
const bt_stream *stream = NULL, *writer_stream = NULL;
struct writer_component *writer_component,
const bt_packet *packet)
{
const bt_stream *stream = NULL, *writer_stream = NULL;
-
enum
bt_component_status ret = BT_COMPONENT_STATUS_OK;
+ bt_component_status ret = BT_COMPONENT_STATUS_OK;
int int_ret;
stream = bt_packet_get_stream(packet);
int int_ret;
stream = bt_packet_get_stream(packet);
@@
-676,12
+676,12
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_component_status writer_close_packet(
+bt_component_status writer_close_packet(
struct writer_component *writer_component,
const bt_packet *packet)
{
const bt_stream *stream = NULL, *writer_stream = NULL;
struct writer_component *writer_component,
const bt_packet *packet)
{
const bt_stream *stream = NULL, *writer_stream = NULL;
-
enum
bt_component_status ret;
+ bt_component_status ret;
stream = bt_packet_get_stream(packet);
BT_ASSERT(stream);
stream = bt_packet_get_stream(packet);
BT_ASSERT(stream);
@@
-715,11
+715,11
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_component_status writer_output_event(
+bt_component_status writer_output_event(
struct writer_component *writer_component,
const bt_event *event)
{
struct writer_component *writer_component,
const bt_event *event)
{
-
enum
bt_component_status ret;
+ bt_component_status ret;
const bt_event_class *event_class = NULL, *writer_event_class = NULL;
const bt_stream *stream = NULL, *writer_stream = NULL;
const bt_stream_class *stream_class = NULL, *writer_stream_class = NULL;
const bt_event_class *event_class = NULL, *writer_event_class = NULL;
const bt_stream *stream = NULL, *writer_stream = NULL;
const bt_stream_class *stream_class = NULL, *writer_stream_class = NULL;
diff --git
a/plugins/ctf/fs-sink/writer.c
b/plugins/ctf/fs-sink/writer.c
index 38db9a5e474da2991b9250c100d73d9cd3d0aee4..72e3ab665209c8cc4dae0942141abe170ef959a2 100644
(file)
--- a/
plugins/ctf/fs-sink/writer.c
+++ b/
plugins/ctf/fs-sink/writer.c
@@
-109,11
+109,11
@@
end:
}
static
}
static
-
enum
bt_component_status handle_message(
+bt_component_status handle_message(
struct writer_component *writer_component,
const bt_message *message)
{
struct writer_component *writer_component,
const bt_message *message)
{
-
enum
bt_component_status ret = BT_COMPONENT_STATUS_OK;
+ bt_component_status ret = BT_COMPONENT_STATUS_OK;
if (!writer_component) {
ret = BT_COMPONENT_STATUS_ERROR;
if (!writer_component) {
ret = BT_COMPONENT_STATUS_ERROR;
@@
-205,7
+205,7
@@
void writer_component_port_connected(
{
struct bt_private_connection *connection;
struct writer_component *writer;
{
struct bt_private_connection *connection;
struct writer_component *writer;
-
enum
bt_connection_status conn_status;
+ bt_connection_status conn_status;
writer = bt_self_component_get_user_data(component);
BT_ASSERT(writer);
writer = bt_self_component_get_user_data(component);
BT_ASSERT(writer);
@@
-222,14
+222,14
@@
void writer_component_port_connected(
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_component_status writer_run(bt_self_component *component)
+bt_component_status writer_run(bt_self_component *component)
{
{
-
enum
bt_component_status ret;
+ bt_component_status ret;
const bt_message *message = NULL;
bt_message_iterator *it;
struct writer_component *writer_component =
bt_self_component_get_user_data(component);
const bt_message *message = NULL;
bt_message_iterator *it;
struct writer_component *writer_component =
bt_self_component_get_user_data(component);
-
enum
bt_message_iterator_status it_ret;
+ bt_message_iterator_status it_ret;
if (unlikely(writer_component->error)) {
ret = BT_COMPONENT_STATUS_ERROR;
if (unlikely(writer_component->error)) {
ret = BT_COMPONENT_STATUS_ERROR;
@@
-264,14
+264,14
@@
end:
}
static
}
static
-
enum
bt_component_status apply_one_bool(const char *key,
+bt_component_status apply_one_bool(const char *key,
bt_value *params,
bool *option,
bool *found)
{
bt_value *params,
bool *option,
bool *found)
{
-
enum
bt_component_status ret = BT_COMPONENT_STATUS_OK;
+ bt_component_status ret = BT_COMPONENT_STATUS_OK;
bt_value *value = NULL;
bt_value *value = NULL;
-
enum
bt_value_status status;
+ bt_value_status status;
bt_bool bool_val;
value = bt_value_map_get(params, key);
bt_bool bool_val;
value = bt_value_map_get(params, key);
@@
-290,12
+290,12
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_component_status writer_component_init(
+bt_component_status writer_component_init(
bt_self_component *component, bt_value *params,
UNUSED_VAR void *init_method_data)
{
bt_self_component *component, bt_value *params,
UNUSED_VAR void *init_method_data)
{
-
enum
bt_component_status ret;
-
enum
bt_value_status value_ret;
+ bt_component_status ret;
+ bt_value_status value_ret;
struct writer_component *writer_component = create_writer_component();
bt_value *value = NULL;
const char *path;
struct writer_component *writer_component = create_writer_component();
bt_value *value = NULL;
const char *path;
diff --git
a/plugins/ctf/fs-sink/writer.h
b/plugins/ctf/fs-sink/writer.h
index 965f3d2cb6cb3f0070c1f0f1b5d1bd8dbb8b30a4..34f54ae71bd57967fbf51625f475bc1c9eda6c2e 100644
(file)
--- a/
plugins/ctf/fs-sink/writer.h
+++ b/
plugins/ctf/fs-sink/writer.h
@@
-75,28
+75,28
@@
BT_HIDDEN
void writer_close(struct writer_component *writer_component,
struct fs_writer *fs_writer);
BT_HIDDEN
void writer_close(struct writer_component *writer_component,
struct fs_writer *fs_writer);
BT_HIDDEN
-
enum
bt_component_status writer_output_event(struct writer_component *writer,
+bt_component_status writer_output_event(struct writer_component *writer,
const bt_event *event);
BT_HIDDEN
const bt_event *event);
BT_HIDDEN
-
enum
bt_component_status writer_new_packet(struct writer_component *writer,
+bt_component_status writer_new_packet(struct writer_component *writer,
const bt_packet *packet);
BT_HIDDEN
const bt_packet *packet);
BT_HIDDEN
-
enum
bt_component_status writer_close_packet(struct writer_component *writer,
+bt_component_status writer_close_packet(struct writer_component *writer,
const bt_packet *packet);
BT_HIDDEN
const bt_packet *packet);
BT_HIDDEN
-
enum
bt_component_status writer_stream_begin(struct writer_component *writer,
+bt_component_status writer_stream_begin(struct writer_component *writer,
const bt_stream *stream);
BT_HIDDEN
const bt_stream *stream);
BT_HIDDEN
-
enum
bt_component_status writer_stream_end(struct writer_component *writer,
+bt_component_status writer_stream_end(struct writer_component *writer,
const bt_stream *stream);
BT_HIDDEN
const bt_stream *stream);
BT_HIDDEN
-
enum
bt_component_status writer_component_init(
+bt_component_status writer_component_init(
bt_self_component *component, bt_value *params,
void *init_method_data);
BT_HIDDEN
bt_self_component *component, bt_value *params,
void *init_method_data);
BT_HIDDEN
-
enum
bt_component_status writer_run(bt_self_component *component);
+bt_component_status writer_run(bt_self_component *component);
BT_HIDDEN
void writer_component_port_connected(
BT_HIDDEN
void writer_component_port_connected(
diff --git
a/plugins/ctf/fs-src/data-stream-file.c
b/plugins/ctf/fs-src/data-stream-file.c
index da4d1fa57b4f89e988b4d0bef9637882096f8fd1..3c4b0bfe67710776a9524d6d5dc6325e72020d94 100644
(file)
--- a/
plugins/ctf/fs-src/data-stream-file.c
+++ b/
plugins/ctf/fs-src/data-stream-file.c
@@
-706,12
+706,12
@@
void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *ds_file)
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_message_iterator_status ctf_fs_ds_file_next(
+bt_message_iterator_status ctf_fs_ds_file_next(
struct ctf_fs_ds_file *ds_file,
bt_message **msg)
{
enum bt_msg_iter_status msg_iter_status;
struct ctf_fs_ds_file *ds_file,
bt_message **msg)
{
enum bt_msg_iter_status msg_iter_status;
-
enum
bt_message_iterator_status status;
+ bt_message_iterator_status status;
msg_iter_status = bt_msg_iter_get_next_message(
ds_file->msg_iter, ds_file->pc_msg_iter, msg);
msg_iter_status = bt_msg_iter_get_next_message(
ds_file->msg_iter, ds_file->pc_msg_iter, msg);
diff --git
a/plugins/ctf/fs-src/data-stream-file.h
b/plugins/ctf/fs-src/data-stream-file.h
index 544e35591660c9c47ee4c78c07c1b1f39e23326f..0ccba27ae95e8c36d75ddd4e8adb61814a49b714 100644
(file)
--- a/
plugins/ctf/fs-src/data-stream-file.h
+++ b/
plugins/ctf/fs-src/data-stream-file.h
@@
-142,7
+142,7
@@
BT_HIDDEN
void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *stream);
BT_HIDDEN
void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *stream);
BT_HIDDEN
-
enum
bt_message_iterator_status ctf_fs_ds_file_next(
+bt_message_iterator_status ctf_fs_ds_file_next(
struct ctf_fs_ds_file *ds_file,
bt_message **msg);
struct ctf_fs_ds_file *ds_file,
bt_message **msg);
diff --git
a/plugins/ctf/fs-src/fs.c
b/plugins/ctf/fs-src/fs.c
index 5b15ffa2491a57e4349f2c7909c985b12bf7710b..b6e2fb4ffc97c91a78e734259ebcc14524a1197a 100644
(file)
--- a/
plugins/ctf/fs-src/fs.c
+++ b/
plugins/ctf/fs-src/fs.c
@@
-88,11
+88,11
@@
void ctf_fs_msg_iter_data_destroy(
}
static
}
static
-
enum
bt_self_message_iterator_status ctf_fs_iterator_next_one(
+bt_self_message_iterator_status ctf_fs_iterator_next_one(
struct ctf_fs_msg_iter_data *msg_iter_data,
const bt_message **msg)
{
struct ctf_fs_msg_iter_data *msg_iter_data,
const bt_message **msg)
{
-
enum
bt_self_message_iterator_status status;
+ bt_self_message_iterator_status status;
bt_message *priv_msg;
int ret;
bt_message *priv_msg;
int ret;
@@
-194,12
+194,12
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_self_message_iterator_status ctf_fs_iterator_next(
+bt_self_message_iterator_status ctf_fs_iterator_next(
bt_self_message_iterator *iterator,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
{
bt_self_message_iterator *iterator,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
{
-
enum
bt_self_message_iterator_status status =
+ bt_self_message_iterator_status status =
BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
struct ctf_fs_msg_iter_data *msg_iter_data =
bt_self_message_iterator_get_data(iterator);
BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
struct ctf_fs_msg_iter_data *msg_iter_data =
bt_self_message_iterator_get_data(iterator);
@@
-237,14
+237,14
@@
void ctf_fs_iterator_finalize(bt_self_message_iterator *it)
bt_self_message_iterator_get_data(it));
}
bt_self_message_iterator_get_data(it));
}
-
enum
bt_self_message_iterator_status ctf_fs_iterator_init(
+bt_self_message_iterator_status ctf_fs_iterator_init(
bt_self_message_iterator *self_msg_iter,
bt_self_component_source *self_comp,
bt_self_component_port_output *self_port)
{
struct ctf_fs_port_data *port_data;
struct ctf_fs_msg_iter_data *msg_iter_data = NULL;
bt_self_message_iterator *self_msg_iter,
bt_self_component_source *self_comp,
bt_self_component_port_output *self_port)
{
struct ctf_fs_port_data *port_data;
struct ctf_fs_msg_iter_data *msg_iter_data = NULL;
-
enum
bt_self_message_iterator_status ret =
+ bt_self_message_iterator_status ret =
BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
int iret;
BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
int iret;
@@
-1384,12
+1384,12
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_self_component_status ctf_fs_init(
+bt_self_component_status ctf_fs_init(
bt_self_component_source *self_comp,
const bt_value *params, UNUSED_VAR void *init_method_data)
{
struct ctf_fs_component *ctf_fs;
bt_self_component_source *self_comp,
const bt_value *params, UNUSED_VAR void *init_method_data)
{
struct ctf_fs_component *ctf_fs;
-
enum
bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK;
+ bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK;
ctf_fs = ctf_fs_create(self_comp, params);
if (!ctf_fs) {
ctf_fs = ctf_fs_create(self_comp, params);
if (!ctf_fs) {
@@
-1400,13
+1400,13
@@
enum bt_self_component_status ctf_fs_init(
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_query_status ctf_fs_query(
+bt_query_status ctf_fs_query(
bt_self_component_class_source *comp_class,
const bt_query_executor *query_exec,
const char *object, const bt_value *params,
const bt_value **result)
{
bt_self_component_class_source *comp_class,
const bt_query_executor *query_exec,
const char *object, const bt_value *params,
const bt_value **result)
{
-
enum
bt_query_status status = BT_QUERY_STATUS_OK;
+ bt_query_status status = BT_QUERY_STATUS_OK;
if (!strcmp(object, "metadata-info")) {
status = metadata_info_query(comp_class, params, result);
if (!strcmp(object, "metadata-info")) {
status = metadata_info_query(comp_class, params, result);
diff --git
a/plugins/ctf/fs-src/fs.h
b/plugins/ctf/fs-src/fs.h
index bbcf48eead7f82e5bf46ba23cf04699e7d5c1d9b..3f36387f495d0e0f25c26713071b38c6a088bd34 100644
(file)
--- a/
plugins/ctf/fs-src/fs.h
+++ b/
plugins/ctf/fs-src/fs.h
@@
-155,7
+155,7
@@
struct ctf_fs_msg_iter_data {
};
BT_HIDDEN
};
BT_HIDDEN
-
enum
bt_self_component_status ctf_fs_init(
+bt_self_component_status ctf_fs_init(
bt_self_component_source *source,
const bt_value *params, void *init_method_data);
bt_self_component_source *source,
const bt_value *params, void *init_method_data);
@@
-163,7
+163,7
@@
BT_HIDDEN
void ctf_fs_finalize(bt_self_component_source *component);
BT_HIDDEN
void ctf_fs_finalize(bt_self_component_source *component);
BT_HIDDEN
-
enum
bt_query_status ctf_fs_query(
+bt_query_status ctf_fs_query(
bt_self_component_class_source *comp_class,
const bt_query_executor *query_exec,
const char *object, const bt_value *params,
bt_self_component_class_source *comp_class,
const bt_query_executor *query_exec,
const char *object, const bt_value *params,
@@
-183,7
+183,7
@@
BT_HIDDEN
GList *ctf_fs_create_trace_names(GList *trace_paths, const char *base_path);
BT_HIDDEN
GList *ctf_fs_create_trace_names(GList *trace_paths, const char *base_path);
BT_HIDDEN
-
enum
bt_self_message_iterator_status ctf_fs_iterator_init(
+bt_self_message_iterator_status ctf_fs_iterator_init(
bt_self_message_iterator *self_msg_iter,
bt_self_component_source *self_comp,
bt_self_component_port_output *self_port);
bt_self_message_iterator *self_msg_iter,
bt_self_component_source *self_comp,
bt_self_component_port_output *self_port);
@@
-192,7
+192,7
@@
BT_HIDDEN
void ctf_fs_iterator_finalize(bt_self_message_iterator *it);
BT_HIDDEN
void ctf_fs_iterator_finalize(bt_self_message_iterator *it);
BT_HIDDEN
-
enum
bt_self_message_iterator_status ctf_fs_iterator_next(
+bt_self_message_iterator_status ctf_fs_iterator_next(
bt_self_message_iterator *iterator,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count);
bt_self_message_iterator *iterator,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count);
diff --git
a/plugins/ctf/fs-src/query.c
b/plugins/ctf/fs-src/query.c
index 0cdf22c1e87e28fde9e20155f679e97dd4016b95..bccb78aaf588e918b94587cfda23140f28b3e8e6 100644
(file)
--- a/
plugins/ctf/fs-src/query.c
+++ b/
plugins/ctf/fs-src/query.c
@@
-46,12
+46,12
@@
struct range {
};
BT_HIDDEN
};
BT_HIDDEN
-
enum
bt_query_status metadata_info_query(
+bt_query_status metadata_info_query(
bt_self_component_class_source *comp_class,
const bt_value *params,
const bt_value **user_result)
{
bt_self_component_class_source *comp_class,
const bt_value *params,
const bt_value **user_result)
{
-
enum
bt_query_status status = BT_QUERY_STATUS_OK;
+ bt_query_status status = BT_QUERY_STATUS_OK;
bt_value *result = NULL;
const bt_value *path_value = NULL;
char *metadata_text = NULL;
bt_value *result = NULL;
const bt_value *path_value = NULL;
char *metadata_text = NULL;
@@
-185,7
+185,7
@@
int add_range(bt_value *info, struct range *range,
const char *range_name)
{
int ret = 0;
const char *range_name)
{
int ret = 0;
-
enum
bt_value_status status;
+ bt_value_status status;
bt_value *range_map = NULL;
if (!range->set) {
bt_value *range_map = NULL;
if (!range->set) {
@@
-230,7
+230,7
@@
int add_stream_ids(bt_value *info, const bt_stream *stream)
{
int ret = 0;
int64_t stream_class_id, stream_instance_id;
{
int ret = 0;
int64_t stream_class_id, stream_instance_id;
-
enum
bt_value_status status;
+ bt_value_status status;
const bt_stream_class *stream_class = NULL;
stream_instance_id = bt_stream_get_id(stream);
const bt_stream_class *stream_class = NULL;
stream_instance_id = bt_stream_get_id(stream);
@@
-271,7
+271,7
@@
int populate_stream_info(struct ctf_fs_ds_file_group *group,
{
int ret = 0;
size_t file_idx;
{
int ret = 0;
size_t file_idx;
-
enum
bt_value_status status;
+ bt_value_status status;
bt_value *file_paths;
stream_range->begin_ns = INT64_MAX;
bt_value *file_paths;
stream_range->begin_ns = INT64_MAX;
@@
-347,7
+347,7
@@
int populate_trace_info(const char *trace_path, const char *trace_name,
int ret = 0;
size_t group_idx;
struct ctf_fs_trace *trace = NULL;
int ret = 0;
size_t group_idx;
struct ctf_fs_trace *trace = NULL;
-
enum
bt_value_status status;
+ bt_value_status status;
bt_value *file_groups;
struct range trace_range = {
.begin_ns = INT64_MAX,
bt_value *file_groups;
struct range trace_range = {
.begin_ns = INT64_MAX,
@@
-462,12
+462,12
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_query_status trace_info_query(
+bt_query_status trace_info_query(
bt_self_component_class_source *comp_class,
const bt_value *params,
const bt_value **user_result)
{
bt_self_component_class_source *comp_class,
const bt_value *params,
const bt_value **user_result)
{
-
enum
bt_query_status status = BT_QUERY_STATUS_OK;
+ bt_query_status status = BT_QUERY_STATUS_OK;
bt_value *result = NULL;
const bt_value *path_value = NULL;
int ret = 0;
bt_value *result = NULL;
const bt_value *path_value = NULL;
int ret = 0;
@@
-520,7
+520,7
@@
enum bt_query_status trace_info_query(
tn_node = g_list_next(tn_node)) {
GString *trace_path = tp_node->data;
GString *trace_name = tn_node->data;
tn_node = g_list_next(tn_node)) {
GString *trace_path = tp_node->data;
GString *trace_name = tn_node->data;
-
enum
bt_value_status status;
+ bt_value_status status;
bt_value *trace_info;
trace_info = bt_value_map_create();
bt_value *trace_info;
trace_info = bt_value_map_create();
diff --git
a/plugins/ctf/fs-src/query.h
b/plugins/ctf/fs-src/query.h
index e778d4d07292140c6abf840a28cd8e56cc6e9096..25229fde72b82cc50b5c1ff76f970686004e12d3 100644
(file)
--- a/
plugins/ctf/fs-src/query.h
+++ b/
plugins/ctf/fs-src/query.h
@@
-29,12
+29,12
@@
#include <babeltrace/babeltrace.h>
BT_HIDDEN
#include <babeltrace/babeltrace.h>
BT_HIDDEN
-
enum
bt_query_status metadata_info_query(
+bt_query_status metadata_info_query(
bt_self_component_class_source *comp_class,
const bt_value *params, const bt_value **result);
BT_HIDDEN
bt_self_component_class_source *comp_class,
const bt_value *params, const bt_value **result);
BT_HIDDEN
-
enum
bt_query_status trace_info_query(
+bt_query_status trace_info_query(
bt_self_component_class_source *comp_class,
const bt_value *params, const bt_value **result);
bt_self_component_class_source *comp_class,
const bt_value *params, const bt_value **result);
diff --git
a/plugins/ctf/lttng-live/data-stream.c
b/plugins/ctf/lttng-live/data-stream.c
index 54eb9dfc626a308ebf55ce91a74687e135597e28..fde80b64c208b15f8d4f1bc552f1e3e0d5057c06 100644
(file)
--- a/
plugins/ctf/lttng-live/data-stream.c
+++ b/
plugins/ctf/lttng-live/data-stream.c
@@
-111,7
+111,7
@@
static struct bt_msg_iter_medium_ops medops = {
};
BT_HIDDEN
};
BT_HIDDEN
-
enum
bt_lttng_live_iterator_status lttng_live_lazy_msg_init(
+bt_lttng_live_iterator_status lttng_live_lazy_msg_init(
struct lttng_live_session *session)
{
struct lttng_live_component *lttng_live = session->lttng_live;
struct lttng_live_session *session)
{
struct lttng_live_component *lttng_live = session->lttng_live;
diff --git
a/plugins/ctf/lttng-live/data-stream.h
b/plugins/ctf/lttng-live/data-stream.h
index 3812315ed7cf46d9bcb0f1db219e4af5f6df3d56..5c219c32d8a8bb393cf79e2a6468a56482999aca 100644
(file)
--- a/
plugins/ctf/lttng-live/data-stream.h
+++ b/
plugins/ctf/lttng-live/data-stream.h
@@
-31,7
+31,7
@@
#include "lttng-live-internal.h"
#include "../common/msg-iter/msg-iter.h"
#include "lttng-live-internal.h"
#include "../common/msg-iter/msg-iter.h"
-
enum
bt_lttng_live_iterator_status lttng_live_lazy_msg_init(
+bt_lttng_live_iterator_status lttng_live_lazy_msg_init(
struct lttng_live_session *session);
struct lttng_live_stream_iterator *lttng_live_stream_iterator_create(
struct lttng_live_session *session);
struct lttng_live_stream_iterator *lttng_live_stream_iterator_create(
diff --git
a/plugins/ctf/lttng-live/lttng-live-internal.h
b/plugins/ctf/lttng-live/lttng-live-internal.h
index f8923a744df25b94d9053527ca25e74c5e65945d..fe35314316a8f30b108c058163b2e2dd0affb680 100644
(file)
--- a/
plugins/ctf/lttng-live/lttng-live-internal.h
+++ b/
plugins/ctf/lttng-live/lttng-live-internal.h
@@
-190,7
+190,7
@@
struct lttng_live_component {
bt_component *downstream_component;
};
bt_component *downstream_component;
};
-
enum
bt_lttng_live_iterator_status {
+bt_lttng_live_iterator_status {
/** Iterator state has progressed. Continue iteration immediately. */
BT_LTTNG_LIVE_ITERATOR_STATUS_CONTINUE = 3,
/** No message available for now. Try again later. */
/** Iterator state has progressed. Continue iteration immediately. */
BT_LTTNG_LIVE_ITERATOR_STATUS_CONTINUE = 3,
/** No message available for now. Try again later. */
@@
-209,7
+209,7
@@
enum bt_lttng_live_iterator_status {
BT_LTTNG_LIVE_ITERATOR_STATUS_UNSUPPORTED = -4,
};
BT_LTTNG_LIVE_ITERATOR_STATUS_UNSUPPORTED = -4,
};
-
enum
bt_component_status lttng_live_component_init(bt_self_component *source,
+bt_component_status lttng_live_component_init(bt_self_component *source,
bt_value *params, void *init_method_data);
bt_component_class_query_method_return lttng_live_query(
bt_value *params, void *init_method_data);
bt_component_class_query_method_return lttng_live_query(
@@
-222,12
+222,12
@@
void lttng_live_component_finalize(bt_self_component *component);
bt_message_iterator_next_method_return lttng_live_iterator_next(
bt_self_message_iterator *iterator);
bt_message_iterator_next_method_return lttng_live_iterator_next(
bt_self_message_iterator *iterator);
-
enum
bt_component_status lttng_live_accept_port_connection(
+bt_component_status lttng_live_accept_port_connection(
bt_self_component *private_component,
struct bt_private_port *self_private_port,
const bt_port *other_port);
bt_self_component *private_component,
struct bt_private_port *self_private_port,
const bt_port *other_port);
-
enum
bt_message_iterator_status lttng_live_iterator_init(
+bt_message_iterator_status lttng_live_iterator_init(
bt_self_message_iterator *it,
struct bt_private_port *port);
bt_self_message_iterator *it,
struct bt_private_port *port);
@@
-236,7
+236,7
@@
void lttng_live_iterator_finalize(bt_self_message_iterator *it);
int lttng_live_create_viewer_session(struct lttng_live_component *lttng_live);
int lttng_live_attach_session(struct lttng_live_session *session);
int lttng_live_detach_session(struct lttng_live_session *session);
int lttng_live_create_viewer_session(struct lttng_live_component *lttng_live);
int lttng_live_attach_session(struct lttng_live_session *session);
int lttng_live_detach_session(struct lttng_live_session *session);
-
enum
bt_lttng_live_iterator_status lttng_live_get_new_streams(
+bt_lttng_live_iterator_status lttng_live_get_new_streams(
struct lttng_live_session *session);
int lttng_live_add_session(struct lttng_live_component *lttng_live,
struct lttng_live_session *session);
int lttng_live_add_session(struct lttng_live_component *lttng_live,
@@
-246,7
+246,7
@@
int lttng_live_add_session(struct lttng_live_component *lttng_live,
ssize_t lttng_live_get_one_metadata_packet(struct lttng_live_trace *trace,
FILE *fp);
ssize_t lttng_live_get_one_metadata_packet(struct lttng_live_trace *trace,
FILE *fp);
-
enum
bt_lttng_live_iterator_status lttng_live_get_next_index(
+bt_lttng_live_iterator_status lttng_live_get_next_index(
struct lttng_live_component *lttng_live,
struct lttng_live_stream_iterator *stream,
struct packet_index *index);
struct lttng_live_component *lttng_live,
struct lttng_live_stream_iterator *stream,
struct packet_index *index);
diff --git
a/plugins/ctf/lttng-live/lttng-live.c
b/plugins/ctf/lttng-live/lttng-live.c
index f703630411467901a4b544855a387d9d942589af..9fd35b2a21d15b9a410e741fc2633dc019953794 100644
(file)
--- a/
plugins/ctf/lttng-live/lttng-live.c
+++ b/
plugins/ctf/lttng-live/lttng-live.c
@@
-105,7
+105,7
@@
int lttng_live_add_port(struct lttng_live_component *lttng_live,
int ret;
struct bt_private_port *private_port;
char name[STREAM_NAME_MAX_LEN];
int ret;
struct bt_private_port *private_port;
char name[STREAM_NAME_MAX_LEN];
-
enum
bt_component_status status;
+ bt_component_status status;
ret = sprintf(name, STREAM_NAME_PREFIX "%" PRIu64, stream_iter->viewer_stream_id);
BT_ASSERT(ret > 0);
ret = sprintf(name, STREAM_NAME_PREFIX "%" PRIu64, stream_iter->viewer_stream_id);
BT_ASSERT(ret > 0);
@@
-156,7
+156,7
@@
int lttng_live_remove_port(struct lttng_live_component *lttng_live,
}
BT_COMPONENT_PUT_REF_AND_RESET(component);
if (nr_ports == 1) {
}
BT_COMPONENT_PUT_REF_AND_RESET(component);
if (nr_ports == 1) {
-
enum
bt_component_status status;
+ bt_component_status status;
BT_ASSERT(!lttng_live->no_stream_port);
BT_ASSERT(!lttng_live->no_stream_port);
@@
-362,7
+362,7
@@
void lttng_live_iterator_finalize(bt_self_message_iterator *it)
}
static
}
static
-
enum
bt_lttng_live_iterator_status lttng_live_iterator_next_check_stream_state(
+bt_lttng_live_iterator_status lttng_live_iterator_next_check_stream_state(
struct lttng_live_component *lttng_live,
struct lttng_live_stream_iterator *lttng_live_stream)
{
struct lttng_live_component *lttng_live,
struct lttng_live_stream_iterator *lttng_live_stream)
{
@@
-393,11
+393,11
@@
enum bt_lttng_live_iterator_status lttng_live_iterator_next_check_stream_state(
* return EOF.
*/
static
* return EOF.
*/
static
-
enum
bt_lttng_live_iterator_status lttng_live_iterator_next_handle_one_no_data_stream(
+bt_lttng_live_iterator_status lttng_live_iterator_next_handle_one_no_data_stream(
struct lttng_live_component *lttng_live,
struct lttng_live_stream_iterator *lttng_live_stream)
{
struct lttng_live_component *lttng_live,
struct lttng_live_stream_iterator *lttng_live_stream)
{
-
enum
bt_lttng_live_iterator_status ret =
+ bt_lttng_live_iterator_status ret =
BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
struct packet_index index;
enum lttng_live_stream_state orig_state = lttng_live_stream->state;
BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
struct packet_index index;
enum lttng_live_stream_state orig_state = lttng_live_stream->state;
@@
-449,11
+449,11
@@
end:
* per-stream messages.
*/
static
* per-stream messages.
*/
static
-
enum
bt_lttng_live_iterator_status lttng_live_get_session(
+bt_lttng_live_iterator_status lttng_live_get_session(
struct lttng_live_component *lttng_live,
struct lttng_live_session *session)
{
struct lttng_live_component *lttng_live,
struct lttng_live_session *session)
{
-
enum
bt_lttng_live_iterator_status status;
+ bt_lttng_live_iterator_status status;
struct lttng_live_trace *trace, *t;
if (lttng_live_attach_session(session)) {
struct lttng_live_trace *trace, *t;
if (lttng_live_attach_session(session)) {
@@
-504,10
+504,10
@@
void lttng_live_force_new_streams_and_metadata(struct lttng_live_component *lttn
}
static
}
static
-
enum
bt_lttng_live_iterator_status lttng_live_iterator_next_handle_new_streams_and_metadata(
+bt_lttng_live_iterator_status lttng_live_iterator_next_handle_new_streams_and_metadata(
struct lttng_live_component *lttng_live)
{
struct lttng_live_component *lttng_live)
{
-
enum
bt_lttng_live_iterator_status ret =
+ bt_lttng_live_iterator_status ret =
BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
unsigned int nr_sessions_opened = 0;
struct lttng_live_session *session, *s;
BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
unsigned int nr_sessions_opened = 0;
struct lttng_live_session *session, *s;
@@
-553,13
+553,13
@@
end:
}
static
}
static
-
enum
bt_lttng_live_iterator_status emit_inactivity_message(
+bt_lttng_live_iterator_status emit_inactivity_message(
struct lttng_live_component *lttng_live,
struct lttng_live_stream_iterator *lttng_live_stream,
const bt_message **message,
uint64_t timestamp)
{
struct lttng_live_component *lttng_live,
struct lttng_live_stream_iterator *lttng_live_stream,
const bt_message **message,
uint64_t timestamp)
{
-
enum
bt_lttng_live_iterator_status ret =
+ bt_lttng_live_iterator_status ret =
BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
struct lttng_live_trace *trace;
const bt_clock_class *clock_class = NULL;
BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
struct lttng_live_trace *trace;
const bt_clock_class *clock_class = NULL;
@@
-600,12
+600,12
@@
error:
}
static
}
static
-
enum
bt_lttng_live_iterator_status lttng_live_iterator_next_handle_one_quiescent_stream(
+bt_lttng_live_iterator_status lttng_live_iterator_next_handle_one_quiescent_stream(
struct lttng_live_component *lttng_live,
struct lttng_live_stream_iterator *lttng_live_stream,
const bt_message **message)
{
struct lttng_live_component *lttng_live,
struct lttng_live_stream_iterator *lttng_live_stream,
const bt_message **message)
{
-
enum
bt_lttng_live_iterator_status ret =
+ bt_lttng_live_iterator_status ret =
BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
const bt_clock_class *clock_class = NULL;
bt_clock_snapshot *clock_snapshot = NULL;
BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
const bt_clock_class *clock_class = NULL;
bt_clock_snapshot *clock_snapshot = NULL;
@@
-633,12
+633,12
@@
end:
}
static
}
static
-
enum
bt_lttng_live_iterator_status lttng_live_iterator_next_handle_one_active_data_stream(
+bt_lttng_live_iterator_status lttng_live_iterator_next_handle_one_active_data_stream(
struct lttng_live_component *lttng_live,
struct lttng_live_stream_iterator *lttng_live_stream,
const bt_message **message)
{
struct lttng_live_component *lttng_live,
struct lttng_live_stream_iterator *lttng_live_stream,
const bt_message **message)
{
-
enum
bt_lttng_live_iterator_status ret =
+ bt_lttng_live_iterator_status ret =
BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
enum bt_msg_iter_status status;
struct lttng_live_session *session;
BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
enum bt_msg_iter_status status;
struct lttng_live_session *session;
@@
-759,7
+759,7
@@
bt_message_iterator_next_method_return lttng_live_iterator_next_stream(
bt_self_message_iterator *iterator,
struct lttng_live_stream_iterator *stream_iter)
{
bt_self_message_iterator *iterator,
struct lttng_live_stream_iterator *stream_iter)
{
-
enum
bt_lttng_live_iterator_status status;
+ bt_lttng_live_iterator_status status;
bt_message_iterator_next_method_return next_return;
struct lttng_live_component *lttng_live;
bt_message_iterator_next_method_return next_return;
struct lttng_live_component *lttng_live;
@@
-830,7
+830,7
@@
bt_message_iterator_next_method_return lttng_live_iterator_next_no_stream(
bt_self_message_iterator *iterator,
struct lttng_live_no_stream_iterator *no_stream_iter)
{
bt_self_message_iterator *iterator,
struct lttng_live_no_stream_iterator *no_stream_iter)
{
-
enum
bt_lttng_live_iterator_status status;
+ bt_lttng_live_iterator_status status;
bt_message_iterator_next_method_return next_return;
struct lttng_live_component *lttng_live;
bt_message_iterator_next_method_return next_return;
struct lttng_live_component *lttng_live;
@@
-899,11
+899,11
@@
bt_message_iterator_next_method_return lttng_live_iterator_next(
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_message_iterator_status lttng_live_iterator_init(
+bt_message_iterator_status lttng_live_iterator_init(
bt_self_message_iterator *it,
struct bt_private_port *port)
{
bt_self_message_iterator *it,
struct bt_private_port *port)
{
-
enum
bt_message_iterator_status ret =
+ bt_message_iterator_status ret =
BT_MESSAGE_ITERATOR_STATUS_OK;
struct lttng_live_stream_iterator_generic *s;
BT_MESSAGE_ITERATOR_STATUS_OK;
struct lttng_live_stream_iterator_generic *s;
@@
-1066,7
+1066,7
@@
struct lttng_live_component *lttng_live_component_create(bt_value *params,
struct lttng_live_component *lttng_live;
bt_value *value = NULL;
const char *url;
struct lttng_live_component *lttng_live;
bt_value *value = NULL;
const char *url;
-
enum
bt_value_status ret;
+ bt_value_status ret;
lttng_live = g_new0(struct lttng_live_component, 1);
if (!lttng_live) {
lttng_live = g_new0(struct lttng_live_component, 1);
if (!lttng_live) {
@@
-1106,12
+1106,12
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_component_status lttng_live_component_init(
+bt_component_status lttng_live_component_init(
bt_self_component *private_component,
bt_value *params, void *init_method_data)
{
struct lttng_live_component *lttng_live;
bt_self_component *private_component,
bt_value *params, void *init_method_data)
{
struct lttng_live_component *lttng_live;
-
enum
bt_component_status ret = BT_COMPONENT_STATUS_OK;
+ bt_component_status ret = BT_COMPONENT_STATUS_OK;
/* Passes ownership of iter ref to lttng_live_component_create. */
lttng_live = lttng_live_component_create(params, private_component);
/* Passes ownership of iter ref to lttng_live_component_create. */
lttng_live = lttng_live_component_create(params, private_component);
@@
-1152,7
+1152,7
@@
error:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_component_status lttng_live_accept_port_connection(
+bt_component_status lttng_live_accept_port_connection(
bt_self_component *private_component,
struct bt_private_port *self_private_port,
const bt_port *other_port)
bt_self_component *private_component,
struct bt_private_port *self_private_port,
const bt_port *other_port)
@@
-1160,7
+1160,7
@@
enum bt_component_status lttng_live_accept_port_connection(
struct lttng_live_component *lttng_live =
bt_self_component_get_user_data(private_component);
bt_component *other_component;
struct lttng_live_component *lttng_live =
bt_self_component_get_user_data(private_component);
bt_component *other_component;
-
enum
bt_component_status status = BT_COMPONENT_STATUS_OK;
+ bt_component_status status = BT_COMPONENT_STATUS_OK;
const bt_port *self_port = bt_port_from_private(self_private_port);
other_component = bt_port_get_component(other_port);
const bt_port *self_port = bt_port_from_private(self_private_port);
other_component = bt_port_get_component(other_port);
diff --git
a/plugins/ctf/lttng-live/metadata.c
b/plugins/ctf/lttng-live/metadata.c
index 3021f78ab34e26e2b57a13c88ff5a03c024bf990..42aac5d9efe23f67f2047b7dc00233e88d063e95 100644
(file)
--- a/
plugins/ctf/lttng-live/metadata.c
+++ b/
plugins/ctf/lttng-live/metadata.c
@@
-54,10
+54,10
@@
struct packet_header {
} __attribute__((__packed__));
static
} __attribute__((__packed__));
static
-
enum
bt_lttng_live_iterator_status lttng_live_update_clock_map(
+bt_lttng_live_iterator_status lttng_live_update_clock_map(
struct lttng_live_trace *trace)
{
struct lttng_live_trace *trace)
{
-
enum
bt_lttng_live_iterator_status status =
+ bt_lttng_live_iterator_status status =
BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
size_t i;
int count, ret;
BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
size_t i;
int count, ret;
@@
-93,7
+93,7
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_lttng_live_iterator_status lttng_live_metadata_update(
+bt_lttng_live_iterator_status lttng_live_metadata_update(
struct lttng_live_trace *trace)
{
struct lttng_live_session *session = trace->session;
struct lttng_live_trace *trace)
{
struct lttng_live_session *session = trace->session;
@@
-103,7
+103,7
@@
enum bt_lttng_live_iterator_status lttng_live_metadata_update(
char *metadata_buf = NULL;
FILE *fp = NULL;
enum ctf_metadata_decoder_status decoder_status;
char *metadata_buf = NULL;
FILE *fp = NULL;
enum ctf_metadata_decoder_status decoder_status;
-
enum
bt_lttng_live_iterator_status status =
+ bt_lttng_live_iterator_status status =
BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
/* No metadata stream yet. */
BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
/* No metadata stream yet. */
diff --git
a/plugins/ctf/lttng-live/metadata.h
b/plugins/ctf/lttng-live/metadata.h
index 2a4b9dedf4ba60c4aaf9cf1a4801fc8084e6d412..f3b66ed7ebb543d408995d90ca0b00273db54186 100644
(file)
--- a/
plugins/ctf/lttng-live/metadata.h
+++ b/
plugins/ctf/lttng-live/metadata.h
@@
-33,7
+33,7
@@
int lttng_live_metadata_create_stream(struct lttng_live_session *session,
uint64_t ctf_trace_id, uint64_t stream_id,
const char *trace_name);
uint64_t ctf_trace_id, uint64_t stream_id,
const char *trace_name);
-
enum
bt_lttng_live_iterator_status lttng_live_metadata_update(
+bt_lttng_live_iterator_status lttng_live_metadata_update(
struct lttng_live_trace *trace);
void lttng_live_metadata_fini(struct lttng_live_trace *trace);
struct lttng_live_trace *trace);
void lttng_live_metadata_fini(struct lttng_live_trace *trace);
diff --git
a/plugins/ctf/lttng-live/viewer-connection.c
b/plugins/ctf/lttng-live/viewer-connection.c
index b40289780f8a6adb9a9a5a38278ec814ddc74297..d7a4a0a106be293c5731bed49b59262770d33cfe 100644
(file)
--- a/
plugins/ctf/lttng-live/viewer-connection.c
+++ b/
plugins/ctf/lttng-live/viewer-connection.c
@@
-291,11
+291,11
@@
static void connection_release(bt_object *obj)
}
static
}
static
-
enum
bt_value_status list_update_session(bt_value *results,
+bt_value_status list_update_session(bt_value *results,
const struct lttng_viewer_session *session,
bool *_found)
{
const struct lttng_viewer_session *session,
bool *_found)
{
-
enum
bt_value_status ret = BT_VALUE_STATUS_OK;
+ bt_value_status ret = BT_VALUE_STATUS_OK;
bt_value *map = NULL;
bt_value *hostname = NULL;
bt_value *session_name = NULL;
bt_value *map = NULL;
bt_value *hostname = NULL;
bt_value *session_name = NULL;
@@
-386,11
+386,11
@@
end:
}
static
}
static
-
enum
bt_value_status list_append_session(bt_value *results,
+bt_value_status list_append_session(bt_value *results,
GString *base_url,
const struct lttng_viewer_session *session)
{
GString *base_url,
const struct lttng_viewer_session *session)
{
-
enum
bt_value_status ret = BT_VALUE_STATUS_OK;
+ bt_value_status ret = BT_VALUE_STATUS_OK;
bt_value *map = NULL;
GString *url = NULL;
bool found = false;
bt_value *map = NULL;
GString *url = NULL;
bool found = false;
@@
-1075,7
+1075,7
@@
void lttng_index_to_packet_index(struct lttng_viewer_index *lindex,
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_lttng_live_iterator_status lttng_live_get_next_index(struct lttng_live_component *lttng_live,
+bt_lttng_live_iterator_status lttng_live_get_next_index(struct lttng_live_component *lttng_live,
struct lttng_live_stream_iterator *stream,
struct packet_index *index)
{
struct lttng_live_stream_iterator *stream,
struct packet_index *index)
{
@@
-1084,7
+1084,7
@@
enum bt_lttng_live_iterator_status lttng_live_get_next_index(struct lttng_live_c
ssize_t ret_len;
struct lttng_viewer_index rp;
uint32_t flags, status;
ssize_t ret_len;
struct lttng_viewer_index rp;
uint32_t flags, status;
-
enum
bt_lttng_live_iterator_status retstatus =
+ bt_lttng_live_iterator_status retstatus =
BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
struct bt_live_viewer_connection *viewer_connection =
lttng_live->viewer_connection;
BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
struct bt_live_viewer_connection *viewer_connection =
lttng_live->viewer_connection;
@@
-1337,10
+1337,10
@@
error:
* Request new streams for a session.
*/
BT_HIDDEN
* Request new streams for a session.
*/
BT_HIDDEN
-
enum
bt_lttng_live_iterator_status lttng_live_get_new_streams(
+bt_lttng_live_iterator_status lttng_live_get_new_streams(
struct lttng_live_session *session)
{
struct lttng_live_session *session)
{
-
enum
bt_lttng_live_iterator_status status =
+ bt_lttng_live_iterator_status status =
BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
struct lttng_viewer_cmd cmd;
struct lttng_viewer_new_streams_request rq;
BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
struct lttng_viewer_cmd cmd;
struct lttng_viewer_new_streams_request rq;
diff --git
a/plugins/libctfcopytrace/ctfcopytrace.c
b/plugins/libctfcopytrace/ctfcopytrace.c
index cb1f7aa7bbe5263d6a16e39c18ccbdb7ffe38b87..b833fcdafb971c79fe8db27a12faaeace34de25e 100644
(file)
--- a/
plugins/libctfcopytrace/ctfcopytrace.c
+++ b/
plugins/libctfcopytrace/ctfcopytrace.c
@@
-94,12
+94,12
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_component_status ctf_copy_clock_classes(FILE *err,
+bt_component_status ctf_copy_clock_classes(FILE *err,
const bt_trace *writer_trace,
const bt_stream_class *writer_stream_class,
const bt_trace *trace)
{
const bt_trace *writer_trace,
const bt_stream_class *writer_stream_class,
const bt_trace *trace)
{
-
enum
bt_component_status ret;
+ bt_component_status ret;
int int_ret, clock_class_count, i;
clock_class_count = bt_trace_get_clock_class_count(trace);
int int_ret, clock_class_count, i;
clock_class_count = bt_trace_get_clock_class_count(trace);
@@
-255,7
+255,7
@@
const bt_event_class *ctf_copy_event_class(FILE *err,
const char *name;
int ret;
int64_t id;
const char *name;
int ret;
int64_t id;
-
enum
bt_event_class_log_level log_level;
+ bt_event_class_log_level log_level;
const char *emf_uri;
name = bt_event_class_get_name(event_class);
const char *emf_uri;
name = bt_event_class_get_name(event_class);
@@
-342,11
+342,11
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_component_status ctf_copy_event_classes(FILE *err,
+bt_component_status ctf_copy_event_classes(FILE *err,
const bt_stream_class *stream_class,
const bt_stream_class *writer_stream_class)
{
const bt_stream_class *stream_class,
const bt_stream_class *writer_stream_class)
{
-
enum
bt_component_status ret = BT_COMPONENT_STATUS_OK;
+ bt_component_status ret = BT_COMPONENT_STATUS_OK;
const bt_event_class *event_class = NULL, *writer_event_class = NULL;
int count, i;
const bt_trace *writer_trace =
const bt_event_class *event_class = NULL, *writer_event_class = NULL;
int count, i;
const bt_trace *writer_trace =
@@
-855,13
+855,13
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_component_status ctf_copy_trace(FILE *err, const bt_trace *trace,
+bt_component_status ctf_copy_trace(FILE *err, const bt_trace *trace,
const bt_trace *writer_trace)
{
const bt_trace *writer_trace)
{
-
enum
bt_component_status ret = BT_COMPONENT_STATUS_OK;
+ bt_component_status ret = BT_COMPONENT_STATUS_OK;
int field_count, i, int_ret;
bt_field_type *header_type = NULL;
int field_count, i, int_ret;
bt_field_type *header_type = NULL;
-
enum
bt_byte_order order;
+ bt_byte_order order;
const char *trace_name;
const unsigned char *trace_uuid;
const char *trace_name;
const unsigned char *trace_uuid;
diff --git
a/plugins/libctfcopytrace/ctfcopytrace.h
b/plugins/libctfcopytrace/ctfcopytrace.h
index d7bdd02675598f65831bf5620f27a69aebd4fd0a..76587738f17bc72c81d861768f319abd0db740b2 100644
(file)
--- a/
plugins/libctfcopytrace/ctfcopytrace.h
+++ b/
plugins/libctfcopytrace/ctfcopytrace.h
@@
-51,7
+51,7
@@
const bt_clock_class *ctf_copy_clock_class(FILE *err,
* error.
*/
BT_HIDDEN
* error.
*/
BT_HIDDEN
-
enum
bt_component_status ctf_copy_clock_classes(FILE *err,
+bt_component_status ctf_copy_clock_classes(FILE *err,
const bt_trace *writer_trace,
const bt_stream_class *writer_stream_class,
const bt_trace *trace);
const bt_trace *writer_trace,
const bt_stream_class *writer_stream_class,
const bt_trace *trace);
@@
-74,7
+74,7
@@
const bt_event_class *ctf_copy_event_class(FILE *err,
* error.
*/
BT_HIDDEN
* error.
*/
BT_HIDDEN
-
enum
bt_component_status ctf_copy_event_classes(FILE *err,
+bt_component_status ctf_copy_event_classes(FILE *err,
const bt_stream_class *stream_class,
const bt_stream_class *writer_stream_class);
const bt_stream_class *stream_class,
const bt_stream_class *writer_stream_class);
@@
-97,7
+97,7
@@
const bt_stream_class *ctf_copy_stream_class(FILE *err,
* error.
*/
BT_HIDDEN
* error.
*/
BT_HIDDEN
-
enum
bt_component_status ctf_copy_packet_context_field(FILE *err,
+bt_component_status ctf_copy_packet_context_field(FILE *err,
const bt_field *field, const char *field_name,
const bt_field *writer_packet_context,
bt_field_type *writer_packet_context_type);
const bt_field *field, const char *field_name,
const bt_field *writer_packet_context,
bt_field_type *writer_packet_context_type);
@@
-174,7
+174,7
@@
int ctf_copy_event_header(FILE *err, const bt_event *event,
* error.
*/
BT_HIDDEN
* error.
*/
BT_HIDDEN
-
enum
bt_component_status ctf_copy_trace(FILE *err, const bt_trace *trace,
+bt_component_status ctf_copy_trace(FILE *err, const bt_trace *trace,
const bt_trace *writer_trace);
#ifdef __cplusplus
const bt_trace *writer_trace);
#ifdef __cplusplus
diff --git
a/plugins/lttng-utils/copy.c
b/plugins/lttng-utils/copy.c
index fa0298b27171662e6231f6058e2edcd67d1c928c..918e6e17bb8050b4ab66ee1e40b789acda0e1ad6 100644
(file)
--- a/
plugins/lttng-utils/copy.c
+++ b/
plugins/lttng-utils/copy.c
@@
-440,7
+440,7
@@
struct debug_info *insert_new_debug_info(struct debug_info_iterator *debug_it,
struct debug_info *debug_info = NULL;
bt_value *field = NULL;
const char *str_value;
struct debug_info *debug_info = NULL;
bt_value *field = NULL;
const char *str_value;
-
enum
bt_value_status ret;
+ bt_value_status ret;
field = bt_trace_get_environment_field_value_by_name(writer_trace,
"domain");
field = bt_trace_get_environment_field_value_by_name(writer_trace,
"domain");
@@
-592,7
+592,7
@@
int sync_event_classes(struct debug_info_iterator *debug_it,
int int_ret;
const bt_stream_class *stream_class = NULL,
*writer_stream_class = NULL;
int int_ret;
const bt_stream_class *stream_class = NULL,
*writer_stream_class = NULL;
-
enum
bt_component_status ret;
+ bt_component_status ret;
stream_class = bt_stream_get_class(stream);
BT_ASSERT(stream_class);
stream_class = bt_stream_get_class(stream);
BT_ASSERT(stream_class);
@@
-1065,7
+1065,7
@@
const bt_stream_class *insert_new_stream_class(
const bt_stream_class *writer_stream_class = NULL;
const bt_trace *trace, *writer_trace = NULL;
struct debug_info_trace *di_trace;
const bt_stream_class *writer_stream_class = NULL;
const bt_trace *trace, *writer_trace = NULL;
struct debug_info_trace *di_trace;
-
enum
bt_component_status ret;
+ bt_component_status ret;
int int_ret;
trace = bt_stream_class_get_trace(stream_class);
int int_ret;
trace = bt_stream_class_get_trace(stream_class);
diff --git
a/plugins/lttng-utils/plugin.c
b/plugins/lttng-utils/plugin.c
index 6654e76d68d6c129a03ed429058e7f49763b5b29..5156e81a2807384e3d0c072326c91e4fbda2dfb7 100644
(file)
--- a/
plugins/lttng-utils/plugin.c
+++ b/
plugins/lttng-utils/plugin.c
@@
-266,14
+266,14
@@
end:
}
static
}
static
-
enum
bt_message_iterator_status debug_info_iterator_init(
+bt_message_iterator_status debug_info_iterator_init(
bt_self_message_iterator *iterator,
struct bt_private_port *port)
{
bt_self_message_iterator *iterator,
struct bt_private_port *port)
{
-
enum
bt_message_iterator_status ret =
+ bt_message_iterator_status ret =
BT_MESSAGE_ITERATOR_STATUS_OK;
BT_MESSAGE_ITERATOR_STATUS_OK;
-
enum
bt_message_iterator_status it_ret;
-
enum
bt_connection_status conn_status;
+ bt_message_iterator_status it_ret;
+ bt_connection_status conn_status;
struct bt_private_connection *connection = NULL;
bt_self_component *component =
bt_self_message_iterator_get_private_component(iterator);
struct bt_private_connection *connection = NULL;
bt_self_component *component =
bt_self_message_iterator_get_private_component(iterator);
@@
-324,18
+324,18
@@
end:
}
static
}
static
-
enum
bt_component_status init_from_params(
+bt_component_status init_from_params(
struct debug_info_component *debug_info_component,
bt_value *params)
{
bt_value *value = NULL;
struct debug_info_component *debug_info_component,
bt_value *params)
{
bt_value *value = NULL;
-
enum
bt_component_status ret = BT_COMPONENT_STATUS_OK;
+ bt_component_status ret = BT_COMPONENT_STATUS_OK;
BT_ASSERT(params);
value = bt_value_map_get(params, "debug-info-field-name");
if (value) {
BT_ASSERT(params);
value = bt_value_map_get(params, "debug-info-field-name");
if (value) {
-
enum
bt_value_status value_ret;
+ bt_value_status value_ret;
const char *tmp;
tmp = bt_value_string_get(value);
const char *tmp;
tmp = bt_value_string_get(value);
@@
-358,7
+358,7
@@
enum bt_component_status init_from_params(
value = bt_value_map_get(params, "debug-info-dir");
if (value) {
value = bt_value_map_get(params, "debug-info-dir");
if (value) {
-
enum
bt_value_status value_ret;
+ bt_value_status value_ret;
debug_info_component->arg_debug_dir = bt_value_string_get(value);
}
debug_info_component->arg_debug_dir = bt_value_string_get(value);
}
@@
-369,7
+369,7
@@
enum bt_component_status init_from_params(
value = bt_value_map_get(params, "target-prefix");
if (value) {
value = bt_value_map_get(params, "target-prefix");
if (value) {
-
enum
bt_value_status value_ret;
+ bt_value_status value_ret;
debug_info_component->arg_target_prefix = bt_value_string_get(value);
}
debug_info_component->arg_target_prefix = bt_value_string_get(value);
}
@@
-380,7
+380,7
@@
enum bt_component_status init_from_params(
value = bt_value_map_get(params, "full-path");
if (value) {
value = bt_value_map_get(params, "full-path");
if (value) {
-
enum
bt_value_status value_ret;
+ bt_value_status value_ret;
bt_bool bool_val;
bool_val = bt_value_bool_get(value);
bt_bool bool_val;
bool_val = bt_value_bool_get(value);
@@
-396,11
+396,11
@@
end:
return ret;
}
return ret;
}
-
enum
bt_component_status debug_info_component_init(
+bt_component_status debug_info_component_init(
bt_self_component *component, bt_value *params,
UNUSED_VAR void *init_method_data)
{
bt_self_component *component, bt_value *params,
UNUSED_VAR void *init_method_data)
{
-
enum
bt_component_status ret;
+ bt_component_status ret;
struct debug_info_component *debug_info = create_debug_info_component_data();
if (!debug_info) {
struct debug_info_component *debug_info = create_debug_info_component_data();
if (!debug_info) {
diff --git
a/plugins/text/dmesg/dmesg.c
b/plugins/text/dmesg/dmesg.c
index 8a80df3bba7b833ec3aeb3bb97e02d8132da1b14..00cac4a346f062ad7141a1a39aa33ee6fb914ee3 100644
(file)
--- a/
plugins/text/dmesg/dmesg.c
+++ b/
plugins/text/dmesg/dmesg.c
@@
-358,7
+358,7
@@
void destroy_dmesg_component(struct dmesg_component *dmesg_comp)
}
static
}
static
-
enum
bt_self_component_status create_port(
+bt_self_component_status create_port(
bt_self_component_source *self_comp)
{
return bt_self_component_source_add_output_port(self_comp,
bt_self_component_source *self_comp)
{
return bt_self_component_source_add_output_port(self_comp,
@@
-366,13
+366,13
@@
enum bt_self_component_status create_port(
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_self_component_status dmesg_init(
+bt_self_component_status dmesg_init(
bt_self_component_source *self_comp,
bt_value *params, void *init_method_data)
{
int ret = 0;
struct dmesg_component *dmesg_comp = g_new0(struct dmesg_component, 1);
bt_self_component_source *self_comp,
bt_value *params, void *init_method_data)
{
int ret = 0;
struct dmesg_component *dmesg_comp = g_new0(struct dmesg_component, 1);
-
enum
bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
+ bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
if (!dmesg_comp) {
BT_LOGE_STR("Failed to allocate one dmesg component structure.");
if (!dmesg_comp) {
BT_LOGE_STR("Failed to allocate one dmesg component structure.");
@@
-629,7
+629,7
@@
void destroy_dmesg_msg_iter(struct dmesg_msg_iter *dmesg_msg_iter)
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_self_message_iterator_status dmesg_msg_iter_init(
+bt_self_message_iterator_status dmesg_msg_iter_init(
bt_self_message_iterator *self_msg_iter,
bt_self_component_source *self_comp,
bt_self_component_port_output *self_port)
bt_self_message_iterator *self_msg_iter,
bt_self_component_source *self_comp,
bt_self_component_port_output *self_port)
@@
-637,7
+637,7
@@
enum bt_self_message_iterator_status dmesg_msg_iter_init(
struct dmesg_component *dmesg_comp;
struct dmesg_msg_iter *dmesg_msg_iter =
g_new0(struct dmesg_msg_iter, 1);
struct dmesg_component *dmesg_comp;
struct dmesg_msg_iter *dmesg_msg_iter =
g_new0(struct dmesg_msg_iter, 1);
-
enum
bt_self_message_iterator_status status =
+ bt_self_message_iterator_status status =
BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
if (!dmesg_msg_iter) {
BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
if (!dmesg_msg_iter) {
@@
-686,13
+686,13
@@
void dmesg_msg_iter_finalize(
}
static
}
static
-
enum
bt_self_message_iterator_status dmesg_msg_iter_next_one(
+bt_self_message_iterator_status dmesg_msg_iter_next_one(
struct dmesg_msg_iter *dmesg_msg_iter,
bt_message **msg)
{
ssize_t len;
struct dmesg_component *dmesg_comp;
struct dmesg_msg_iter *dmesg_msg_iter,
bt_message **msg)
{
ssize_t len;
struct dmesg_component *dmesg_comp;
-
enum
bt_self_message_iterator_status status =
+ bt_self_message_iterator_status status =
BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
BT_ASSERT(dmesg_msg_iter);
BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
BT_ASSERT(dmesg_msg_iter);
@@
-808,7
+808,7
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_self_message_iterator_status dmesg_msg_iter_next(
+bt_self_message_iterator_status dmesg_msg_iter_next(
bt_self_message_iterator *self_msg_iter,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
bt_self_message_iterator *self_msg_iter,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
@@
-816,7
+816,7
@@
enum bt_self_message_iterator_status dmesg_msg_iter_next(
struct dmesg_msg_iter *dmesg_msg_iter =
bt_self_message_iterator_get_data(
self_msg_iter);
struct dmesg_msg_iter *dmesg_msg_iter =
bt_self_message_iterator_get_data(
self_msg_iter);
-
enum
bt_self_message_iterator_status status =
+ bt_self_message_iterator_status status =
BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
uint64_t i = 0;
BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
uint64_t i = 0;
diff --git
a/plugins/text/dmesg/dmesg.h
b/plugins/text/dmesg/dmesg.h
index 7560338136a91c0259f6a1d357a5f30c9520f1cd..73d26d2f1cc7dc1e01506c198e3ff41f2e188761 100644
(file)
--- a/
plugins/text/dmesg/dmesg.h
+++ b/
plugins/text/dmesg/dmesg.h
@@
-28,7
+28,7
@@
#include <babeltrace/babeltrace.h>
BT_HIDDEN
#include <babeltrace/babeltrace.h>
BT_HIDDEN
-
enum
bt_self_component_status dmesg_init(
+bt_self_component_status dmesg_init(
bt_self_component_source *self_comp,
const bt_value *params, void *init_method_data);
bt_self_component_source *self_comp,
const bt_value *params, void *init_method_data);
@@
-36,7
+36,7
@@
BT_HIDDEN
void dmesg_finalize(bt_self_component_source *self_comp);
BT_HIDDEN
void dmesg_finalize(bt_self_component_source *self_comp);
BT_HIDDEN
-
enum
bt_self_message_iterator_status dmesg_msg_iter_init(
+bt_self_message_iterator_status dmesg_msg_iter_init(
bt_self_message_iterator *self_msg_iter,
bt_self_component_source *self_comp,
bt_self_component_port_output *self_port);
bt_self_message_iterator *self_msg_iter,
bt_self_component_source *self_comp,
bt_self_component_port_output *self_port);
@@
-46,7
+46,7
@@
void dmesg_msg_iter_finalize(
bt_self_message_iterator *self_msg_iter);
BT_HIDDEN
bt_self_message_iterator *self_msg_iter);
BT_HIDDEN
-
enum
bt_self_message_iterator_status dmesg_msg_iter_next(
+bt_self_message_iterator_status dmesg_msg_iter_next(
bt_self_message_iterator *self_msg_iter,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count);
bt_self_message_iterator *self_msg_iter,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count);
diff --git
a/plugins/text/pretty/pretty.c
b/plugins/text/pretty/pretty.c
index abf14ecc7bd1b20d2f2b4ef42d4db8269e59ce10..ef1224b781bea6b829ca72f350355d58e7c51a7e 100644
(file)
--- a/
plugins/text/pretty/pretty.c
+++ b/
plugins/text/pretty/pretty.c
@@
-121,11
+121,11
@@
void pretty_finalize(bt_self_component_sink *comp)
}
static
}
static
-
enum
bt_self_component_status handle_message(
+bt_self_component_status handle_message(
struct pretty_component *pretty,
const bt_message *message)
{
struct pretty_component *pretty,
const bt_message *message)
{
-
enum
bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK;
+ bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK;
BT_ASSERT(pretty);
BT_ASSERT(pretty);
@@
-151,12
+151,12
@@
enum bt_self_component_status handle_message(
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_self_component_status pretty_port_connected(
+bt_self_component_status pretty_port_connected(
bt_self_component_sink *comp,
bt_self_component_port_input *self_port,
const bt_port_output *other_port)
{
bt_self_component_sink *comp,
bt_self_component_port_input *self_port,
const bt_port_output *other_port)
{
-
enum
bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
+ bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
struct pretty_component *pretty;
pretty = bt_self_component_get_data(
struct pretty_component *pretty;
pretty = bt_self_component_get_data(
@@
-173,15
+173,15
@@
enum bt_self_component_status pretty_port_connected(
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_self_component_status pretty_consume(
+bt_self_component_status pretty_consume(
bt_self_component_sink *comp)
{
bt_self_component_sink *comp)
{
-
enum
bt_self_component_status ret;
+ bt_self_component_status ret;
bt_message_array_const msgs;
bt_self_component_port_input_message_iterator *it;
struct pretty_component *pretty = bt_self_component_get_data(
bt_self_component_sink_as_self_component(comp));
bt_message_array_const msgs;
bt_self_component_port_input_message_iterator *it;
struct pretty_component *pretty = bt_self_component_get_data(
bt_self_component_sink_as_self_component(comp));
-
enum
bt_message_iterator_status it_ret;
+ bt_message_iterator_status it_ret;
uint64_t count = 0;
uint64_t i = 0;
uint64_t count = 0;
uint64_t i = 0;
@@
-235,7
+235,7
@@
int add_params_to_map(bt_value *plugin_opt_map)
for (i = 0; i < BT_ARRAY_SIZE(plugin_options); i++) {
const char *key = plugin_options[i];
for (i = 0; i < BT_ARRAY_SIZE(plugin_options); i++) {
const char *key = plugin_options[i];
-
enum
bt_value_status status;
+ bt_value_status status;
status = bt_value_map_insert_entry(plugin_opt_map, key,
bt_value_null);
status = bt_value_map_insert_entry(plugin_opt_map, key,
bt_value_null);
@@
-340,7
+340,7
@@
static
int apply_params(struct pretty_component *pretty, const bt_value *params)
{
int ret = 0;
int apply_params(struct pretty_component *pretty, const bt_value *params)
{
int ret = 0;
-
enum
bt_value_status status;
+ bt_value_status status;
bool value, found;
char *str = NULL;
bool value, found;
char *str = NULL;
@@
-636,12
+636,12
@@
void init_stream_packet_context_quarks(void)
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_self_component_status pretty_init(
+bt_self_component_status pretty_init(
bt_self_component_sink *comp,
const bt_value *params,
UNUSED_VAR void *init_method_data)
{
bt_self_component_sink *comp,
const bt_value *params,
UNUSED_VAR void *init_method_data)
{
-
enum
bt_self_component_status ret;
+ bt_self_component_status ret;
struct pretty_component *pretty = create_pretty();
if (!pretty) {
struct pretty_component *pretty = create_pretty();
if (!pretty) {
diff --git
a/plugins/text/pretty/pretty.h
b/plugins/text/pretty/pretty.h
index 86c2785368bf92ab4b05f37f5de4f473ac8623bc..a9eb5d271b82d7e4159369d137fd861122563642 100644
(file)
--- a/
plugins/text/pretty/pretty.h
+++ b/
plugins/text/pretty/pretty.h
@@
-104,17
+104,17
@@
extern
GQuark stream_packet_context_quarks[STREAM_PACKET_CONTEXT_QUARKS_LEN];
BT_HIDDEN
GQuark stream_packet_context_quarks[STREAM_PACKET_CONTEXT_QUARKS_LEN];
BT_HIDDEN
-
enum
bt_self_component_status pretty_init(
+bt_self_component_status pretty_init(
bt_self_component_sink *component,
const bt_value *params,
void *init_method_data);
BT_HIDDEN
bt_self_component_sink *component,
const bt_value *params,
void *init_method_data);
BT_HIDDEN
-
enum
bt_self_component_status pretty_consume(
+bt_self_component_status pretty_consume(
bt_self_component_sink *component);
BT_HIDDEN
bt_self_component_sink *component);
BT_HIDDEN
-
enum
bt_self_component_status pretty_port_connected(
+bt_self_component_status pretty_port_connected(
bt_self_component_sink *component,
bt_self_component_port_input *self_port,
const bt_port_output *other_port);
bt_self_component_sink *component,
bt_self_component_port_input *self_port,
const bt_port_output *other_port);
diff --git
a/plugins/text/pretty/print.c
b/plugins/text/pretty/print.c
index 3661a64a15c42d63719d5bb712c5aa647492d7d4..32719cbaec5a5e6ab4bced0763cc1ad530212701 100644
(file)
--- a/
plugins/text/pretty/print.c
+++ b/
plugins/text/pretty/print.c
@@
-82,7
+82,7
@@
void print_timestamp_cycles(struct pretty_component *pretty,
{
const bt_clock_snapshot *clock_snapshot;
uint64_t cycles;
{
const bt_clock_snapshot *clock_snapshot;
uint64_t cycles;
-
enum
bt_clock_snapshot_state cs_state;
+ bt_clock_snapshot_state cs_state;
cs_state = bt_event_borrow_default_clock_snapshot_const(event, &clock_snapshot);
if (cs_state != BT_CLOCK_SNAPSHOT_STATE_KNOWN || !clock_snapshot) {
cs_state = bt_event_borrow_default_clock_snapshot_const(event, &clock_snapshot);
if (cs_state != BT_CLOCK_SNAPSHOT_STATE_KNOWN || !clock_snapshot) {
@@
-223,7
+223,7
@@
int print_event_timestamp(struct pretty_component *pretty,
const bt_stream *stream = NULL;
const bt_stream_class *stream_class = NULL;
const bt_clock_snapshot *clock_snapshot = NULL;
const bt_stream *stream = NULL;
const bt_stream_class *stream_class = NULL;
const bt_clock_snapshot *clock_snapshot = NULL;
-
enum
bt_clock_snapshot_state cs_state;
+ bt_clock_snapshot_state cs_state;
stream = bt_event_borrow_stream_const(event);
if (!stream) {
stream = bt_event_borrow_stream_const(event);
if (!stream) {
@@
-319,7
+319,7
@@
int print_event_header(struct pretty_component *pretty,
const bt_stream *stream = NULL;
const bt_trace *trace = NULL;
int dom_print = 0;
const bt_stream *stream = NULL;
const bt_trace *trace = NULL;
int dom_print = 0;
-
enum
bt_property_availability prop_avail;
+ bt_property_availability prop_avail;
event_class = bt_event_borrow_class_const(event);
stream_class = bt_event_class_borrow_stream_class_const(event_class);
event_class = bt_event_borrow_class_const(event);
stream_class = bt_event_class_borrow_stream_class_const(event_class);
@@
-451,7
+451,7
@@
int print_event_header(struct pretty_component *pretty,
[ BT_EVENT_CLASS_LOG_LEVEL_DEBUG_LINE ] = "TRACE_DEBUG_LINE",
[ BT_EVENT_CLASS_LOG_LEVEL_DEBUG ] = "TRACE_DEBUG",
};
[ BT_EVENT_CLASS_LOG_LEVEL_DEBUG_LINE ] = "TRACE_DEBUG_LINE",
[ BT_EVENT_CLASS_LOG_LEVEL_DEBUG ] = "TRACE_DEBUG",
};
-
enum
bt_event_class_log_level log_level;
+ bt_event_class_log_level log_level;
const char *log_level_str = NULL;
prop_avail = bt_event_class_get_log_level(event_class,
const char *log_level_str = NULL;
prop_avail = bt_event_class_get_log_level(event_class,
@@
-525,14
+525,14
@@
int print_integer(struct pretty_component *pretty,
const bt_field *field)
{
int ret = 0;
const bt_field *field)
{
int ret = 0;
-
enum
bt_field_class_integer_preferred_display_base base;
+ bt_field_class_integer_preferred_display_base base;
const bt_field_class *int_fc;
union {
uint64_t u;
int64_t s;
} v;
bool rst_color = false;
const bt_field_class *int_fc;
union {
uint64_t u;
int64_t s;
} v;
bool rst_color = false;
-
enum
bt_field_class_type ft_type;
+ bt_field_class_type ft_type;
int_fc = bt_field_borrow_class_const(field);
BT_ASSERT(int_fc);
int_fc = bt_field_borrow_class_const(field);
BT_ASSERT(int_fc);
@@
-986,7
+986,7
@@
int print_field(struct pretty_component *pretty,
const bt_field *field, bool print_names,
GQuark *filter_fields, int filter_array_len)
{
const bt_field *field, bool print_names,
GQuark *filter_fields, int filter_array_len)
{
-
enum
bt_field_class_type class_id;
+ bt_field_class_type class_id;
class_id = bt_field_get_class_type(field);
switch (class_id) {
class_id = bt_field_get_class_type(field);
switch (class_id) {
diff --git
a/plugins/utils/counter/counter.c
b/plugins/utils/counter/counter.c
index e667e2529f134ad7c137b7e482fabdf3407dd83e..fa75b6aeb5e3b7d4784dc292a8d3343339c841b5 100644
(file)
--- a/
plugins/utils/counter/counter.c
+++ b/
plugins/utils/counter/counter.c
@@
-122,12
+122,12
@@
void counter_finalize(bt_self_component_sink *comp)
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_self_component_status counter_init(
+bt_self_component_status counter_init(
bt_self_component_sink *component,
const bt_value *params,
UNUSED_VAR void *init_method_data)
{
bt_self_component_sink *component,
const bt_value *params,
UNUSED_VAR void *init_method_data)
{
-
enum
bt_self_component_status ret;
+ bt_self_component_status ret;
struct counter *counter = g_new0(struct counter, 1);
const bt_value *step = NULL;
const bt_value *hide_zero = NULL;
struct counter *counter = g_new0(struct counter, 1);
const bt_value *step = NULL;
const bt_value *hide_zero = NULL;
@@
-176,12
+176,12
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_self_component_status counter_port_connected(
+bt_self_component_status counter_port_connected(
bt_self_component_sink *comp,
bt_self_component_port_input *self_port,
const bt_port_output *other_port)
{
bt_self_component_sink *comp,
bt_self_component_port_input *self_port,
const bt_port_output *other_port)
{
-
enum
bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
+ bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
struct counter *counter;
bt_self_component_port_input_message_iterator *iterator;
struct counter *counter;
bt_self_component_port_input_message_iterator *iterator;
@@
-203,12
+203,12
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_self_component_status counter_consume(
+bt_self_component_status counter_consume(
bt_self_component_sink *comp)
{
bt_self_component_sink *comp)
{
-
enum
bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK;
+ bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK;
struct counter *counter;
struct counter *counter;
-
enum
bt_message_iterator_status it_ret;
+ bt_message_iterator_status it_ret;
uint64_t msg_count;
bt_message_array_const msgs;
uint64_t msg_count;
bt_message_array_const msgs;
diff --git
a/plugins/utils/counter/counter.h
b/plugins/utils/counter/counter.h
index eb8a37bbf81822b3b9bda08b0009ae2c88fe4c1f..b3a93b6ff92a9286ac34506925c4755712e34f62 100644
(file)
--- a/
plugins/utils/counter/counter.h
+++ b/
plugins/utils/counter/counter.h
@@
-46,7
+46,7
@@
struct counter {
};
BT_HIDDEN
};
BT_HIDDEN
-
enum
bt_self_component_status counter_init(
+bt_self_component_status counter_init(
bt_self_component_sink *component,
const bt_value *params, void *init_method_data);
bt_self_component_sink *component,
const bt_value *params, void *init_method_data);
@@
-54,12
+54,12
@@
BT_HIDDEN
void counter_finalize(bt_self_component_sink *component);
BT_HIDDEN
void counter_finalize(bt_self_component_sink *component);
BT_HIDDEN
-
enum
bt_self_component_status counter_port_connected(
+bt_self_component_status counter_port_connected(
bt_self_component_sink *component,
bt_self_component_port_input *self_port,
const bt_port_output *other_port);
BT_HIDDEN
bt_self_component_sink *component,
bt_self_component_port_input *self_port,
const bt_port_output *other_port);
BT_HIDDEN
-
enum
bt_self_component_status counter_consume(bt_self_component_sink *component);
+bt_self_component_status counter_consume(bt_self_component_sink *component);
#endif /* BABELTRACE_PLUGINS_UTILS_COUNTER_H */
#endif /* BABELTRACE_PLUGINS_UTILS_COUNTER_H */
diff --git
a/plugins/utils/dummy/dummy.c
b/plugins/utils/dummy/dummy.c
index 5d513cf216b66ee47fe8cdad653fd6edaee79d02..e0c44c5bffcfd7537c74b39d09ba6f7166b25d9a 100644
(file)
--- a/
plugins/utils/dummy/dummy.c
+++ b/
plugins/utils/dummy/dummy.c
@@
-46,12
+46,12
@@
void dummy_finalize(bt_self_component_sink *comp)
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_self_component_status dummy_init(
+bt_self_component_status dummy_init(
bt_self_component_sink *component,
const bt_value *params,
UNUSED_VAR void *init_method_data)
{
bt_self_component_sink *component,
const bt_value *params,
UNUSED_VAR void *init_method_data)
{
-
enum
bt_self_component_status ret;
+ bt_self_component_status ret;
struct dummy *dummy = g_new0(struct dummy, 1);
if (!dummy) {
struct dummy *dummy = g_new0(struct dummy, 1);
if (!dummy) {
@@
-77,12
+77,12
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_self_component_status dummy_port_connected(
+bt_self_component_status dummy_port_connected(
bt_self_component_sink *comp,
bt_self_component_port_input *self_port,
const bt_port_output *other_port)
{
bt_self_component_sink *comp,
bt_self_component_port_input *self_port,
const bt_port_output *other_port)
{
-
enum
bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
+ bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
struct dummy *dummy;
bt_self_component_port_input_message_iterator *iterator;
struct dummy *dummy;
bt_self_component_port_input_message_iterator *iterator;
@@
-104,14
+104,14
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_self_component_status dummy_consume(
+bt_self_component_status dummy_consume(
bt_self_component_sink *component)
{
bt_self_component_sink *component)
{
-
enum
bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK;
+ bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK;
bt_message_array_const msgs;
uint64_t count;
struct dummy *dummy;
bt_message_array_const msgs;
uint64_t count;
struct dummy *dummy;
-
enum
bt_message_iterator_status it_ret;
+ bt_message_iterator_status it_ret;
uint64_t i;
dummy = bt_self_component_get_data(
uint64_t i;
dummy = bt_self_component_get_data(
diff --git
a/plugins/utils/dummy/dummy.h
b/plugins/utils/dummy/dummy.h
index c87969d1c471a8bdc54a2468e5935bceefa2ade2..ed2ddfdbeae48eff8fccc336d9d2043c3c822837 100644
(file)
--- a/
plugins/utils/dummy/dummy.h
+++ b/
plugins/utils/dummy/dummy.h
@@
-33,7
+33,7
@@
struct dummy {
};
BT_HIDDEN
};
BT_HIDDEN
-
enum
bt_self_component_status dummy_init(
+bt_self_component_status dummy_init(
bt_self_component_sink *component,
const bt_value *params, void *init_method_data);
bt_self_component_sink *component,
const bt_value *params, void *init_method_data);
@@
-41,13
+41,13
@@
BT_HIDDEN
void dummy_finalize(bt_self_component_sink *component);
BT_HIDDEN
void dummy_finalize(bt_self_component_sink *component);
BT_HIDDEN
-
enum
bt_self_component_status dummy_port_connected(
+bt_self_component_status dummy_port_connected(
bt_self_component_sink *comp,
bt_self_component_port_input *self_port,
const bt_port_output *other_port);
BT_HIDDEN
bt_self_component_sink *comp,
bt_self_component_port_input *self_port,
const bt_port_output *other_port);
BT_HIDDEN
-
enum
bt_self_component_status dummy_consume(
+bt_self_component_status dummy_consume(
bt_self_component_sink *component);
#endif /* BABELTRACE_PLUGINS_UTILS_DUMMY_H */
bt_self_component_sink *component);
#endif /* BABELTRACE_PLUGINS_UTILS_DUMMY_H */
diff --git
a/plugins/utils/muxer/muxer.c
b/plugins/utils/muxer/muxer.c
index 82344b723a42590900e2e13b3c1d81c9ca7da25c..cc6dc4602d649092eb19a75890346c52da23c3ca 100644
(file)
--- a/
plugins/utils/muxer/muxer.c
+++ b/
plugins/utils/muxer/muxer.c
@@
-171,12
+171,12
@@
end:
}
static
}
static
-
enum
bt_self_component_status ensure_available_input_port(
+bt_self_component_status ensure_available_input_port(
bt_self_component_filter *self_comp)
{
struct muxer_comp *muxer_comp = bt_self_component_get_data(
bt_self_component_filter_as_self_component(self_comp));
bt_self_component_filter *self_comp)
{
struct muxer_comp *muxer_comp = bt_self_component_get_data(
bt_self_component_filter_as_self_component(self_comp));
-
enum
bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
+ bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
GString *port_name = NULL;
BT_ASSERT(muxer_comp);
GString *port_name = NULL;
BT_ASSERT(muxer_comp);
@@
-217,7
+217,7
@@
end:
}
static
}
static
-
enum
bt_self_component_status create_output_port(
+bt_self_component_status create_output_port(
bt_self_component_filter *self_comp)
{
return bt_self_component_filter_add_output_port(
bt_self_component_filter *self_comp)
{
return bt_self_component_filter_add_output_port(
@@
-326,12
+326,12
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_self_component_status muxer_init(
+bt_self_component_status muxer_init(
bt_self_component_filter *self_comp,
bt_value *params, void *init_data)
{
int ret;
bt_self_component_filter *self_comp,
bt_value *params, void *init_data)
{
int ret;
-
enum
bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
+ bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
struct muxer_comp *muxer_comp = g_new0(struct muxer_comp, 1);
BT_LOGD("Initializing muxer component: "
struct muxer_comp *muxer_comp = g_new0(struct muxer_comp, 1);
BT_LOGD("Initializing muxer component: "
@@
-447,10
+447,10
@@
end:
}
static
}
static
-
enum
bt_message_iterator_status muxer_upstream_msg_iter_next(
+bt_message_iterator_status muxer_upstream_msg_iter_next(
struct muxer_upstream_msg_iter *muxer_upstream_msg_iter)
{
struct muxer_upstream_msg_iter *muxer_upstream_msg_iter)
{
-
enum
bt_message_iterator_status status;
+ bt_message_iterator_status status;
bt_message_array_const msgs;
uint64_t i;
uint64_t count;
bt_message_array_const msgs;
uint64_t i;
uint64_t count;
@@
-608,7
+608,7
@@
int get_msg_ts_ns(struct muxer_comp *muxer_comp,
int ret = 0;
const unsigned char *cc_uuid;
const char *cc_name;
int ret = 0;
const unsigned char *cc_uuid;
const char *cc_name;
-
enum
bt_clock_snapshot_state cs_state = BT_CLOCK_SNAPSHOT_STATE_KNOWN;
+ bt_clock_snapshot_state cs_state = BT_CLOCK_SNAPSHOT_STATE_KNOWN;
BT_ASSERT(msg);
BT_ASSERT(ts_ns);
BT_ASSERT(msg);
BT_ASSERT(ts_ns);
@@
-851,7
+851,7
@@
end:
* the youngest, and sets *ts_ns to its time.
*/
static
* the youngest, and sets *ts_ns to its time.
*/
static
-
enum
bt_message_iterator_status
+bt_message_iterator_status
muxer_msg_iter_youngest_upstream_msg_iter(
struct muxer_comp *muxer_comp,
struct muxer_msg_iter *muxer_msg_iter,
muxer_msg_iter_youngest_upstream_msg_iter(
struct muxer_comp *muxer_comp,
struct muxer_msg_iter *muxer_msg_iter,
@@
-861,7
+861,7
@@
muxer_msg_iter_youngest_upstream_msg_iter(
size_t i;
int ret;
int64_t youngest_ts_ns = INT64_MAX;
size_t i;
int ret;
int64_t youngest_ts_ns = INT64_MAX;
-
enum
bt_message_iterator_status status =
+ bt_message_iterator_status status =
BT_MESSAGE_ITERATOR_STATUS_OK;
BT_ASSERT(muxer_comp);
BT_MESSAGE_ITERATOR_STATUS_OK;
BT_ASSERT(muxer_comp);
@@
-913,10
+913,10
@@
end:
}
static
}
static
-
enum
bt_message_iterator_status validate_muxer_upstream_msg_iter(
+bt_message_iterator_status validate_muxer_upstream_msg_iter(
struct muxer_upstream_msg_iter *muxer_upstream_msg_iter)
{
struct muxer_upstream_msg_iter *muxer_upstream_msg_iter)
{
-
enum
bt_message_iterator_status status =
+ bt_message_iterator_status status =
BT_MESSAGE_ITERATOR_STATUS_OK;
BT_LOGV("Validating muxer's upstream message iterator wrapper: "
BT_MESSAGE_ITERATOR_STATUS_OK;
BT_LOGV("Validating muxer's upstream message iterator wrapper: "
@@
-940,10
+940,10
@@
end:
}
static
}
static
-
enum
bt_message_iterator_status validate_muxer_upstream_msg_iters(
+bt_message_iterator_status validate_muxer_upstream_msg_iters(
struct muxer_msg_iter *muxer_msg_iter)
{
struct muxer_msg_iter *muxer_msg_iter)
{
-
enum
bt_message_iterator_status status =
+ bt_message_iterator_status status =
BT_MESSAGE_ITERATOR_STATUS_OK;
size_t i;
BT_MESSAGE_ITERATOR_STATUS_OK;
size_t i;
@@
-1001,12
+1001,12
@@
end:
}
static inline
}
static inline
-
enum
bt_message_iterator_status muxer_msg_iter_do_next_one(
+bt_message_iterator_status muxer_msg_iter_do_next_one(
struct muxer_comp *muxer_comp,
struct muxer_msg_iter *muxer_msg_iter,
const bt_message **msg)
{
struct muxer_comp *muxer_comp,
struct muxer_msg_iter *muxer_msg_iter,
const bt_message **msg)
{
-
enum
bt_message_iterator_status status =
+ bt_message_iterator_status status =
BT_MESSAGE_ITERATOR_STATUS_OK;
struct muxer_upstream_msg_iter *muxer_upstream_msg_iter = NULL;
int64_t next_return_ts;
BT_MESSAGE_ITERATOR_STATUS_OK;
struct muxer_upstream_msg_iter *muxer_upstream_msg_iter = NULL;
int64_t next_return_ts;
@@
-1102,13
+1102,13
@@
end:
}
static
}
static
-
enum
bt_message_iterator_status muxer_msg_iter_do_next(
+bt_message_iterator_status muxer_msg_iter_do_next(
struct muxer_comp *muxer_comp,
struct muxer_msg_iter *muxer_msg_iter,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
{
struct muxer_comp *muxer_comp,
struct muxer_msg_iter *muxer_msg_iter,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
{
-
enum
bt_message_iterator_status status =
+ bt_message_iterator_status status =
BT_MESSAGE_ITERATOR_STATUS_OK;
uint64_t i = 0;
BT_MESSAGE_ITERATOR_STATUS_OK;
uint64_t i = 0;
@@
-1226,14
+1226,14
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_self_message_iterator_status muxer_msg_iter_init(
+bt_self_message_iterator_status muxer_msg_iter_init(
bt_self_message_iterator *self_msg_iter,
bt_self_component_filter *self_comp,
bt_self_component_port_output *port)
{
struct muxer_comp *muxer_comp = NULL;
struct muxer_msg_iter *muxer_msg_iter = NULL;
bt_self_message_iterator *self_msg_iter,
bt_self_component_filter *self_comp,
bt_self_component_port_output *port)
{
struct muxer_comp *muxer_comp = NULL;
struct muxer_msg_iter *muxer_msg_iter = NULL;
-
enum
bt_self_message_iterator_status status =
+ bt_self_message_iterator_status status =
BT_MESSAGE_ITERATOR_STATUS_OK;
int ret;
BT_MESSAGE_ITERATOR_STATUS_OK;
int ret;
@@
-1343,12
+1343,12
@@
void muxer_msg_iter_finalize(
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_message_iterator_status muxer_msg_iter_next(
+bt_message_iterator_status muxer_msg_iter_next(
bt_self_message_iterator *self_msg_iter,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
{
bt_self_message_iterator *self_msg_iter,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
{
-
enum
bt_message_iterator_status status;
+ bt_message_iterator_status status;
struct muxer_msg_iter *muxer_msg_iter =
bt_self_message_iterator_get_data(self_msg_iter);
bt_self_component *self_comp = NULL;
struct muxer_msg_iter *muxer_msg_iter =
bt_self_message_iterator_get_data(self_msg_iter);
bt_self_component *self_comp = NULL;
@@
-1383,12
+1383,12
@@
enum bt_message_iterator_status muxer_msg_iter_next(
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_self_component_status muxer_input_port_connected(
+bt_self_component_status muxer_input_port_connected(
bt_self_component_filter *self_comp,
bt_self_component_port_input *self_port,
const bt_port_output *other_port)
{
bt_self_component_filter *self_comp,
bt_self_component_port_input *self_port,
const bt_port_output *other_port)
{
-
enum
bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
+ bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
const bt_port *port = bt_self_component_port_as_port(
bt_self_component_port_input_as_self_component_port(
self_port));
const bt_port *port = bt_self_component_port_as_port(
bt_self_component_port_input_as_self_component_port(
self_port));
diff --git
a/plugins/utils/muxer/muxer.h
b/plugins/utils/muxer/muxer.h
index c5b123f31c9eb924560ca4df4cdf5774fd24b8cf..ba439e23c2848f651c732c52cd23686ac635fe0b 100644
(file)
--- a/
plugins/utils/muxer/muxer.h
+++ b/
plugins/utils/muxer/muxer.h
@@
-29,7
+29,7
@@
#include <babeltrace/babeltrace-internal.h>
BT_HIDDEN
#include <babeltrace/babeltrace-internal.h>
BT_HIDDEN
-
enum
bt_self_component_status muxer_init(
+bt_self_component_status muxer_init(
bt_self_component_filter *self_comp,
const bt_value *params, void *init_data);
bt_self_component_filter *self_comp,
const bt_value *params, void *init_data);
@@
-37,7
+37,7
@@
BT_HIDDEN
void muxer_finalize(bt_self_component_filter *self_comp);
BT_HIDDEN
void muxer_finalize(bt_self_component_filter *self_comp);
BT_HIDDEN
-
enum
bt_self_message_iterator_status muxer_msg_iter_init(
+bt_self_message_iterator_status muxer_msg_iter_init(
bt_self_message_iterator *self_msg_iter,
bt_self_component_filter *self_comp,
bt_self_component_port_output *self_port);
bt_self_message_iterator *self_msg_iter,
bt_self_component_filter *self_comp,
bt_self_component_port_output *self_port);
@@
-47,13
+47,13
@@
void muxer_msg_iter_finalize(
bt_self_message_iterator *self_msg_iter);
BT_HIDDEN
bt_self_message_iterator *self_msg_iter);
BT_HIDDEN
-
enum
bt_self_message_iterator_status muxer_msg_iter_next(
+bt_self_message_iterator_status muxer_msg_iter_next(
bt_self_message_iterator *self_msg_iter,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count);
BT_HIDDEN
bt_self_message_iterator *self_msg_iter,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count);
BT_HIDDEN
-
enum
bt_self_component_status muxer_input_port_connected(
+bt_self_component_status muxer_input_port_connected(
bt_self_component_filter *comp,
bt_self_component_port_input *self_port,
const bt_port_output *other_port);
bt_self_component_filter *comp,
bt_self_component_port_input *self_port,
const bt_port_output *other_port);
diff --git
a/plugins/utils/trimmer/copy.c
b/plugins/utils/trimmer/copy.c
index 5fab0d6ac7c919c93d827e916c7428c70ff8d0b3..d5bcb5b7c2e97bb0357d33adcee9b29438d4bbf3 100644
(file)
--- a/
plugins/utils/trimmer/copy.c
+++ b/
plugins/utils/trimmer/copy.c
@@
-76,11
+76,11
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_component_status update_packet_context_field(FILE *err,
+bt_component_status update_packet_context_field(FILE *err,
const bt_packet *writer_packet,
const char *name, int64_t value)
{
const bt_packet *writer_packet,
const char *name, int64_t value)
{
-
enum
bt_component_status ret;
+ bt_component_status ret;
const bt_field *packet_context = NULL, *writer_packet_context = NULL;
const bt_field_class *struct_class = NULL, *field_class = NULL;
const bt_field *field = NULL, *writer_field = NULL;
const bt_field *packet_context = NULL, *writer_packet_context = NULL;
const bt_field_class *struct_class = NULL, *field_class = NULL;
const bt_field *field = NULL, *writer_field = NULL;
diff --git
a/plugins/utils/trimmer/copy.h
b/plugins/utils/trimmer/copy.h
index 94b2150ef8442de1128d1d6295a02e5011f1abf0..6049113abc919eab6a52565f637545e1ac459fa2 100644
(file)
--- a/
plugins/utils/trimmer/copy.h
+++ b/
plugins/utils/trimmer/copy.h
@@
-41,7
+41,7
@@
BT_HIDDEN
const bt_packet *trimmer_close_packet(struct trimmer_iterator *trim_it,
const bt_packet *packet);
BT_HIDDEN
const bt_packet *trimmer_close_packet(struct trimmer_iterator *trim_it,
const bt_packet *packet);
BT_HIDDEN
-
enum
bt_component_status update_packet_context_field(FILE *err,
+bt_component_status update_packet_context_field(FILE *err,
const bt_packet *writer_packet,
const char *name, int64_t value);
const bt_packet *writer_packet,
const char *name, int64_t value);
diff --git
a/plugins/utils/trimmer/iterator.c
b/plugins/utils/trimmer/iterator.c
index 82f3410e0ed72465b8d1ce7cf7c931a714f49a52..9ae675dd4c6e075c296debde04c54a92c7dfb079 100644
(file)
--- a/
plugins/utils/trimmer/iterator.c
+++ b/
plugins/utils/trimmer/iterator.c
@@
-64,14
+64,14
@@
void trimmer_iterator_finalize(bt_self_message_iterator *it)
}
BT_HIDDEN
}
BT_HIDDEN
-
enum
bt_message_iterator_status trimmer_iterator_init(
+bt_message_iterator_status trimmer_iterator_init(
bt_self_message_iterator *iterator,
struct bt_private_port *port)
{
bt_self_message_iterator *iterator,
struct bt_private_port *port)
{
-
enum
bt_message_iterator_status ret =
+ bt_message_iterator_status ret =
BT_MESSAGE_ITERATOR_STATUS_OK;
BT_MESSAGE_ITERATOR_STATUS_OK;
-
enum
bt_message_iterator_status it_ret;
-
enum
bt_connection_status conn_status;
+ bt_message_iterator_status it_ret;
+ bt_connection_status conn_status;
struct bt_private_port *input_port = NULL;
struct bt_private_connection *connection = NULL;
bt_self_component *component =
struct bt_private_port *input_port = NULL;
struct bt_private_connection *connection = NULL;
bt_self_component *component =
@@
-388,7
+388,7
@@
const bt_message *evaluate_packet_message(
*timestamp_begin = NULL,
*timestamp_end = NULL;
const bt_message *new_message = NULL;
*timestamp_begin = NULL,
*timestamp_end = NULL;
const bt_message *new_message = NULL;
-
enum
bt_component_status ret;
+ bt_component_status ret;
bool lazy_update = false;
switch (bt_message_get_type(message)) {
bool lazy_update = false;
switch (bt_message_get_type(message)) {
@@
-516,13
+516,13
@@
const bt_message *evaluate_stream_message(
/* Return true if the message should be forwarded. */
static
/* Return true if the message should be forwarded. */
static
-
enum
bt_message_iterator_status evaluate_message(
+bt_message_iterator_status evaluate_message(
const bt_message **message,
struct trimmer_iterator *trim_it,
struct trimmer_bound *begin, struct trimmer_bound *end,
bool *in_range)
{
const bt_message **message,
struct trimmer_iterator *trim_it,
struct trimmer_bound *begin, struct trimmer_bound *end,
bool *in_range)
{
-
enum
bt_message_type type;
+ bt_message_type type;
const bt_message *new_message = NULL;
bool finished = false;
const bt_message *new_message = NULL;
bool finished = false;
diff --git
a/plugins/utils/trimmer/iterator.h
b/plugins/utils/trimmer/iterator.h
index bcfc416f15b70f040712ac48120c87c9eef65a6c..cede7c8f2da9b4f1424799cb6e8fdc7453c5427e 100644
(file)
--- a/
plugins/utils/trimmer/iterator.h
+++ b/
plugins/utils/trimmer/iterator.h
@@
-40,7
+40,7
@@
struct trimmer_iterator {
};
BT_HIDDEN
};
BT_HIDDEN
-
enum
bt_message_iterator_status trimmer_iterator_init(
+bt_message_iterator_status trimmer_iterator_init(
bt_self_message_iterator *iterator,
struct bt_private_port *port);
bt_self_message_iterator *iterator,
struct bt_private_port *port);
diff --git
a/plugins/utils/trimmer/trimmer.c
b/plugins/utils/trimmer/trimmer.c
index 0c5af14776a0c1865a0dcfd1cadb5e5086a811af..42c5e5b0df8396df5ba9b7b0f006858e3f767dd9 100644
(file)
--- a/
plugins/utils/trimmer/trimmer.c
+++ b/
plugins/utils/trimmer/trimmer.c
@@
-291,18
+291,18
@@
lazy:
}
static
}
static
-
enum
bt_component_status init_from_params(struct trimmer *trimmer,
+bt_component_status init_from_params(struct trimmer *trimmer,
bt_value *params)
{
bt_value *value = NULL;
bt_bool gmt = BT_FALSE;
bt_value *params)
{
bt_value *value = NULL;
bt_bool gmt = BT_FALSE;
-
enum
bt_component_status ret = BT_COMPONENT_STATUS_OK;
+ bt_component_status ret = BT_COMPONENT_STATUS_OK;
BT_ASSERT(params);
value = bt_value_map_get(params, "clock-gmt");
if (value) {
BT_ASSERT(params);
value = bt_value_map_get(params, "clock-gmt");
if (value) {
-
enum
bt_value_status value_ret;
+ bt_value_status value_ret;
gmt = bt_value_bool_get(value);
}
gmt = bt_value_bool_get(value);
}
@@
-344,11
+344,11
@@
end:
return ret;
}
return ret;
}
-
enum
bt_component_status trimmer_component_init(
+bt_component_status trimmer_component_init(
bt_self_component *component, bt_value *params,
UNUSED_VAR void *init_method_data)
{
bt_self_component *component, bt_value *params,
UNUSED_VAR void *init_method_data)
{
-
enum
bt_component_status ret;
+ bt_component_status ret;
struct trimmer *trimmer = create_trimmer_data();
if (!trimmer) {
struct trimmer *trimmer = create_trimmer_data();
if (!trimmer) {
diff --git
a/plugins/utils/trimmer/trimmer.h
b/plugins/utils/trimmer/trimmer.h
index f3980f079e7708af2a8caf6bac33faa657a305d3..2e63b881710cd4258edf4f3d3b4df34fe19c29f0 100644
(file)
--- a/
plugins/utils/trimmer/trimmer.h
+++ b/
plugins/utils/trimmer/trimmer.h
@@
-49,7
+49,7
@@
struct trimmer {
int year, month, day;
};
int year, month, day;
};
-
enum
bt_component_status trimmer_component_init(
+bt_component_status trimmer_component_init(
bt_self_component *component,
bt_value *params, void *init_method_data);
bt_self_component *component,
bt_value *params, void *init_method_data);
diff --git
a/tests/lib/test-plugin-plugins/minimal.c
b/tests/lib/test-plugin-plugins/minimal.c
index eb89a7e5ec4f05030b8b890dae6a467f5e781ed9..42f9c6be77b9910defc18d039912884b88f18515 100644
(file)
--- a/
tests/lib/test-plugin-plugins/minimal.c
+++ b/
tests/lib/test-plugin-plugins/minimal.c
@@
-19,7
+19,7
@@
#include <stdlib.h>
#include <glib.h>
#include <stdlib.h>
#include <glib.h>
-static
enum
bt_self_plugin_status plugin_init(bt_self_plugin *plugin)
+static bt_self_plugin_status plugin_init(bt_self_plugin *plugin)
{
g_setenv("BT_TEST_PLUGIN_INIT_CALLED", "1", 1);
return BT_SELF_PLUGIN_STATUS_OK;
{
g_setenv("BT_TEST_PLUGIN_INIT_CALLED", "1", 1);
return BT_SELF_PLUGIN_STATUS_OK;
diff --git
a/tests/lib/test-plugin-plugins/sfs.c
b/tests/lib/test-plugin-plugins/sfs.c
index b548750429c2506def5e75aefa36658b0a90b7ff..e9080b7ed6a02591dcf0aca0a0d118cfe78b7b24 100644
(file)
--- a/
tests/lib/test-plugin-plugins/sfs.c
+++ b/
tests/lib/test-plugin-plugins/sfs.c
@@
-18,13
+18,13
@@
#include <babeltrace/babeltrace.h>
#include <babeltrace/assert-internal.h>
#include <babeltrace/babeltrace.h>
#include <babeltrace/assert-internal.h>
-static
enum
bt_self_component_status sink_consume(
+static bt_self_component_status sink_consume(
bt_self_component_sink *self_comp)
{
return BT_SELF_COMPONENT_STATUS_OK;
}
bt_self_component_sink *self_comp)
{
return BT_SELF_COMPONENT_STATUS_OK;
}
-static
enum
bt_self_message_iterator_status src_dummy_iterator_init_method(
+static bt_self_message_iterator_status src_dummy_iterator_init_method(
bt_self_message_iterator *self_msg_iter,
bt_self_component_source *self_comp,
bt_self_component_port_output *self_port)
bt_self_message_iterator *self_msg_iter,
bt_self_component_source *self_comp,
bt_self_component_port_output *self_port)
@@
-32,7
+32,7
@@
static enum bt_self_message_iterator_status src_dummy_iterator_init_method(
return BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
}
return BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
}
-static
enum
bt_self_message_iterator_status flt_dummy_iterator_init_method(
+static bt_self_message_iterator_status flt_dummy_iterator_init_method(
bt_self_message_iterator *self_msg_iter,
bt_self_component_filter *self_comp,
bt_self_component_port_output *self_port)
bt_self_message_iterator *self_msg_iter,
bt_self_component_filter *self_comp,
bt_self_component_port_output *self_port)
@@
-45,7
+45,7
@@
static void dummy_iterator_finalize_method(
{
}
{
}
-static
enum
bt_self_message_iterator_status dummy_iterator_next_method(
+static bt_self_message_iterator_status dummy_iterator_next_method(
bt_self_message_iterator *self_msg_iter,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
bt_self_message_iterator *self_msg_iter,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
@@
-53,7
+53,7
@@
static enum bt_self_message_iterator_status dummy_iterator_next_method(
return BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
}
return BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
}
-static
enum
bt_query_status flt_query_method(
+static bt_query_status flt_query_method(
bt_self_component_class_filter *component_class,
const bt_query_executor *query_exec,
const char *object, const bt_value *params,
bt_self_component_class_filter *component_class,
const bt_query_executor *query_exec,
const char *object, const bt_value *params,
diff --git
a/tests/lib/test_bt_message_iterator.c
b/tests/lib/test_bt_message_iterator.c
index 5a1ef5408dee7363f3a4ab277fb763be15951989..6738afdc966977937f2a142528c428e2771dfd0e 100644
(file)
--- a/
tests/lib/test_bt_message_iterator.c
+++ b/
tests/lib/test_bt_message_iterator.c
@@
-313,7
+313,7
@@
void src_iter_finalize(bt_self_message_iterator *self_msg_iter)
}
static
}
static
-
enum
bt_self_message_iterator_status src_iter_init(
+bt_self_message_iterator_status src_iter_init(
bt_self_message_iterator *self_msg_iter,
bt_self_component_source *self_comp,
bt_self_component_port_output *self_port)
bt_self_message_iterator *self_msg_iter,
bt_self_component_source *self_comp,
bt_self_component_port_output *self_port)
@@
-419,13
+419,13
@@
void src_iter_next_seq_one(bt_self_message_iterator* msg_iter,
}
static
}
static
-
enum
bt_self_message_iterator_status src_iter_next_seq(
+bt_self_message_iterator_status src_iter_next_seq(
bt_self_message_iterator *msg_iter,
struct src_iter_user_data *user_data,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
{
bt_self_message_iterator *msg_iter,
struct src_iter_user_data *user_data,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
{
-
enum
bt_self_message_iterator_status status =
+ bt_self_message_iterator_status status =
BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
uint64_t i = 0;
BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
uint64_t i = 0;
@@
-449,7
+449,7
@@
end:
}
static
}
static
-
enum
bt_self_message_iterator_status src_iter_next(
+bt_self_message_iterator_status src_iter_next(
bt_self_message_iterator *self_msg_iter,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
bt_self_message_iterator *self_msg_iter,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
@@
-463,7
+463,7
@@
enum bt_self_message_iterator_status src_iter_next(
}
static
}
static
-
enum
bt_self_component_status src_init(
+bt_self_component_status src_init(
bt_self_component_source *self_comp,
const bt_value *params, void *init_method_data)
{
bt_self_component_source *self_comp,
const bt_value *params, void *init_method_data)
{
@@
-536,10
+536,10
@@
void append_test_events_from_message(const bt_message *message)
}
static
}
static
-
enum
bt_message_iterator_status common_consume(
+bt_message_iterator_status common_consume(
void *msg_iter, bool is_output_port_msg_iter)
{
void *msg_iter, bool is_output_port_msg_iter)
{
-
enum
bt_message_iterator_status ret;
+ bt_message_iterator_status ret;
bt_message_array_const messages = NULL;
uint64_t count = 0;
struct test_event test_event = { 0 };
bt_message_array_const messages = NULL;
uint64_t count = 0;
struct test_event test_event = { 0 };
@@
-583,15
+583,15
@@
end:
}
static
}
static
-
enum
bt_self_component_status sink_consume(
+bt_self_component_status sink_consume(
bt_self_component_sink *self_comp)
{
bt_self_component_sink *self_comp)
{
-
enum
bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK;
+ bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK;
struct sink_user_data *user_data =
bt_self_component_get_data(
bt_self_component_sink_as_self_component(
self_comp));
struct sink_user_data *user_data =
bt_self_component_get_data(
bt_self_component_sink_as_self_component(
self_comp));
-
enum
bt_message_iterator_status it_ret;
+ bt_message_iterator_status it_ret;
BT_ASSERT(user_data && user_data->msg_iter);
it_ret = common_consume(user_data->msg_iter, false);
BT_ASSERT(user_data && user_data->msg_iter);
it_ret = common_consume(user_data->msg_iter, false);
@@
-618,7
+618,7
@@
end:
}
static
}
static
-
enum
bt_self_component_status sink_port_connected(
+bt_self_component_status sink_port_connected(
bt_self_component_sink *self_comp,
bt_self_component_port_input *self_port,
const bt_port_output *other_port)
bt_self_component_sink *self_comp,
bt_self_component_port_input *self_port,
const bt_port_output *other_port)
@@
-636,7
+636,7
@@
enum bt_self_component_status sink_port_connected(
}
static
}
static
-
enum
bt_self_component_status sink_init(
+bt_self_component_status sink_init(
bt_self_component_sink *self_comp,
const bt_value *params, void *init_method_data)
{
bt_self_component_sink *self_comp,
const bt_value *params, void *init_method_data)
{
@@
-729,7
+729,7
@@
void do_std_test(enum test test, const char *name,
const bt_component_sink *sink_comp;
const bt_port_output *upstream_port;
const bt_port_input *downstream_port;
const bt_component_sink *sink_comp;
const bt_port_output *upstream_port;
const bt_port_input *downstream_port;
-
enum
bt_graph_status graph_status = BT_GRAPH_STATUS_OK;
+ bt_graph_status graph_status = BT_GRAPH_STATUS_OK;
clear_test_events();
current_test = test;
clear_test_events();
current_test = test;
@@
-823,7
+823,7
@@
void test_output_port_message_iterator(void)
};
const bt_component_source *src_comp;
bt_port_output_message_iterator *msg_iter;
};
const bt_component_source *src_comp;
bt_port_output_message_iterator *msg_iter;
-
enum
bt_message_iterator_status iter_status =
+ bt_message_iterator_status iter_status =
BT_MESSAGE_ITERATOR_STATUS_OK;
const bt_port_output *upstream_port;
BT_MESSAGE_ITERATOR_STATUS_OK;
const bt_port_output *upstream_port;
diff --git
a/tests/lib/test_bt_values.c
b/tests/lib/test_bt_values.c
index 0bc1b1095147086a176bf41ce20375c376a8aeef..d689973b3c94e93542dd7d4288e78f1b4ff08295 100644
(file)
--- a/
tests/lib/test_bt_values.c
+++ b/
tests/lib/test_bt_values.c
@@
-724,7
+724,7
@@
void test_compare_array(void)
bt_value *array1 = bt_value_array_create();
bt_value *array2 = bt_value_array_create();
bt_value *array3 = bt_value_array_create();
bt_value *array1 = bt_value_array_create();
bt_value *array2 = bt_value_array_create();
bt_value *array3 = bt_value_array_create();
-
enum
bt_value_status status;
+ bt_value_status status;
BT_ASSERT(array1 && array2 && array3);
BT_ASSERT(array1 && array2 && array3);
@@
-775,7
+775,7
@@
void test_compare_map(void)
bt_value *map1 = bt_value_map_create();
bt_value *map2 = bt_value_map_create();
bt_value *map3 = bt_value_map_create();
bt_value *map1 = bt_value_map_create();
bt_value *map2 = bt_value_map_create();
bt_value *map3 = bt_value_map_create();
-
enum
bt_value_status status;
+ bt_value_status status;
BT_ASSERT(map1 && map2 && map3);
BT_ASSERT(map1 && map2 && map3);
@@
-854,7
+854,7
@@
void test_copy(void)
bt_value *string_obj, *string_copy_obj;
bt_value *array_obj, *array_copy_obj;
bt_value *map_obj, *map_copy_obj;
bt_value *string_obj, *string_copy_obj;
bt_value *array_obj, *array_copy_obj;
bt_value *map_obj, *map_copy_obj;
-
enum
bt_value_status status;
+ bt_value_status status;
bool_obj = bt_value_bool_create_init(BT_TRUE);
integer_obj = bt_value_integer_create_init(23);
bool_obj = bt_value_bool_create_init(BT_TRUE);
integer_obj = bt_value_integer_create_init(23);
@@
-950,7
+950,7
@@
void test_extend(void)
bt_value *extension_map = bt_value_map_create();
bt_value *extended_map = NULL;
bt_value *array = bt_value_array_create();
bt_value *extension_map = bt_value_map_create();
bt_value *extended_map = NULL;
bt_value *array = bt_value_array_create();
-
enum
bt_value_status status;
+ bt_value_status status;
BT_ASSERT(base_map);
BT_ASSERT(extension_map);
BT_ASSERT(base_map);
BT_ASSERT(extension_map);
diff --git
a/tests/lib/test_graph_topo.c
b/tests/lib/test_graph_topo.c
index 7cf870839efeadc7f01f511588e9281fa8dca699..7c63ec2cf0c7202f6ad1bfb6cc8c0783d77cf4c0 100644
(file)
--- a/
tests/lib/test_graph_topo.c
+++ b/
tests/lib/test_graph_topo.c
@@
-364,7
+364,7
@@
size_t event_pos(struct event *event)
}
static
}
static
-
enum
bt_self_message_iterator_status src_iter_next(
+bt_self_message_iterator_status src_iter_next(
bt_self_message_iterator *self_iterator,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
bt_self_message_iterator *self_iterator,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
@@
-373,7
+373,7
@@
enum bt_self_message_iterator_status src_iter_next(
}
static
}
static
-
enum
bt_self_component_status src_accept_output_port_connection(
+bt_self_component_status src_accept_output_port_connection(
bt_self_component_source *self_comp,
bt_self_component_port_output *self_comp_port,
const bt_port_input *other_port)
bt_self_component_source *self_comp,
bt_self_component_port_output *self_comp_port,
const bt_port_input *other_port)
@@
-396,7
+396,7
@@
enum bt_self_component_status src_accept_output_port_connection(
}
static
}
static
-
enum
bt_self_component_status sink_accept_input_port_connection(
+bt_self_component_status sink_accept_input_port_connection(
bt_self_component_sink *self_comp,
bt_self_component_port_input *self_comp_port,
const bt_port_output *other_port)
bt_self_component_sink *self_comp,
bt_self_component_port_input *self_comp_port,
const bt_port_output *other_port)
@@
-419,7
+419,7
@@
enum bt_self_component_status sink_accept_input_port_connection(
}
static
}
static
-
enum
bt_self_component_status src_output_port_connected(
+bt_self_component_status src_output_port_connected(
bt_self_component_source *self_comp,
bt_self_component_port_output *self_comp_port,
const bt_port_input *other_port)
bt_self_component_source *self_comp,
bt_self_component_port_output *self_comp_port,
const bt_port_input *other_port)
@@
-456,7
+456,7
@@
enum bt_self_component_status src_output_port_connected(
}
static
}
static
-
enum
bt_self_component_status sink_input_port_connected(
+bt_self_component_status sink_input_port_connected(
bt_self_component_sink *self_comp,
bt_self_component_port_input *self_comp_port,
const bt_port_output *other_port)
bt_self_component_sink *self_comp,
bt_self_component_port_input *self_comp_port,
const bt_port_output *other_port)
@@
-533,7
+533,7
@@
void sink_input_port_disconnected(bt_self_component_sink *self_comp,
}
static
}
static
-
enum
bt_self_component_status src_init(
+bt_self_component_status src_init(
bt_self_component_source *self_comp,
const bt_value *params, void *init_method_data)
{
bt_self_component_source *self_comp,
const bt_value *params, void *init_method_data)
{
@@
-546,7
+546,7
@@
enum bt_self_component_status src_init(
}
static
}
static
-
enum
bt_self_component_status sink_init(
+bt_self_component_status sink_init(
bt_self_component_sink *self_comp,
const bt_value *params, void *init_method_data)
{
bt_self_component_sink *self_comp,
const bt_value *params, void *init_method_data)
{
@@
-559,7
+559,7
@@
enum bt_self_component_status sink_init(
}
static
}
static
-
enum
bt_self_component_status sink_consume(
+bt_self_component_status sink_consume(
bt_self_component_sink *self_comp)
{
bt_self_component_port_input *def_port;
bt_self_component_sink *self_comp)
{
bt_self_component_port_input *def_port;
@@
-810,7
+810,7
@@
void test_sink_removes_port_in_consume_then_src_removes_disconnected_port(void)
const bt_port *gsrc_def_port;
const bt_port *gsink_def_port;
struct event event;
const bt_port *gsrc_def_port;
const bt_port *gsink_def_port;
struct event event;
-
enum
bt_graph_status status;
+ bt_graph_status status;
size_t src_accept_port_connection_pos;
size_t sink_accept_port_connection_pos;
size_t src_port_connected_pos;
size_t src_accept_port_connection_pos;
size_t sink_accept_port_connection_pos;
size_t src_port_connected_pos;
@@
-992,7
+992,7
@@
void test_sink_removes_port_in_consume(void)
const bt_port *gsrc_def_port;
const bt_port *gsink_def_port;
struct event event;
const bt_port *gsrc_def_port;
const bt_port *gsink_def_port;
struct event event;
-
enum
bt_graph_status status;
+ bt_graph_status status;
size_t src_accept_port_connection_pos;
size_t sink_accept_port_connection_pos;
size_t src_port_connected_pos;
size_t src_accept_port_connection_pos;
size_t sink_accept_port_connection_pos;
size_t src_port_connected_pos;
@@
-1159,7
+1159,7
@@
void test_src_adds_port_in_port_connected(void)
const bt_port *gsrc_hello_port;
const bt_port *gsink_def_port;
struct event event;
const bt_port *gsrc_hello_port;
const bt_port *gsink_def_port;
struct event event;
-
enum
bt_graph_status status;
+ bt_graph_status status;
size_t src_accept_port_connection_pos;
size_t sink_accept_port_connection_pos;
size_t src_port_connected_pos;
size_t src_accept_port_connection_pos;
size_t sink_accept_port_connection_pos;
size_t src_port_connected_pos;
@@
-1286,7
+1286,7
@@
void test_simple(void)
const bt_port *gsrc_def_port;
const bt_port *gsink_def_port;
struct event event;
const bt_port *gsrc_def_port;
const bt_port *gsink_def_port;
struct event event;
-
enum
bt_graph_status status;
+ bt_graph_status status;
size_t src_accept_port_connection_pos;
size_t sink_accept_port_connection_pos;
size_t src_port_connected_pos;
size_t src_accept_port_connection_pos;
size_t sink_accept_port_connection_pos;
size_t src_port_connected_pos;
@@
-1397,7
+1397,7
@@
void test_src_port_connected_error(void)
const bt_port *gsink_def_port;
const bt_connection *conn = NULL;
struct event event;
const bt_port *gsink_def_port;
const bt_connection *conn = NULL;
struct event event;
-
enum
bt_graph_status status;
+ bt_graph_status status;
size_t src_accept_port_connection_pos;
size_t src_port_connected_pos;
size_t src_accept_port_connection_pos;
size_t src_port_connected_pos;
@@
-1484,7
+1484,7
@@
void test_sink_port_connected_error(void)
const bt_port *gsink_def_port;
const bt_connection *conn = NULL;
struct event event;
const bt_port *gsink_def_port;
const bt_connection *conn = NULL;
struct event event;
-
enum
bt_graph_status status;
+ bt_graph_status status;
size_t src_accept_port_connection_pos;
size_t sink_accept_port_connection_pos;
size_t src_port_connected_pos;
size_t src_accept_port_connection_pos;
size_t sink_accept_port_connection_pos;
size_t src_port_connected_pos;
diff --git
a/tests/lib/test_plugin.c
b/tests/lib/test_plugin.c
index 6d9c42633d4898b8d8ef45082753814ee64676b6..505fe86a3e3439d64f10ba1739f6140dfbf183e4 100644
(file)
--- a/
tests/lib/test_plugin.c
+++ b/
tests/lib/test_plugin.c
@@
-124,7
+124,7
@@
static void test_sfs(const char *plugin_dir)
const bt_value *res_params;
bt_graph *graph;
const char *object_str;
const bt_value *res_params;
bt_graph *graph;
const char *object_str;
-
enum
bt_graph_status graph_ret;
+ bt_graph_status graph_ret;
bt_query_executor *query_exec = bt_query_executor_create();
int ret;
bt_query_executor *query_exec = bt_query_executor_create();
int ret;
This page took
0.117187 seconds
and
4
git commands to generate.