lib: add aliases for Babeltrace enumeration types

[babeltrace.git] / cli / babeltrace-cfg.h

diff --git a/cli/babeltrace-cfg.h b/cli/babeltrace-cfg.h
index b9a4b5edd89736c274f1b002bbda241817347976..6d98cd3398daa9803841e817ba22a268beda3d60 100644 (file)
--- a/cli/babeltrace-cfg.h
+++ b/cli/babeltrace-cfg.h
@@ -28,8 +28,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdbool.h>
-#include <babeltrace/values.h>
-#include <babeltrace/ref.h>
+#include <babeltrace/value.h>
 #include <babeltrace/object-internal.h>
 #include <babeltrace/compiler-internal.h>
 #include <babeltrace/graph/component-class.h>
@@ -45,11 +44,11 @@ enum bt_config_command {
 };
 
 struct bt_config_component {
-       struct bt_object base;
-       enum bt_component_class_type type;
+       bt_object base;
+       bt_component_class_type type;
        GString *plugin_name;
        GString *comp_cls_name;
-       struct bt_value *params;
+       bt_value *params;
        GString *instance_name;
 };
 
@@ -62,10 +61,10 @@ struct bt_config_connection {
 };
 
 struct bt_config {
-       struct bt_object base;
+       bt_object base;
        bool debug;
        bool verbose;
-       struct bt_value *plugin_paths;
+       bt_value *plugin_paths;
        bool omit_system_plugin_path;
        bool omit_home_plugin_path;
        bool command_needs_plugins;
@@ -92,6 +91,12 @@ struct bt_config {
                         * to retry to run the graph.
                         */
                        uint64_t retry_duration_us;
+
+                       /*
+                        * Whether or not to trim the source trace to the
+                        * intersection of its streams.
+                        */
+                       bool stream_intersection_mode;
                } run;
 
                /* BT_CONFIG_COMMAND_HELP */
@@ -108,11 +113,13 @@ struct bt_config {
                /* BT_CONFIG_COMMAND_PRINT_CTF_METADATA */
                struct {
                        GString *path;
+                       GString *output_path;
                } print_ctf_metadata;
 
                /* BT_CONFIG_COMMAND_PRINT_LTTNG_LIVE_SESSIONS */
                struct {
                        GString *url;
+                       GString *output_path;
                } print_lttng_live_sessions;
        } cmd_data;
 };
@@ -121,11 +128,14 @@ static inline
 struct bt_config_component *bt_config_get_component(GPtrArray *array,
                size_t index)
 {
-       return bt_get(g_ptr_array_index(array, index));
+       struct bt_config_component *comp = g_ptr_array_index(array, index);
+
+       bt_object_get_ref(comp);
+       return comp;
 }
 
-enum bt_value_status bt_config_append_plugin_paths(
-               struct bt_value *plugin_paths, const char *arg);
+int bt_config_append_plugin_paths(bt_value *plugin_paths,
+               const char *arg);
 
 void bt_config_connection_destroy(struct bt_config_connection *connection);