Commit 9321ff55 authored by garciay's avatar garciay
Browse files

Layers ongoing

parent 9456754b
Loading
Loading
Loading
Loading
+59 −46
Original line number Diff line number Diff line
@@ -8,12 +8,13 @@
// add your member functions here.

#include "GeoNetworkingPort.hh"
#include "GeoNetworkingLayer.hh"
#include "loggers.hh"

namespace LibItsGeoNetworking__TestSystem {

  GeoNetworkingPort::GeoNetworkingPort(const char *par_port_name)
	: GeoNetworkingPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _codec()
    : GeoNetworkingPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _time_key("GeoNetworkingPort::outgoing_send")
  {

  }
@@ -27,7 +28,7 @@ GeoNetworkingPort::~GeoNetworkingPort()

  void GeoNetworkingPort::set_parameter(const char * parameter_name, const char * parameter_value)
  {
    loggers::loggers::log("GeoNetworkingPort::set_parameter: %s=%s", parameter_name, parameter_value);
    loggers::get_instance().log("GeoNetworkingPort::set_parameter: %s=%s", parameter_name, parameter_value);
    _cfg_params.insert(std::pair<std::string, std::string>(std::string(parameter_name), std::string(parameter_value)));
  }

@@ -53,16 +54,19 @@ void GeoNetworkingPort::Handle_Fd_Event_Readable(int /*fd*/)

  void GeoNetworkingPort::user_map(const char * system_port)
  {
    loggers::loggers::log("GeoNetworkingPort::user_map: %s", system_port);
    loggers::get_instance().log(">>> GeoNetworkingPort::user_map: %s", system_port);
    
    std::map<std::string, std::string>::iterator it = _cfg_params.find(std::string("params"));
    if (it != _cfg_params.end()) {
        _layer = (GeoNetworkingLayer *)LayerStackBuilder::GetInstance()->createLayerStack(it->second.c_str());
      //loggers::get_instance().log("GeoNetworkingPort::user_map: %s", it->second.c_str());
      _layer = LayerStackBuilder::GetInstance()->createLayerStack(it->second.c_str());
      dynamic_cast<GeoNetworkingLayer *>(_layer)->addUpperPort(this);
    }
  }

  void GeoNetworkingPort::user_unmap(const char * system_port)
  {
    loggers::loggers::log("GeoNetworkingPort::user_unmap: %s", system_port);
    loggers::get_instance().log(">>> GeoNetworkingPort::user_unmap: %s", system_port);
    if (_layer != NULL) {
      delete _layer;
      _layer = NULL;
@@ -82,9 +86,18 @@ void GeoNetworkingPort::user_stop()

  void GeoNetworkingPort::outgoing_send(const GeoNetworkingReq& send_par)
  {
    loggers::loggers::log_msg(">>> GeoNetworkingPort::outgoing_send: payload=", send_par);
    _layer->sendMsg(send_par, _layer_params);
    loggers::get_instance().log_msg(">>> GeoNetworkingPort::outgoing_send: payload=", send_par);
    
    float duration;
    loggers::get_instance().set_start_time(_time_key);
    dynamic_cast<GeoNetworkingLayer *>(_layer)->sendMsg(send_par, _layer_params);
    loggers::get_instance().set_stop_time(_time_key, duration);
  }

  void GeoNetworkingPort::receiveMsg (const LibItsGeoNetworking__TestSystem::GeoNetworkingInd& p_ind, const Params& p_params) {
    loggers::get_instance().log_msg(">>> GeoNetworkingPort::receive_msg: ", p_ind);

    incoming_message(p_ind);
  }

} /* end of namespace */
+11 −12
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@

#include "LibItsGeoNetworking_TestSystem.hh"

#include "GeoNetworkingCodec.hh"
#include "GeoNetworkingLayer.hh"
#include "Layer.hh"
#include "Params.hh"

namespace LibItsGeoNetworking__TestSystem {
@@ -21,8 +20,8 @@ namespace LibItsGeoNetworking__TestSystem {
  class GeoNetworkingPort : public GeoNetworkingPort_BASE {
    Params _cfg_params;
    Params _layer_params;
    GeoNetworkingLayer * _layer;
    GeoNetworkingCodec _codec;
    Layer * _layer;
    std::string _time_key;

  public:
    GeoNetworkingPort(const char *par_port_name = NULL);
@@ -31,7 +30,7 @@ public:
    void set_parameter(const char *parameter_name,
		       const char *parameter_value);

    void receiveMsg (const LibItsGeoNetworking__TestSystem::GeoNetworkingInd&, const Params&) {};
    void receiveMsg (const LibItsGeoNetworking__TestSystem::GeoNetworkingInd&, const Params&);

  private:
    /* void Handle_Fd_Event(int fd, boolean is_readable,