X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Futils%2Frun-in.cpp;h=a3391a93ea2e6ec5e2ff5396d961814ef7abe1f1;hb=0133a2ba3063b5b8526990bf95f2f53ed212f6a6;hp=3a3a0a262bbef000910499b717247c79a54a1af4;hpb=484a30244f4297ce7f0ac0ea1c0c4d566b39c46e;p=babeltrace.git diff --git a/tests/lib/utils/run-in.cpp b/tests/lib/utils/run-in.cpp index 3a3a0a26..a3391a93 100644 --- a/tests/lib/utils/run-in.cpp +++ b/tests/lib/utils/run-in.cpp @@ -6,8 +6,18 @@ #include -#include "run-in.hpp" #include "common/assert.h" +#include "cpp-common/bt2/component-class-dev.hpp" +#include "cpp-common/bt2/component-class.hpp" +#include "cpp-common/bt2/graph.hpp" +#include "cpp-common/bt2/plugin-load.hpp" +#include "cpp-common/bt2/plugin.hpp" +#include "cpp-common/bt2/query-executor.hpp" +#include "cpp-common/bt2c/call.hpp" + +#include "run-in.hpp" + +namespace { struct RunInData final { @@ -16,179 +26,104 @@ struct RunInData final RunInMsgIterClsInitFunc msgIterCtxFunc; }; -static const RunInData& runInDataFromMethodData(void * const methodData) -{ - return *static_cast(methodData); -} +class RunInSource; -static bt_component_class_initialize_method_status -compClsInit(bt_self_component_source * const selfComp, bt_self_component_source_configuration *, - const bt_value *, void * const initMethodData) +class RunInSourceMsgIter final : public bt2::UserMessageIterator { - const auto status = - bt_self_component_source_add_output_port(selfComp, "out", initMethodData, nullptr); - - BT_ASSERT(status == BT_SELF_COMPONENT_ADD_PORT_STATUS_OK); - - auto& data = runInDataFromMethodData(initMethodData); +public: + explicit RunInSourceMsgIter(const bt2::SelfMessageIterator self, + bt2::SelfMessageIteratorConfiguration, + const bt2::SelfComponentOutputPort port) : + bt2::UserMessageIterator {self, "RUN-IN-SRC-MSG-ITER"} + { + const auto& data = port.data(); - if (data.compCtxFunc) { - data.compCtxFunc(bt_self_component_source_as_self_component(selfComp)); + if (data.msgIterCtxFunc) { + data.msgIterCtxFunc(self); + } } - return BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK; -} + void _next(bt2::ConstMessageArray&) + { + } +}; -static bt_component_class_query_method_status -compClsQuery(bt_self_component_class_source * const selfCompCls, bt_private_query_executor *, - const char *, const bt_value *, void * const methodData, - const bt_value ** const result) +class RunInSource final : + public bt2::UserSourceComponent { - auto& data = runInDataFromMethodData(methodData); +public: + static constexpr auto name = "run-in-src"; + + explicit RunInSource(const bt2::SelfSourceComponent self, bt2::ConstMapValue, + const RunInData * const runInData) : + bt2::UserSourceComponent {self, "RUN-IN-SRC"}, + _mRunInData {runInData} + { + this->_addOutputPort("out", *runInData); - if (data.compClsCtxFunc) { - data.compClsCtxFunc(bt_self_component_class_source_as_self_component_class(selfCompCls)); + if (_mRunInData->compCtxFunc) { + _mRunInData->compCtxFunc(self); + } } - *result = bt_value_null; - return BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_OK; -} - -static bt_message_iterator_class_initialize_method_status -msgIterClsInit(bt_self_message_iterator * const selfMsgIter, - bt_self_message_iterator_configuration *, bt_self_component_port_output * const port) -{ - auto& data = runInDataFromMethodData(bt_self_component_port_get_data( - bt_self_component_port_output_as_self_component_port(port))); + static bt2::Value::Shared _query(const bt2::SelfComponentClass self, bt2::PrivateQueryExecutor, + bt2c::CStringView, bt2::ConstValue, + const RunInData * const data) + { + if (data->compClsCtxFunc) { + data->compClsCtxFunc(self); + } - if (data.msgIterCtxFunc) { - data.msgIterCtxFunc(selfMsgIter); + return bt2::NullValue {}.shared(); } - return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK; -} +private: + const RunInData *_mRunInData; +}; -static bt_message_iterator_class_next_method_status -msgIterClsNext(bt_self_message_iterator *, bt_message_array_const, uint64_t, uint64_t *) -{ - return BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_END; -} +} /* namespace */ void runIn(RunInCompClsQueryFunc compClsCtxFunc, RunInCompClsInitFunc compCtxFunc, RunInMsgIterClsInitFunc msgIterCtxFunc) { RunInData data {std::move(compClsCtxFunc), std::move(compCtxFunc), std::move(msgIterCtxFunc)}; - - /* Create and configure custom source component class */ - const auto msgIterCls = bt_message_iterator_class_create(msgIterClsNext); - - BT_ASSERT(msgIterCls); - - { - const auto status = - bt_message_iterator_class_set_initialize_method(msgIterCls, msgIterClsInit); - - BT_ASSERT(status == BT_MESSAGE_ITERATOR_CLASS_SET_METHOD_STATUS_OK); - } - - const auto srcCompCls = bt_component_class_source_create("yo", msgIterCls); - - BT_ASSERT(srcCompCls); - - { - const auto status = - bt_component_class_source_set_initialize_method(srcCompCls, compClsInit); - - BT_ASSERT(status == BT_COMPONENT_CLASS_SET_METHOD_STATUS_OK); - } - - { - const auto status = bt_component_class_source_set_query_method(srcCompCls, compClsQuery); - - BT_ASSERT(status == BT_COMPONENT_CLASS_SET_METHOD_STATUS_OK); - } + const auto srcCompCls = bt2::SourceComponentClass::create(); /* Execute a query (executes `compClsCtxFunc`) */ - { - const auto queryExec = bt_query_executor_create_with_method_data( - bt_component_class_source_as_component_class(srcCompCls), "", nullptr, &data); - - BT_ASSERT(queryExec); - - const bt_value *queryRes; - const auto status = bt_query_executor_query(queryExec, &queryRes); - - BT_ASSERT(status == BT_QUERY_EXECUTOR_QUERY_STATUS_OK); - - bt_value_put_ref(queryRes); - bt_query_executor_put_ref(queryExec); - } + bt2::QueryExecutor::create(*srcCompCls, "object-name", data)->query(); /* Create graph */ - const auto graph = bt_graph_create(0); - - BT_ASSERT(graph); + const auto graph = bt2::Graph::create(0); /* Add custom source component (executes `compCtxFunc`) */ - const bt_component_source *srcComp; + const auto srcComp = graph->addComponent(*srcCompCls, "the-source", data); - { - const auto status = bt_graph_add_source_component_with_initialize_method_data( - graph, srcCompCls, "whatever", NULL, &data, BT_LOGGING_LEVEL_NONE, &srcComp); + /* Add dummy sink component */ + const auto sinkComp = bt2c::call([&] { + const auto utilsPlugin = bt2::findPlugin("utils"); - BT_ASSERT(status == BT_GRAPH_ADD_COMPONENT_STATUS_OK); - } + BT_ASSERT(utilsPlugin); - /* Find `sink.utils.dummy` component class */ - const bt_plugin *utilsPlugin = nullptr; + const auto dummySinkCompCls = utilsPlugin->sinkComponentClasses()["dummy"]; - { - const auto status = - bt_plugin_find("utils", BT_TRUE, BT_TRUE, BT_TRUE, BT_TRUE, BT_TRUE, &utilsPlugin); + BT_ASSERT(dummySinkCompCls); - BT_ASSERT(status == BT_PLUGIN_FIND_STATUS_OK); - } - - /* Add `sink.utils.dummy` component */ - const bt_component_sink *sinkComp; - - { - const auto dummyCompCls = - bt_plugin_borrow_sink_component_class_by_name_const(utilsPlugin, "dummy"); - - BT_ASSERT(dummyCompCls); - - const auto status = bt_graph_add_sink_component(graph, dummyCompCls, "the-sink", nullptr, - BT_LOGGING_LEVEL_NONE, &sinkComp); - - BT_ASSERT(status == BT_GRAPH_ADD_COMPONENT_STATUS_OK); - } + return graph->addComponent(*dummySinkCompCls, "the-sink"); + }); /* Connect ports */ - { - const auto outPort = bt_component_source_borrow_output_port_by_name_const(srcComp, "out"); - - BT_ASSERT(outPort); + const auto outPort = srcComp.outputPorts()["out"]; + BT_ASSERT(outPort); - const auto inPort = bt_component_sink_borrow_input_port_by_name_const(sinkComp, "in"); + const auto inPort = sinkComp.inputPorts()["in"]; + BT_ASSERT(inPort); - BT_ASSERT(inPort); - - const auto status = bt_graph_connect_ports(graph, outPort, inPort, nullptr); - - BT_ASSERT(status == BT_GRAPH_CONNECT_PORTS_STATUS_OK); - } + graph->connectPorts(*outPort, *inPort); /* Run graph (executes `msgIterCtxFunc`) */ - const auto status = bt_graph_run(graph); - - BT_ASSERT(status == BT_GRAPH_RUN_STATUS_OK); - - /* Discard plugin and graph */ - bt_plugin_put_ref(utilsPlugin); - bt_graph_put_ref(graph); - bt_component_class_source_put_ref(srcCompCls); - bt_message_iterator_class_put_ref(msgIterCls); + graph->run(); } void runInCompClsQuery(RunInCompClsQueryFunc func)