More changes to enable Shenango integration.

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.11)
 
-project(Homa VERSION 0.1.1.0 LANGUAGES CXX)
+project(Homa VERSION 0.1.2.0 LANGUAGES CXX)
 
 ################################################################################
 ## Dependency Configuration ####################################################
@@ -72,16 +72,19 @@ endif()
 
 ## lib Homa ####################################################################
 add_library(Homa
+    src/Bindings/CHoma.cc
     src/CodeLocation.cc
     src/Debug.cc
-    src/Homa.cc
+    src/Driver.cc
     src/Perf.cc
     src/Policy.cc
     src/Receiver.cc
     src/Sender.cc
     src/StringUtil.cc
     src/ThreadId.cc
     src/TransportImpl.cc
+    src/Transports/PollModeTransportImpl.cc
+    src/Transports/Shenango.cc
     src/Util.cc
 )
 add_library(Homa::Homa ALIAS Homa)
@@ -261,6 +264,7 @@ add_executable(unit_test
     src/ThreadIdTest.cc
     src/TimeoutTest.cc
     src/TransportImplTest.cc
+    src/Transports/PollModeTransportImplTest.cc
     src/TubTest.cc
     src/UtilTest.cc
 )

include/Homa/Bindings/CHoma.h

@@ -0,0 +1,200 @@
+/* Copyright (c) 2020 Stanford University
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR(S) DISCLAIM ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL AUTHORS BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * @file CHoma.h
+ *
+ * Contains C-bindings for the Homa Transport API.
+ */
+
+#ifndef HOMA_INCLUDE_HOMA_BINDINGS_CHOMA_H
+#define HOMA_INCLUDE_HOMA_BINDINGS_CHOMA_H
+
+#include "Homa/OutMessageStatus.h"
+
+#ifdef __cplusplus
+#include <cstddef>
+#include <cstdint>
+extern "C" {
+#else
+#include <stddef.h>
+#include <stdint.h>
+#endif
+
+/**
+ * Define handle types for various Homa objects.
+ *
+ * A handle type is essentially a thin wrapper around an opaque pointer.
+ * Compared to generic pointers, using handle types in the C API enables
+ * some type safety.
+ */
+#define DEFINE_HOMA_OBJ_HANDLE(x) \
+    typedef struct {              \
+        void* p;                  \
+    } homa_##x;
+
+DEFINE_HOMA_OBJ_HANDLE(callbacks) /* Homa::Callbacks  */
+DEFINE_HOMA_OBJ_HANDLE(driver)    /* Homa::Driver     */
+DEFINE_HOMA_OBJ_HANDLE(inmsg)     /* Homa::InMessage  */
+DEFINE_HOMA_OBJ_HANDLE(outmsg)    /* Homa::OutMessage */
+DEFINE_HOMA_OBJ_HANDLE(trans)     /* Homa::Transport  */
+
+/* ============================ */
+/*     Homa::InMessage API      */
+/* ============================ */
+
+/**
+ * homa_inmsg_ack - C-binding for Homa::InMessage::acknowledge
+ */
+extern void homa_inmsg_ack(homa_inmsg in_msg);
+
+/**
+ * homa_inmsg_dropped - C-binding for Homa::InMessage::dropped
+ */
+extern bool homa_inmsg_dropped(homa_inmsg in_msg);
+
+/**
+ * homa_inmsg_fail - C-binding for Homa::InMessage::fail
+ */
+extern void homa_inmsg_fail(homa_inmsg in_msg);
+
+/**
+ * homa_inmsg_get - C-binding for Homa::InMessage::get
+ */
+extern size_t homa_inmsg_get(homa_inmsg in_msg, size_t ofs, void* dst,
+                             size_t len);
+
+/**
+ * homa_inmsg_src_addr - C-binding for Homa::InMessage::getSourceAddress
+ */
+extern void homa_inmsg_src_addr(homa_inmsg in_msg, uint32_t* ip,
+                                uint16_t* port);
+
+/**
+ * homa_inmsg_len - C-binding for Homa::InMessage::length
+ */
+extern size_t homa_inmsg_len(homa_inmsg in_msg);
+
+/**
+ * homa_inmsg_release - C-binding for Homa::InMessage::release
+ */
+extern void homa_inmsg_release(homa_inmsg in_msg);
+
+/**
+ * homa_inmsg_strip - C-binding for Homa::InMessage::strip
+ */
+extern void homa_inmsg_strip(homa_inmsg in_msg, size_t n);
+
+/* ============================ */
+/*     Homa::OutMessage API     */
+/* ============================ */
+
+/**
+ * homa_outmsg_append - C-binding for Homa::OutMessage::append
+ */
+extern void homa_outmsg_append(homa_outmsg out_msg, const void* buf,
+                               size_t len);
+
+/**
+ * homa_outmsg_cancel - C-binding for Homa::OutMessage::cancel
+ */
+extern void homa_outmsg_cancel(homa_outmsg out_msg);
+
+/**
+ * homa_outmsg_status - C-binding for Homa::OutMessage::getStatus
+ */
+extern int homa_outmsg_status(homa_outmsg out_msg);
+
+/**
+ * homa_outmsg_prepend - C-binding for Homa::OutMessage::prepend
+ */
+extern void homa_outmsg_prepend(homa_outmsg out_msg, const void* buf,
+                                size_t len);
+
+/**
+ * homa_outmsg_reserve - C-binding for Homa::OutMessage::reserve
+ */
+extern void homa_outmsg_reserve(homa_outmsg out_msg, size_t n);
+
+/**
+ * homa_outmsg_send - C-binding for Homa::OutMessage::send
+ */
+extern void homa_outmsg_send(homa_outmsg out_msg, uint32_t ip, uint16_t port);
+
+/**
+ * homa_outmsg_release - C-binding for Homa::OutMessage::release
+ */
+extern void homa_outmsg_release(homa_outmsg out_msg);
+
+/* ================================ */
+/*     Homa::TransportBase API      */
+/* ================================ */
+
+/**
+ * homa_trans_create - C-binding for Homa::TransportBase::create
+ */
+extern homa_trans homa_trans_create(homa_driver drv, homa_callbacks cbs,
+                                    uint64_t id);
+
+/**
+ * homa_trans_free - C-binding for Homa::TransportBase::free
+ */
+extern void homa_trans_free(homa_trans trans);
+
+/**
+ * homa_trans_alloc - C-binding for Homa::TransportBase::alloc
+ */
+extern homa_outmsg homa_trans_alloc(homa_trans trans, uint16_t port);
+
+/**
+ * homa_trans_get_drv - C-binding for Homa::TransportBase::getDriver
+ */
+extern homa_driver homa_trans_get_drv(homa_trans trans);
+
+/**
+ * homa_trans_id - C-binding for Homa::TransportBase::getId
+ */
+extern uint64_t homa_trans_id(homa_trans trans);
+
+/* ================================ */
+/*     Homa::Core::Transport API    */
+/* ================================ */
+
+/**
+ * homa_trans_check_timeouts - C-binding for Core::Transport::checkTimeouts
+ */
+extern uint64_t homa_trans_check_timeouts(homa_trans trans);
+
+/**
+ * homa_trans_proc - C-binding for Core::Transport::processPacket
+ */
+extern void homa_trans_proc(homa_trans trans, uintptr_t desc, void* payload,
+                            int32_t len, uint32_t src_ip);
+
+/**
+ * homa_trans_try_send - C-binding for Core::Transport::trySend
+ */
+extern uint64_t homa_trans_try_send(homa_trans trans);
+
+/**
+ * homa_trans_try_grant - C-binding for Core::Transport::trySendGrants
+ */
+extern bool homa_trans_try_grant(homa_trans trans);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // HOMA_INCLUDE_HOMA_BINDINGS_CHOMA_H