class MsgI, ShmMsgQueue, no bind to shm.

lichao

2021-05-21 1ff714838c03cba1a18884d5b48a20ee6c4275ac

 src/topic_node.cpp

@@ -66,13 +66,13 @@
   }

   if (ssn_id_ == 0) {
      ssn_id_ = ShmMsgQueue::NewId();
      ssn_id_ = NewSession();
   }
   LOG_DEBUG() << "Node Init, id " << ssn_id_;
   auto NodeInit = [&]() {
      int64_t init_request = ssn_id_ << 4 | EncodeCmd(eCmdNodeInit);
      int64_t reply = 0;
      if (BHNodeInit(init_request, reply) && DecodeCmd(reply) == eCmdNodeInitReply) {
      if (BHNodeInit(shm(), init_request, reply) && DecodeCmd(reply) == eCmdNodeInitReply) {
         int64_t abs_addr = reply >> 4;
         sockets_.emplace_back(new ShmSocket(abs_addr, shm_, ssn_id_));
         LOG_DEBUG() << "node init ok";
@@ -94,7 +94,7 @@
            auto head = InitMsgHead(GetType(body), info_.proc_id(), ssn_id_);
            AddRoute(head, socket);
            if (imsg.Fill(head, body)) {
               socket.Send(BHTopicCenterAddress(), imsg);
               socket.Send(CenterAddr(), imsg);
            }
         } break;
         case kMsgTypeProcInitReply: {
@@ -187,12 +187,12 @@
         MsgCommonReply body;
         CheckResult(imsg, head, body);
      };
      return sock.Send(BHTopicCenterAddress(), head, body, onResult);
      return sock.Send(CenterAddr(), head, body, onResult);
   } else {
      MsgI reply;
      MsgI reply(shm());
      DEFER1(reply.Release(););
      BHMsgHead reply_head;
      bool r = sock.SendAndRecv(BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
      bool r = sock.SendAndRecv(CenterAddr(), head, body, reply, reply_head, timeout_ms);
      if (r) {
         CheckResult(reply, reply_head, reply_body);
      }
@@ -228,12 +228,12 @@
         MsgCommonReply body;
         CheckResult(imsg, head, body);
      };
      return sock.Send(BHTopicCenterAddress(), head, body, onResult);
      return sock.Send(CenterAddr(), head, body, onResult);
   } else {
      MsgI reply;
      MsgI reply(shm());
      DEFER1(reply.Release(););
      BHMsgHead reply_head;
      bool r = sock.SendAndRecv(BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
      bool r = sock.SendAndRecv(CenterAddr(), head, body, reply, reply_head, timeout_ms);
      return r && CheckResult(reply, reply_head, reply_body);
   }
}
@@ -253,12 +253,12 @@
   AddRoute(head, sock);

   if (timeout_ms == 0) {
      return sock.Send(BHTopicCenterAddress(), head, body);
      return sock.Send(CenterAddr(), head, body);
   } else {
      MsgI reply;
      MsgI reply(shm());
      DEFER1(reply.Release(););
      BHMsgHead reply_head;
      bool r = sock.SendAndRecv(BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
      bool r = sock.SendAndRecv(CenterAddr(), head, body, reply, reply_head, timeout_ms);
      r = r && reply_head.type() == kMsgTypeCommonReply && reply.ParseBody(reply_body);
      return (r && IsSuccess(reply_body.errmsg().errcode()));
   }
@@ -282,10 +282,10 @@
   BHMsgHead head(InitMsgHead(GetType(query), proc_id(), ssn()));
   AddRoute(head, sock);

   MsgI reply;
   MsgI reply(shm());
   DEFER1(reply.Release());
   BHMsgHead reply_head;
   return (sock.SendAndRecv(BHTopicCenterAddress(), head, query, reply, reply_head, timeout_ms) &&
   return (sock.SendAndRecv(CenterAddr(), head, query, reply, reply_head, timeout_ms) &&
           reply_head.type() == kMsgTypeQueryTopicReply &&
           reply.ParseBody(reply_body));
}
@@ -301,10 +301,10 @@
   BHMsgHead head(InitMsgHead(GetType(query), proc_id(), ssn()));
   AddRoute(head, sock);

   MsgI reply;
   MsgI reply(shm());
   DEFER1(reply.Release());
   BHMsgHead reply_head;
   return (sock.SendAndRecv(BHTopicCenterAddress(), head, query, reply, reply_head, timeout_ms) &&
   return (sock.SendAndRecv(CenterAddr(), head, query, reply, reply_head, timeout_ms) &&
           reply_head.type() == kMsgTypeQueryProcReply &&
           reply.ParseBody(reply_body));
}
@@ -324,12 +324,12 @@
   AddRoute(head, sock);

   if (timeout_ms == 0) {
      return sock.Send(BHTopicCenterAddress(), head, body);
      return sock.Send(CenterAddr(), head, body);
   } else {
      MsgI reply;
      MsgI reply(shm());
      DEFER1(reply.Release(););
      BHMsgHead reply_head;
      bool r = sock.SendAndRecv(BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
      bool r = sock.SendAndRecv(CenterAddr(), head, body, reply, reply_head, timeout_ms);
      r = r && reply_head.type() == kMsgTypeCommonReply;
      r = r && reply.ParseBody(reply_body);
      return r;
@@ -525,7 +525,7 @@
         AddRoute(head, sock);
         head.set_topic(request.topic());

         MsgI reply_msg;
         MsgI reply_msg(shm());
         DEFER1(reply_msg.Release(););
         BHMsgHead reply_head;

@@ -596,13 +596,13 @@
      AddRoute(head, sock);

      if (timeout_ms == 0) {
         return sock.Send(BHTopicBusAddress(), head, pub);
         return sock.Send(BusAddr(), head, pub);
      } else {
         MsgI reply;
         MsgI reply(shm());
         DEFER1(reply.Release(););
         BHMsgHead reply_head;
         MsgCommonReply reply_body;
         return sock.SendAndRecv(BHTopicBusAddress(), head, pub, reply, reply_head, timeout_ms) &&
         return sock.SendAndRecv(BusAddr(), head, pub, reply, reply_head, timeout_ms) &&
                reply_head.type() == kMsgTypeCommonReply &&
                reply.ParseBody(reply_body) &&
                IsSuccess(reply_body.errmsg().errcode());
@@ -629,12 +629,12 @@
      BHMsgHead head(InitMsgHead(GetType(sub), proc_id(), ssn()));
      AddRoute(head, sock);
      if (timeout_ms == 0) {
         return sock.Send(BHTopicBusAddress(), head, sub);
         return sock.Send(BusAddr(), head, sub);
      } else {
         MsgI reply;
         MsgI reply(shm());
         DEFER1(reply.Release(););
         BHMsgHead reply_head;
         return sock.SendAndRecv(BHTopicBusAddress(), head, sub, reply, reply_head, timeout_ms) &&
         return sock.SendAndRecv(BusAddr(), head, sub, reply, reply_head, timeout_ms) &&
                reply_head.type() == kMsgTypeCommonReply &&
                reply.ParseBody(reply_body) &&
                IsSuccess(reply_body.errmsg().errcode());