From f4433f28b509a9f67ca85d79000ccf9c2f4b7a24 Mon Sep 17 00:00:00 2001
From: Mauro Sardara <msardara@cisco.com>
Date: Fri, 21 Feb 2020 11:52:28 +0100
Subject: [HICN-534] Major rework on libtransport organization

Change-Id: I361b83a18b4fd59be136d5f0817fc28e17e89884
Signed-off-by: Mauro Sardara <msardara@cisco.com>
---
 .../src/hicn/transport/core/memif_connector.h      | 133 ---------------------
 1 file changed, 133 deletions(-)
 delete mode 100644 libtransport/src/hicn/transport/core/memif_connector.h

(limited to 'libtransport/src/hicn/transport/core/memif_connector.h')

diff --git a/libtransport/src/hicn/transport/core/memif_connector.h b/libtransport/src/hicn/transport/core/memif_connector.h
deleted file mode 100644
index bf4e2d56c..000000000
--- a/libtransport/src/hicn/transport/core/memif_connector.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2017-2019 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:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <hicn/transport/config.h>
-#include <hicn/transport/core/connector.h>
-//#include <hicn/transport/core/hicn_vapi.h>
-#include <hicn/transport/portability/portability.h>
-#include <hicn/transport/utils/epoll_event_reactor.h>
-#include <hicn/transport/utils/fd_deadline_timer.h>
-#include <hicn/transport/utils/ring_buffer.h>
-
-#include <asio.hpp>
-#include <deque>
-#include <mutex>
-#include <thread>
-
-#ifdef __vpp__
-
-#define _Static_assert static_assert
-
-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;
-
- public:
-  MemifConnector(PacketReceivedCallback &&receive_callback,
-                 OnReconnect &&on_reconnect_callback,
-                 asio::io_service &io_service,
-                 std::string app_name = "Libtransport");
-
-  ~MemifConnector() override;
-
-  void send(const Packet::MemBufPtr &packet) override;
-
-  void send(const uint8_t *packet, std::size_t len,
-            const PacketSentCallback &packet_sent = 0) override;
-
-  void close() override;
-
-  void connect(uint32_t memif_id, long memif_mode);
-
-  TRANSPORT_ALWAYS_INLINE uint32_t getMemifId() { return memif_id_; };
-
- private:
-  void init();
-
-  int doSend();
-
-  int createMemif(uint32_t index, uint8_t mode, char *s);
-
-  uint32_t getMemifConfiguration();
-
-  int deleteMemif();
-
-  static int controlFdUpdate(int fd, uint8_t events, void *private_ctx);
-
-  static int onConnect(memif_conn_handle_t conn, void *private_ctx);
-
-  static int onDisconnect(memif_conn_handle_t conn, void *private_ctx);
-
-  static int onInterrupt(memif_conn_handle_t conn, void *private_ctx,
-                         uint16_t qid);
-
-  void threadMain();
-
-  int txBurst(uint16_t qid);
-
-  int bufferAlloc(long n, uint16_t qid);
-
-  void sendCallback(const std::error_code &ec);
-
-  void processInputBuffer();
-
- 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::atomic_bool timer_set_;
-  std::unique_ptr<utils::FdDeadlineTimer> send_timer_;
-  std::unique_ptr<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_;
-  uint16_t tx_buf_counter_;
-
-  PacketRing input_buffer_;
-  bool is_reconnection_;
-  bool data_available_;
-  uint32_t memif_id_;
-  uint8_t memif_mode_;
-  std::string app_name_;
-  uint16_t transmission_index_;
-  utils::SpinLock write_msgs_lock_;
-  std::string socket_filename_;
-
-  static std::once_flag flag_;
-};
-
-}  // end namespace core
-
-}  // end namespace transport
-
-#endif  // __vpp__
\ No newline at end of file
-- 
cgit 1.2.3-korg