Commit c07f8073 authored by Florian Raeth's avatar Florian Raeth

moved: create publisher from publish_echoPublisher to init

parent fb815c2c
Pipeline #152100 passed with stage
in 2 minutes and 12 seconds
...@@ -16,6 +16,9 @@ SomeipAdapter_tests_a_compA::SomeipAdapter_tests_a_compA() {} ...@@ -16,6 +16,9 @@ SomeipAdapter_tests_a_compA::SomeipAdapter_tests_a_compA() {}
void SomeipAdapter_tests_a_compA::init(tests_a_compA *comp) void SomeipAdapter_tests_a_compA::init(tests_a_compA *comp)
{ {
std::unique_lock<std::mutex> its_lock(mutex);
condition.wait(its_lock);
this->component = comp; this->component = comp;
_clockSubscriber = vsomeip::runtime::get()->create_application("Subscriber"); _clockSubscriber = vsomeip::runtime::get()->create_application("Subscriber");
...@@ -24,8 +27,7 @@ void SomeipAdapter_tests_a_compA::init(tests_a_compA *comp) ...@@ -24,8 +27,7 @@ void SomeipAdapter_tests_a_compA::init(tests_a_compA *comp)
_clockSubscriber->request_service(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID); _clockSubscriber->request_service(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID);
_clockSubscriber->register_message_handler(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_METHOD_ID, on_message); _clockSubscriber->register_message_handler(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_METHOD_ID, on_message);
//_clockSubscriber->register_message_handler(vsomeip::ANY_SERVICE, vsomeip::ANY_INSTANCE, vsomeip::ANY_METHOD, on_message);
std::unique_lock<std::mutex> its_lock(mutex);
std::set<vsomeip::eventgroup_t> its_groups; std::set<vsomeip::eventgroup_t> its_groups;
its_groups.insert(SAMPLE_EVENTGROUP_ID); its_groups.insert(SAMPLE_EVENTGROUP_ID);
...@@ -33,6 +35,13 @@ void SomeipAdapter_tests_a_compA::init(tests_a_compA *comp) ...@@ -33,6 +35,13 @@ void SomeipAdapter_tests_a_compA::init(tests_a_compA *comp)
_clockSubscriber->subscribe(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_EVENTGROUP_ID); _clockSubscriber->subscribe(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_EVENTGROUP_ID);
_clockSubscriber->start(); _clockSubscriber->start();
_echoPublisher = vsomeip::runtime::get()->create_application("Publisher");
_echoPublisher->init();
//_echoPublisher->register_message_handler(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_METHOD_ID, on_message);
_echoPublisher->offer_service(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID);
_echoPublisher->start();
} }
void SomeipAdapter_tests_a_compA::on_message(const std::shared_ptr<vsomeip::message> &_request) { void SomeipAdapter_tests_a_compA::on_message(const std::shared_ptr<vsomeip::message> &_request) {
...@@ -52,24 +61,14 @@ void SomeipAdapter_tests_a_compA::on_message(const std::shared_ptr<vsomeip::mess ...@@ -52,24 +61,14 @@ void SomeipAdapter_tests_a_compA::on_message(const std::shared_ptr<vsomeip::mess
void SomeipAdapter_tests_a_compA::publish_echoPublisher() void SomeipAdapter_tests_a_compA::publish_echoPublisher()
{ {
_echoPublisher = vsomeip::runtime::get()->create_application("Publisher"); const vsomeip::byte_t its_data[] = { 0x10 }; //component->rosOut
_echoPublisher->init(); payload = vsomeip::runtime::get()->create_payload();
//app->register_message_handler(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_METHOD_ID, on_message); payload->set_data(its_data, sizeof(its_data));
double d = component->rosOut;
uint8_t *byteArray = (uint8_t*)&d;
vsomeip::byte_t *p;
p = byteArray;
std::shared_ptr< vsomeip::payload > its_payload = vsomeip::runtime::get()->create_payload(p,8);
std::set<vsomeip::eventgroup_t> its_groups; std::set<vsomeip::eventgroup_t> its_groups;
its_groups.insert(SAMPLE_EVENTGROUP_ID); its_groups.insert(SAMPLE_EVENTGROUP_ID);
_echoPublisher->offer_event(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_EVENT_ID, its_groups, true); _echoPublisher->offer_event(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_EVENT_ID, its_groups, true);
_echoPublisher->notify(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_EVENT_ID, its_payload); _echoPublisher->notify(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_EVENT_ID, payload);
_echoPublisher->offer_service(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID);
_echoPublisher->start();
} }
void SomeipAdapter_tests_a_compA::tick() void SomeipAdapter_tests_a_compA::tick()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment