From 56973120b9c70c8e6aeeb9ab435d049e05ac27f9 Mon Sep 17 00:00:00 2001
From: saubhik <saubhik.mukherjee@gmail.com>
Date: Tue, 3 May 2022 21:14:27 -0600
Subject: [PATCH] fix folly dep on caladan

---
 CMake/folly-deps.cmake                           | 6 ++++++
 folly/io/async/AsyncUDPSocket.cpp                | 2 +-
 folly/io/async/AsyncUDPSocket.h                  | 2 +-
 folly/io/async/EventBase.cpp                     | 2 +-
 folly/io/async/EventBase.h                       | 4 ++--
 folly/io/async/EventBaseBackendBase.h            | 2 +-
 folly/io/async/ScopedEventBaseThread.h           | 2 +-
 folly/io/async/ShenangoEventBaseBackendBase.h    | 2 +-
 folly/io/async/ShenangoEventHandler.h            | 2 +-
 folly/io/async/test/AsyncUDPSocketTest.cpp       | 2 +-
 folly/io/async/test/EventBaseTestLib.h           | 4 ++--
 folly/io/async/test/ShenangoEventHandlerTest.cpp | 4 ++--
 folly/net/ShNetOps.h                             | 2 +-
 folly/net/ShNetworkSocket.h                      | 2 +-
 folly/synchronization/detail/Spin.h              | 2 +-
 folly/system/ThreadName.h                        | 2 +-
 folly/test/common/TestMain.cpp                   | 2 +-
 17 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
index 6c87a5113a7..b90ca05e85c 100644
--- a/CMake/folly-deps.cmake
+++ b/CMake/folly-deps.cmake
@@ -145,6 +145,12 @@ find_package(Libsodium)
 list(APPEND FOLLY_LINK_LIBRARIES ${LIBSODIUM_LIBRARIES})
 list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBSODIUM_INCLUDE_DIRS})
 
+# link shenango libraries
+list(APPEND FOLLY_LINK_LIBRARIES librt++.a)
+list(APPEND FOLLY_LINK_LIBRARIES libruntime.a)
+list(APPEND FOLLY_LINK_LIBRARIES libnet.a)
+list(APPEND FOLLY_LINK_LIBRARIES libbase.a)
+
 # message(STATUS "FOLLY_LINK_LIBRARIES: ${FOLLY_LINK_LIBRARIES}")
 # message(STATUS "FOLLY_INCLUDE_DIRECTORIES: ${FOLLY_INCLUDE_DIRECTORIES}")
 
diff --git a/folly/io/async/AsyncUDPSocket.cpp b/folly/io/async/AsyncUDPSocket.cpp
index 0127f77a0cf..d6d3405c69c 100644
--- a/folly/io/async/AsyncUDPSocket.cpp
+++ b/folly/io/async/AsyncUDPSocket.cpp
@@ -1,4 +1,4 @@
-#include "net.h"
+#include <caladan/net.h>
 
 #include <boost/preprocessor/control/if.hpp>
 
diff --git a/folly/io/async/AsyncUDPSocket.h b/folly/io/async/AsyncUDPSocket.h
index d53c8a8516a..4298c873859 100644
--- a/folly/io/async/AsyncUDPSocket.h
+++ b/folly/io/async/AsyncUDPSocket.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "net.h"
+#include <caladan/net.h>
 
 #include <folly/Function.h>
 #include <folly/SocketAddress.h>
diff --git a/folly/io/async/EventBase.cpp b/folly/io/async/EventBase.cpp
index add2da1958d..fe034d6a443 100644
--- a/folly/io/async/EventBase.cpp
+++ b/folly/io/async/EventBase.cpp
@@ -25,7 +25,7 @@
 #include <iostream>
 #include <memory>
 
-#include "sync.h"
+#include <caladan/sync.h>
 
 #include <folly/ExceptionString.h>
 #include <folly/Memory.h>
diff --git a/folly/io/async/EventBase.h b/folly/io/async/EventBase.h
index ba85a0b4c7a..b01f909b484 100644
--- a/folly/io/async/EventBase.h
+++ b/folly/io/async/EventBase.h
@@ -33,8 +33,8 @@
 #include <boost/intrusive/list.hpp>
 #include <glog/logging.h>
 
-#include "thread.h"
-#include "sh_event.h"
+#include <caladan/thread.h>
+#include <caladan/sh_event.h>
 
 #include <folly/Executor.h>
 #include <folly/Function.h>
diff --git a/folly/io/async/EventBaseBackendBase.h b/folly/io/async/EventBaseBackendBase.h
index 219ee1b1a07..de7e7516800 100644
--- a/folly/io/async/EventBaseBackendBase.h
+++ b/folly/io/async/EventBaseBackendBase.h
@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include "net.h"
+#include <caladan/net.h>
 
 #include <folly/io/async/EventUtil.h>
 #include <folly/net/NetOps.h>
diff --git a/folly/io/async/ScopedEventBaseThread.h b/folly/io/async/ScopedEventBaseThread.h
index 79f96325c1f..e54c0b83e33 100644
--- a/folly/io/async/ScopedEventBaseThread.h
+++ b/folly/io/async/ScopedEventBaseThread.h
@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include "thread.h"
+#include <caladan/thread.h>
 
 #include <folly/io/async/EventBase.h>
 #include <folly/synchronization/Baton.h>
diff --git a/folly/io/async/ShenangoEventBaseBackendBase.h b/folly/io/async/ShenangoEventBaseBackendBase.h
index 91438214d1e..a24ddb7e054 100644
--- a/folly/io/async/ShenangoEventBaseBackendBase.h
+++ b/folly/io/async/ShenangoEventBaseBackendBase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "sh_event.h"
+#include <caladan/sh_event.h>
 
 #include <folly/io/async/EventBaseBackendBase.h>
 
diff --git a/folly/io/async/ShenangoEventHandler.h b/folly/io/async/ShenangoEventHandler.h
index 0a09f912585..05a4cece4ae 100644
--- a/folly/io/async/ShenangoEventHandler.h
+++ b/folly/io/async/ShenangoEventHandler.h
@@ -4,7 +4,7 @@ extern "C" {
 #include "runtime/poll.h"
 }
 
-#include "net.h"
+#include <caladan/net.h>
 
 #include <cassert>
 
diff --git a/folly/io/async/test/AsyncUDPSocketTest.cpp b/folly/io/async/test/AsyncUDPSocketTest.cpp
index e267d2f1bc7..9dbd9846901 100644
--- a/folly/io/async/test/AsyncUDPSocketTest.cpp
+++ b/folly/io/async/test/AsyncUDPSocketTest.cpp
@@ -2,7 +2,7 @@ extern "C" {
 #include <base/log.h>
 }
 
-#include "runtime.h"
+#include <caladan/runtime.h>
 
 #include <folly/Conv.h>
 #include <folly/SocketAddress.h>
diff --git a/folly/io/async/test/EventBaseTestLib.h b/folly/io/async/test/EventBaseTestLib.h
index 95225dbaae9..f17fb283fde 100644
--- a/folly/io/async/test/EventBaseTestLib.h
+++ b/folly/io/async/test/EventBaseTestLib.h
@@ -20,8 +20,8 @@
 #include <memory>
 #include <thread>
 
-#include "runtime.h"
-#include "thread.h"
+#include <caladan/runtime.h>
+#include <caladan/thread.h>
 
 #include <folly/Memory.h>
 #include <folly/ScopeGuard.h>
diff --git a/folly/io/async/test/ShenangoEventHandlerTest.cpp b/folly/io/async/test/ShenangoEventHandlerTest.cpp
index 5eeeb6af574..cd595a3a18f 100644
--- a/folly/io/async/test/ShenangoEventHandlerTest.cpp
+++ b/folly/io/async/test/ShenangoEventHandlerTest.cpp
@@ -2,8 +2,8 @@ extern "C" {
 #include <base/log.h>
 }
 
-#include "net.h"
-#include "runtime.h"
+#include <caladan/net.h>
+#include <caladan/runtime.h>
 #include "timer.h"
 
 #include <iostream>
diff --git a/folly/net/ShNetOps.h b/folly/net/ShNetOps.h
index 793c6ee5537..18f78280668 100644
--- a/folly/net/ShNetOps.h
+++ b/folly/net/ShNetOps.h
@@ -3,7 +3,7 @@
 #include <folly/net/ShNetworkSocket.h>
 #include <folly/portability/IOVec.h>
 
-#include "net.h"
+#include <caladan/net.h>
 
 namespace folly::shnetops {
 int bind(ShNetworkSocket &s, const netaddr *name);
diff --git a/folly/net/ShNetworkSocket.h b/folly/net/ShNetworkSocket.h
index 3e8dfb1de8f..b0403b7661d 100644
--- a/folly/net/ShNetworkSocket.h
+++ b/folly/net/ShNetworkSocket.h
@@ -2,7 +2,7 @@
 
 #include <ostream>
 
-#include "net.h"
+#include <caladan/net.h>
 
 namespace folly {
 /**
diff --git a/folly/synchronization/detail/Spin.h b/folly/synchronization/detail/Spin.h
index 196c1fa64f9..7c9f1b4eb9f 100644
--- a/folly/synchronization/detail/Spin.h
+++ b/folly/synchronization/detail/Spin.h
@@ -22,7 +22,7 @@
 #include <folly/portability/Asm.h>
 #include <folly/synchronization/WaitOptions.h>
 
-#include "thread.h"
+#include <caladan/thread.h>
 
 namespace folly {
 namespace detail {
diff --git a/folly/system/ThreadName.h b/folly/system/ThreadName.h
index 3c49914ea65..ebcf2757646 100644
--- a/folly/system/ThreadName.h
+++ b/folly/system/ThreadName.h
@@ -18,7 +18,7 @@
 
 #include <string>
 
-#include "thread.h"
+#include <caladan/thread.h>
 
 #include <folly/Optional.h>
 #include <folly/Range.h>
diff --git a/folly/test/common/TestMain.cpp b/folly/test/common/TestMain.cpp
index 379c59811bd..0435e331c9a 100644
--- a/folly/test/common/TestMain.cpp
+++ b/folly/test/common/TestMain.cpp
@@ -16,7 +16,7 @@
 
 #include <glog/logging.h>
 
-#include "runtime.h"
+#include <caladan/runtime.h>
 
 #include <folly/Portability.h>
 #include <folly/init/Init.h>