fix folly dep on caladan

saubhik · May 4, 2022 · 5697312 · 5697312
1 parent 9f16999
commit 5697312
Show file tree

Hide file tree

Showing 17 changed files with 25 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -16,7 +16,7 @@
 
 #include <glog/logging.h>
 
-#include "runtime.h"
+#include <caladan/runtime.h>
 
 #include <folly/Portability.h>
 #include <folly/init/Init.h>