1 files changed, 55 insertions, 35 deletions

diff --git a/libtransport/src/core/memif_connector.h b/libtransport/src/core/memif_connector.h
index 693efd14c..d36be4616 100644
--- a/libtransport/src/core/memif_connector.h
+++ b/libtransport/src/core/memif_connector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 Cisco and/or its affiliates.
+ * Copyright (c) 2021 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -16,20 +16,22 @@
 #pragma once
 
 #include <hicn/transport/config.h>
+#include <hicn/transport/core/connector.h>
 #include <hicn/transport/portability/portability.h>
 #include <hicn/transport/utils/ring_buffer.h>
-
-#include <core/connector.h>
 //#include <hicn/transport/core/hicn_vapi.h>
+#include <hicn/transport/core/asio_wrapper.h>
 #include <utils/epoll_event_reactor.h>
 #include <utils/fd_deadline_timer.h>
 
-#include <asio.hpp>
 #include <deque>
+#include <future>
 #include <mutex>
 #include <thread>
 
-#ifdef __vpp__
+extern "C" {
+#include <libmemif.h>
+};
 
 #define _Static_assert static_assert
 
@@ -37,34 +39,55 @@ namespace transport {
 
 namespace core {
 
-typedef struct memif_connection memif_connection_t;
-
 #define APP_NAME "libtransport"
 #define IF_NAME "vpp_connection"
 
-#define MEMIF_BUF_SIZE 2048
-#define MEMIF_LOG2_RING_SIZE 11
-#define MAX_MEMIF_BUFS (1 << MEMIF_LOG2_RING_SIZE)
-
 class MemifConnector : public Connector {
-  typedef void *memif_conn_handle_t;
+  static inline std::size_t kbuf_size = 2048;
+  static inline std::size_t klog2_ring_size = 13;
+
+  using PacketRing = utils::CircularFifo<utils::MemBuf::Ptr, queue_size>;
+  struct Details {
+    // index
+    uint16_t index;
+    // memif conenction handle
+    memif_conn_handle_t conn;
+    // transmit queue id
+    uint16_t tx_qid;
+    // tx buffers
+    memif_buffer_t *tx_bufs;
+    // allocated tx buffers counter
+    // number of tx buffers pointing to shared memory
+    uint16_t tx_buf_num;
+    // rx buffers
+    memif_buffer_t *rx_bufs;
+    // allocated rx buffers counter
+    // number of rx buffers pointing to shared memory
+    uint16_t rx_buf_num;
+    // interface ip address
+    uint8_t ip_addr[4];
+  };
 
  public:
   MemifConnector(PacketReceivedCallback &&receive_callback,
-                 OnReconnect &&on_reconnect_callback,
+                 PacketSentCallback &&packet_sent,
+                 OnCloseCallback &&close_callback,
+                 OnReconnectCallback &&on_reconnect,
                  asio::io_service &io_service,
                  std::string app_name = "Libtransport");
 
   ~MemifConnector() override;
 
-  void send(const Packet::MemBufPtr &packet) override;
+  void send(Packet &packet) override;
 
-  void send(const uint8_t *packet, std::size_t len,
-            const PacketSentCallback &packet_sent = 0) override;
+  void send(const utils::MemBuf::Ptr &buffer) override;
 
   void close() override;
 
-  void connect(uint32_t memif_id, long memif_mode);
+  void connect(uint32_t memif_id, long memif_mode,
+               const std::string &socket_filename,
+               std::size_t buffer_size = kbuf_size,
+               std::size_t log2_ring_size = klog2_ring_size);
 
   TRANSPORT_ALWAYS_INLINE uint32_t getMemifId() { return memif_id_; };
 
@@ -73,13 +96,13 @@ class MemifConnector : public Connector {
 
   int doSend();
 
-  int createMemif(uint32_t index, uint8_t mode, char *s);
+  int createMemif(uint32_t index, uint8_t is_master);
 
   uint32_t getMemifConfiguration();
 
   int deleteMemif();
 
-  static int controlFdUpdate(int fd, uint8_t events, void *private_ctx);
+  static int controlFdUpdate(memif_fd_event_t fde, void *private_ctx);
 
   static int onConnect(memif_conn_handle_t conn, void *private_ctx);
 
@@ -90,28 +113,26 @@ class MemifConnector : public Connector {
 
   void threadMain();
 
-  int txBurst(uint16_t qid);
+  uint16_t txBurst(uint16_t qid, std::error_code &ec);
 
-  int bufferAlloc(long n, uint16_t qid);
+  uint16_t bufferAlloc(long n, uint16_t qid, std::error_code &ec);
+
+  void scheduleSend(std::uint64_t delay);
 
   void sendCallback(const std::error_code &ec);
 
-  void processInputBuffer(std::uint16_t total_packets);
+  auto shared_from_this() { return utils::shared_from(this); }
 
  private:
-  static utils::EpollEventReactor main_event_reactor_;
-  static std::unique_ptr<std::thread> main_worker_;
-
   int epfd;
-  std::unique_ptr<std::thread> memif_worker_;
   utils::EpollEventReactor event_reactor_;
+  std::thread memif_worker_;
   std::atomic_bool timer_set_;
-  std::unique_ptr<utils::FdDeadlineTimer> send_timer_;
-  std::unique_ptr<utils::FdDeadlineTimer> disconnect_timer_;
+  utils::FdDeadlineTimer send_timer_;
+  utils::FdDeadlineTimer disconnect_timer_;
   asio::io_service &io_service_;
-  std::unique_ptr<asio::io_service::work> work_;
-  uint32_t packet_counter_;
-  std::unique_ptr<memif_connection_t> memif_connection_;
+  asio::executor_work_guard<asio::io_context::executor_type> work_;
+  Details memif_connection_;
   uint16_t tx_buf_counter_;
 
   PacketRing input_buffer_;
@@ -123,12 +144,11 @@ class MemifConnector : public Connector {
   uint16_t transmission_index_;
   utils::SpinLock write_msgs_lock_;
   std::string socket_filename_;
-
-  static std::once_flag flag_;
+  std::size_t buffer_size_;
+  std::size_t log2_ring_size_;
+  std::size_t max_memif_bufs_;
 };
 
 }  // end namespace core
 
 }  // end namespace transport
-
-#endif  // __vpp__
\ No newline at end of file