make req/rep,sub/pub sockets sub class;

lichao

2021-04-01 b55ffe89f4b237be5f79232cfddfe22bfdb87c64

 utest/utest.cpp

@@ -1,5 +1,6 @@
#include "defs.h"
#include "pubsub.h"
#include "pubsub_center.h"
#include "socket.h"
#include "util.h"
#include <atomic>
@@ -66,7 +67,7 @@
BOOST_AUTO_TEST_CASE(PubSubTest)
{
   const std::string shm_name("ShmPubSub");
   // ShmRemover auto_remove(shm_name); //remove twice? in case of killed?
   ShmRemover auto_remove(shm_name); //remove twice? in case of killed?
   SharedMemory shm(shm_name, 1024 * 1024 * 50);
   DEFER1(shm.Remove());
   auto Avail = [&]() { return shm.get_free_memory(); };
@@ -75,57 +76,50 @@
   printf("flag = %d\n", *flag);
   ++*flag;

   BusManager bus(shm);
   PubSubCenter bus(shm);
   bus.Start();

   std::this_thread::sleep_for(100ms);

   std::atomic<uint64_t> count(0);
   std::atomic<uint64_t> total_count(0);
   std::atomic<ptime> last_time(Now() - seconds(1));
   std::atomic<uint64_t> last_count(0);

   const uint64_t nmsg = 100 * 2;
   const int timeout = 1000;
   auto Sub = [&](int id, const std::vector<std::string> &topics) {
      ShmSocket client(ShmSocket::eSockSubscribe, shm);
      SocketSubscribe client(shm);
      bool r = client.Subscribe(topics, timeout);
      std::mutex mutex;
      std::condition_variable cv;

      uint64_t i = 0;
      auto OnRecv = [&](BHMsg &msg) {
         if (msg.type() != kMsgTypePublish) {
            BOOST_CHECK(false);
         }
         DataPub pub;
         if (!pub.ParseFromString(msg.body())) {
            BOOST_CHECK(false);
         }
         ++count;
      std::atomic<uint64_t> n(0);
      auto OnTopicData = [&](const std::string &topic, const std::string &data) {
         ++total_count;

         auto cur = Now();
         if (last_time.exchange(cur) < cur) {
            std::cout << "time: " << cur;
            printf("sub recv, total msg:%10ld, speed:[%8ld/s], used mem:%8ld \n",
                   count.load(), count - last_count.exchange(count), init_avail - Avail());
                   total_count.load(), total_count - last_count.exchange(total_count), init_avail - Avail());
         }
         if (++i >= nmsg * topics.size()) {
         if (++n >= nmsg * topics.size()) {
            cv.notify_one();
         }
         // printf("sub %2d recv: %s/%s\n", id, pub.topic().c_str(), pub.data().c_str());
      };
      client.Start(OnRecv);
      client.StartRecv(OnTopicData, 1);

      std::unique_lock<std::mutex> lk(mutex);
      cv.wait(lk);
   };

   auto Pub = [&](const std::string &topic) {
      ShmSocket provider(ShmSocket::eSockPublish, shm);
      SocketPublish provider(shm);
      for (unsigned i = 0; i < nmsg; ++i) {
         std::string data = topic + std::to_string(i) + std::string(1000, '-');

         bool r = provider.Publish(topic, data.data(), data.size(), timeout);
         // bool r = provider.Send(kBHBusQueueId, MakePub(topic, data.data(), data.size()), timeout);
         bool r = provider.Publish(topic, data, timeout);
         if (!r) {
            printf("pub ret: %s\n", r ? "ok" : "fail");
         }
@@ -151,7 +145,7 @@
   threads.WaitAll();
   std::cout << "end : " << Now();
   printf("sub recv, total msg:%10ld, speed:[%8ld/s], used mem:%8ld \n",
          count.load(), count - last_count.exchange(count), init_avail - Avail());
          total_count.load(), total_count - last_count.exchange(total_count), init_avail - Avail());

   bus.Stop();
}