Skip to content

GitLab

E
EMAM2SomeIP
Commit a648c72f authored by Markus Georg Bendel's avatar Markus Georg Bendel
Browse files
Options

Add different Adapter constructor for different callbacks

parent 0e0f2d02
Pipeline #159880 passed with stages
      in 2 minutes and 11 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 96 additions and 46 deletions
      someip_adapter/SomeIPAdapter_tests_a_compA.cpp
      View file @ a648c72f
      #include "SomeIPAdapter_tests_a_compA.h"
      #define SAMPLE_SERVICE_ID 0x1234
      #define SAMPLE_INSTANCE_ID 0x5678
      #define SAMPLE_METHOD_ID 0x0421
      #define SAMPLE_EVENT_ID 0x2345
      #define SAMPLE_EVENTGROUP_ID 0x1456
      SomeIPAdapter_tests_a_compA::SomeIPAdapter_tests_a_compA() {
      //choose random ids
      service_id = 1;
      instance_id = 2;
      method_id = 3;
      event_id = 4;
      eventgroup_id = 5;
      }
      SomeIPAdapter_tests_a_compA::SomeIPAdapter_tests_a_compA() {}
      SomeIPAdapter_tests_a_compA::SomeIPAdapter_tests_a_compA(int service_id, int instance_id, int method_id, int event_id, int eventgroup_id) {
      this->service_id = service_id;
      this->instance_id = instance_id;
      this->method_id = method_id;
      this->event_id = event_id;
      this->eventgroup_id = eventgroup_id;
      }
      void SomeIPAdapter_tests_a_compA::init(tests_a_compA *comp) {
      // Initialize component
      ......@@ -15,20 +24,20 @@ void SomeIPAdapter_tests_a_compA::init(tests_a_compA *comp) {
      // Intitialize subscriber
      _clockSubscriber = vsomeip::runtime::get()->create_application("Subscriber");
      _clockSubscriber->init();
      _clockSubscriber->request_service(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID);
      _clockSubscriber->register_message_handler(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_METHOD_ID, std::bind(&SomeIPAdapter_tests_a_compA::on_message, this, std::placeholders::_1));
      _clockSubscriber->request_service(service_id, instance_id);
      _clockSubscriber->register_message_handler(service_id, instance_id, method_id, std::bind(&SomeIPAdapter_tests_a_compA::on_message, this, std::placeholders::_1));
      // Subscribe
      std::set<vsomeip::eventgroup_t> event_group;
      event_group.insert(SAMPLE_EVENTGROUP_ID);
      _clockSubscriber->request_event(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_EVENT_ID, event_group, true);
      _clockSubscriber->subscribe(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_EVENTGROUP_ID);
      event_group.insert(eventgroup_id);
      _clockSubscriber->request_event(service_id, instance_id, event_id, event_group, true);
      _clockSubscriber->subscribe(service_id, instance_id, eventgroup_id);
      _clockSubscriber->start();
      // Intitialize Publisher
      _echoPublisher = vsomeip::runtime::get()->create_application("Publisher");
      _echoPublisher->init();
      _echoPublisher->offer_service(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID);
      _echoPublisher->offer_service(service_id, instance_id);
      _echoPublisher->start();
      }
      ......@@ -58,9 +67,9 @@ void SomeIPAdapter_tests_a_compA::publish_echoPublisher()
      //Publish
      std::set<vsomeip::eventgroup_t> event_group;
      event_group.insert(SAMPLE_EVENTGROUP_ID);
      _echoPublisher->offer_event(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_EVENT_ID, event_group, true);
      _echoPublisher->notify(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_EVENT_ID, payload);
      event_group.insert(eventgroup_id);
      _echoPublisher->offer_event(service_id, instance_id, event_id, event_group, true);
      _echoPublisher->notify(service_id, instance_id, event_id, payload);
      }
      void SomeIPAdapter_tests_a_compA::tick()
      ......
      someip_adapter/SomeIPAdapter_tests_a_compA.h
      View file @ a648c72f
      ......@@ -17,6 +17,8 @@ public:
      SomeIPAdapter_tests_a_compA();
      SomeIPAdapter_tests_a_compA(int service_id, int instance_id, int method_id, int event_id, int eventgroup_id);
      void init(tests_a_compA* comp);
      void publish_echoPublisher();
      ......@@ -32,4 +34,10 @@ private:
      std::shared_ptr<vsomeip::application> _clockSubscriber;
      std::shared_ptr<vsomeip::application> _echoPublisher;
      int service_id;
      int instance_id;
      int method_id;
      int event_id;
      int eventgroup_id;
      };
      src/main/resources/de/monticore/lang/monticar/generator/someip/template/Adapter.cpp.ftl
      View file @ a648c72f
      <#import "SomeIPMacros.ftl" as m>
      #include "<@m.mwIdent/>Adapter_${model.getEscapedCompName()}.h"
      #define SAMPLE_SERVICE_ID 0x1234
      #define SAMPLE_INSTANCE_ID 0x5678
      #define SAMPLE_METHOD_ID 0x0421
      #define SAMPLE_EVENT_ID 0x2345
      #define SAMPLE_EVENTGROUP_ID 0x1456
      <@m.mwIdent/>Adapter_${model.getEscapedCompName()}::<@m.mwIdent/>Adapter_${model.getEscapedCompName()}() {
      //choose random ids
      service_id = 1;
      instance_id = 2;
      method_id = 3;
      event_id = 4;
      eventgroup_id = 5;
      }
      <@m.mwIdent/>Adapter_${model.getEscapedCompName()}::<@m.mwIdent/>Adapter_${model.getEscapedCompName()}() {}
      <@m.mwIdent/>Adapter_${model.getEscapedCompName()}::<@m.mwIdent/>Adapter_${model.getEscapedCompName()}(int service_id, int instance_id, int method_id, int event_id, int eventgroup_id) {
      this->service_id = service_id;
      this->instance_id = instance_id;
      this->method_id = method_id;
      this->event_id = event_id;
      this->eventgroup_id = eventgroup_id;
      }
      void <@m.mwIdent/>Adapter_${model.getEscapedCompName()}::init(${model.getEscapedCompName()} *comp) {
      // Initialize component
      ......@@ -16,20 +25,20 @@ void <@m.mwIdent/>Adapter_${model.getEscapedCompName()}::init(${model.getEscaped
      // Intitialize subscriber
      _clockSubscriber = vsomeip::runtime::get()->create_application("Subscriber");
      _clockSubscriber->init();
      _clockSubscriber->request_service(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID);
      _clockSubscriber->register_message_handler(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_METHOD_ID, std::bind(&SomeIPAdapter_tests_a_compA::on_message, this, std::placeholders::_1));
      _clockSubscriber->request_service(service_id, instance_id);
      _clockSubscriber->register_message_handler(service_id, instance_id, method_id, std::bind(&SomeIPAdapter_tests_a_compA::on_message, this, std::placeholders::_1));
      // Subscribe
      std::set<vsomeip::eventgroup_t> event_group;
      event_group.insert(SAMPLE_EVENTGROUP_ID);
      _clockSubscriber->request_event(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_EVENT_ID, event_group, true);
      _clockSubscriber->subscribe(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_EVENTGROUP_ID);
      event_group.insert(eventgroup_id);
      _clockSubscriber->request_event(service_id, instance_id, event_id, event_group, true);
      _clockSubscriber->subscribe(service_id, instance_id, eventgroup_id);
      _clockSubscriber->start();
      // Intitialize Publisher
      _echoPublisher = vsomeip::runtime::get()->create_application("Publisher");
      _echoPublisher->init();
      _echoPublisher->offer_service(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID);
      _echoPublisher->offer_service(service_id, instance_id);
      _echoPublisher->start();
      }
      ......@@ -59,9 +68,9 @@ void <@m.mwIdent/>Adapter_${model.getEscapedCompName()}::publish_echoPublisher()
      //Publish
      std::set<vsomeip::eventgroup_t> event_group;
      event_group.insert(SAMPLE_EVENTGROUP_ID);
      _echoPublisher->offer_event(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_EVENT_ID, event_group, true);
      _echoPublisher->notify(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_EVENT_ID, payload);
      event_group.insert(eventgroup_id);
      _echoPublisher->offer_event(service_id, instance_id, event_id, event_group, true);
      _echoPublisher->notify(service_id, instance_id, event_id, payload);
      }
      void <@m.mwIdent/>Adapter_${model.getEscapedCompName()}::tick()
      ......
      src/main/resources/de/monticore/lang/monticar/generator/someip/template/Adapter.h.ftl
      View file @ a648c72f
      ......@@ -18,6 +18,8 @@ public:
      <@m.mwIdent/>Adapter_${model.getEscapedCompName()}();
      <@m.mwIdent/>Adapter_${model.getEscapedCompName()}(int service_id, int instance_id, int method_id, int event_id, int eventgroup_id);
      void init(${model.getEscapedCompName()}* comp);
      void publish_echoPublisher();
      ......@@ -33,4 +35,10 @@ private:
      std::shared_ptr<vsomeip::application> _clockSubscriber;
      std::shared_ptr<vsomeip::application> _echoPublisher;
      int service_id;
      int instance_id;
      int method_id;
      int event_id;
      int eventgroup_id;
      };
      src/test/resources/results/echoAdapter/SomeIPAdapter_tests_a_compA.cpp
      View file @ a648c72f
      #include "SomeIPAdapter_tests_a_compA.h"
      #define SAMPLE_SERVICE_ID 0x1234
      #define SAMPLE_INSTANCE_ID 0x5678
      #define SAMPLE_METHOD_ID 0x0421
      #define SAMPLE_EVENT_ID 0x2345
      #define SAMPLE_EVENTGROUP_ID 0x1456
      SomeIPAdapter_tests_a_compA::SomeIPAdapter_tests_a_compA() {
      //choose random ids
      service_id = 1;
      instance_id = 2;
      method_id = 3;
      event_id = 4;
      eventgroup_id = 5;
      }
      SomeIPAdapter_tests_a_compA::SomeIPAdapter_tests_a_compA() {}
      SomeIPAdapter_tests_a_compA::SomeIPAdapter_tests_a_compA(int service_id, int instance_id, int method_id, int event_id, int eventgroup_id) {
      this->service_id = service_id;
      this->instance_id = instance_id;
      this->method_id = method_id;
      this->event_id = event_id;
      this->eventgroup_id = eventgroup_id;
      }
      void SomeIPAdapter_tests_a_compA::init(tests_a_compA *comp) {
      // Initialize component
      ......@@ -15,20 +24,20 @@ void SomeIPAdapter_tests_a_compA::init(tests_a_compA *comp) {
      // Intitialize subscriber
      _clockSubscriber = vsomeip::runtime::get()->create_application("Subscriber");
      _clockSubscriber->init();
      _clockSubscriber->request_service(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID);
      _clockSubscriber->register_message_handler(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_METHOD_ID, std::bind(&SomeIPAdapter_tests_a_compA::on_message, this, std::placeholders::_1));
      _clockSubscriber->request_service(service_id, instance_id);
      _clockSubscriber->register_message_handler(service_id, instance_id, method_id, std::bind(&SomeIPAdapter_tests_a_compA::on_message, this, std::placeholders::_1));
      // Subscribe
      std::set<vsomeip::eventgroup_t> event_group;
      event_group.insert(SAMPLE_EVENTGROUP_ID);
      _clockSubscriber->request_event(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_EVENT_ID, event_group, true);
      _clockSubscriber->subscribe(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_EVENTGROUP_ID);
      event_group.insert(eventgroup_id);
      _clockSubscriber->request_event(service_id, instance_id, event_id, event_group, true);
      _clockSubscriber->subscribe(service_id, instance_id, eventgroup_id);
      _clockSubscriber->start();
      // Intitialize Publisher
      _echoPublisher = vsomeip::runtime::get()->create_application("Publisher");
      _echoPublisher->init();
      _echoPublisher->offer_service(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID);
      _echoPublisher->offer_service(service_id, instance_id);
      _echoPublisher->start();
      }
      ......@@ -58,9 +67,9 @@ void SomeIPAdapter_tests_a_compA::publish_echoPublisher()
      //Publish
      std::set<vsomeip::eventgroup_t> event_group;
      event_group.insert(SAMPLE_EVENTGROUP_ID);
      _echoPublisher->offer_event(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_EVENT_ID, event_group, true);
      _echoPublisher->notify(SAMPLE_SERVICE_ID, SAMPLE_INSTANCE_ID, SAMPLE_EVENT_ID, payload);
      event_group.insert(eventgroup_id);
      _echoPublisher->offer_event(service_id, instance_id, event_id, event_group, true);
      _echoPublisher->notify(service_id, instance_id, event_id, payload);
      }
      void SomeIPAdapter_tests_a_compA::tick()
      ......
      src/test/resources/results/echoAdapter/SomeIPAdapter_tests_a_compA.h
      View file @ a648c72f
      ......@@ -17,6 +17,8 @@ public:
      SomeIPAdapter_tests_a_compA();
      SomeIPAdapter_tests_a_compA(int service_id, int instance_id, int method_id, int event_id, int eventgroup_id);
      void init(tests_a_compA* comp);
      void publish_echoPublisher();
      ......@@ -32,5 +34,10 @@ private:
      std::shared_ptr<vsomeip::application> _clockSubscriber;
      std::shared_ptr<vsomeip::application> _echoPublisher;
      };
      int service_id;
      int instance_id;
      int method_id;
      int event_id;
      int eventgroup_id;
      };
      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