transport: #389

faasm · Mar 1, 2024 · 3f0f4d7 · 3f0f4d7
1 parent 5c7afeb
commit 3f0f4d7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/include/faabric/transport/PointToPointBroker.h b/include/faabric/transport/PointToPointBroker.h
@@ -143,6 +143,10 @@ class PointToPointBroker
   private:
     faabric::util::SystemConfig& conf;
 
+    // If the PTP server is single-threaded, we can shortcut a lot of the
+    // complexity associated with ordering messages
+    const bool isServerSingleThreaded = true;
+
     std::shared_mutex brokerMutex;
 
     std::unordered_map<int, std::set<int>> groupIdIdxsMap;

diff --git a/src/transport/PointToPointBroker.cpp b/src/transport/PointToPointBroker.cpp
@@ -788,8 +788,7 @@ std::pair<MessageResponseCode, int> PointToPointBroker::doRecvMessage(
 void PointToPointBroker::recvMessage(PointToPointMessage& msg,
                                      bool mustOrderMsg)
 {
-    // If we don't need to receive messages in order, return here
-    if (!mustOrderMsg) {
+    if (!mustOrderMsg || isServerSingleThreaded) {
         doRecvMessage(msg);
         return;
     }

diff --git a/src/transport/PointToPointServer.cpp b/src/transport/PointToPointServer.cpp
@@ -17,7 +17,7 @@ PointToPointServer::PointToPointServer()
       POINT_TO_POINT_ASYNC_PORT,
       POINT_TO_POINT_SYNC_PORT,
       POINT_TO_POINT_INPROC_LABEL,
-      faabric::util::getSystemConfig().pointToPointServerThreads)
+      1) // faabric::util::getSystemConfig().pointToPointServerThreads)
   , broker(getPointToPointBroker())
 {}