From 2eca514dea75b2303d3d5011793e6394d6a29d75 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 1 Aug 2018 19:52:59 +0000 Subject: [PATCH] Fixed build. --- src/lib/jetfix/connection/AsyncReader.cpp | 2 +- src/lib/jetfix/connection/SocketConnection.cpp | 2 +- src/lib/jetfix/gateway/CoreGateway.cpp | 2 +- src/lib/jetfix/gateway/Session.cpp | 2 +- src/lib/orderman/actors/ExecutionGateway.cpp | 2 +- src/lib/orderman/actors/MDSource.h | 2 +- src/lib/orderman/orders/NativeOrder.cpp | 2 +- src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp | 2 +- src/{server/sparkd => lib}/tracing/bts_trace.h | 0 src/{server/sparkd => lib}/tracing/bts_trace_c.c | 0 src/{server/sparkd => lib}/tracing/bts_trace_c.h | 2 +- src/sdk/example/build_example.sh | 4 +++- src/sdk/example/example.cpp | 1 + src/sdk/make_sdk.sh | 1 + src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/bts_trace.cpp | 1 + src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h | 2 +- 17 files changed, 17 insertions(+), 12 deletions(-) rename src/{server/sparkd => lib}/tracing/bts_trace.h (100%) rename src/{server/sparkd => lib}/tracing/bts_trace_c.c (100%) rename src/{server/sparkd => lib}/tracing/bts_trace_c.h (91%) create mode 100644 src/server/sparkd/bts_trace.cpp diff --git a/src/lib/jetfix/connection/AsyncReader.cpp b/src/lib/jetfix/connection/AsyncReader.cpp index b25992ae4..e3c09728b 100644 --- a/src/lib/jetfix/connection/AsyncReader.cpp +++ b/src/lib/jetfix/connection/AsyncReader.cpp @@ -6,7 +6,7 @@ #include "lib/jetfix/gateway/ICoreGatewayEventSink.h" #include "lib/utils/bts_assert.h" #include "lib/os/os.h" -#include "server/sparkd/tracing/bts_trace.h" +#include "lib/tracing/bts_trace.h" #include "lib/orderman/orderman_utils/TickToTradeCorID.h" #include diff --git a/src/lib/jetfix/connection/SocketConnection.cpp b/src/lib/jetfix/connection/SocketConnection.cpp index d833fc73a..167d6ad1c 100644 --- a/src/lib/jetfix/connection/SocketConnection.cpp +++ b/src/lib/jetfix/connection/SocketConnection.cpp @@ -3,7 +3,7 @@ #include "lib/jetfix/store/session_name.h" #include "lib/logging/logging.h" #include "lib/utils/TimeStamp.h" -#include "server/sparkd/tracing/bts_trace.h" +#include "lib/tracing/bts_trace.h" #include "lib/utils/helper_macros.h" #include diff --git a/src/lib/jetfix/gateway/CoreGateway.cpp b/src/lib/jetfix/gateway/CoreGateway.cpp index ba7c32eab..29c6b72a7 100644 --- a/src/lib/jetfix/gateway/CoreGateway.cpp +++ b/src/lib/jetfix/gateway/CoreGateway.cpp @@ -11,7 +11,7 @@ #include "lib/jetfix/gateway/Session.h" #include "lib/jetfix/store/IFIXStore.h" #include "lib/orderman/orderman_utils/orderman_common.h" -#include "server/sparkd/tracing/bts_trace.h" +#include "lib/tracing/bts_trace.h" #include #include diff --git a/src/lib/jetfix/gateway/Session.cpp b/src/lib/jetfix/gateway/Session.cpp index 2f8919375..f1a97b360 100644 --- a/src/lib/jetfix/gateway/Session.cpp +++ b/src/lib/jetfix/gateway/Session.cpp @@ -12,7 +12,7 @@ #include "lib/jetfix/connection/IConnection.h" #include "lib/jetfix/gateway/ICoreGatewayEventSink.h" #include "lib/jetfix/store/IFIXStore.h" -#include "server/sparkd/tracing/bts_trace.h" +#include "lib/tracing/bts_trace.h" #include "lib/config/protos/jetfix.pb.h" diff --git a/src/lib/orderman/actors/ExecutionGateway.cpp b/src/lib/orderman/actors/ExecutionGateway.cpp index 737884f90..502a6a339 100644 --- a/src/lib/orderman/actors/ExecutionGateway.cpp +++ b/src/lib/orderman/actors/ExecutionGateway.cpp @@ -8,7 +8,7 @@ #include "lib/orderman/events/NewExecutionReportEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/orderman_utils/fix_order_codec.h" -#include "server/sparkd/tracing/bts_trace.h" +#include "lib/tracing/bts_trace.h" #include diff --git a/src/lib/orderman/actors/MDSource.h b/src/lib/orderman/actors/MDSource.h index 7a0436080..0f838ebb1 100644 --- a/src/lib/orderman/actors/MDSource.h +++ b/src/lib/orderman/actors/MDSource.h @@ -9,7 +9,7 @@ #include "lib/mercury/mercury_utils/IPollableActor.h" #include "lib/orderman/events/BookUpdateEvent.h" #include "lib/orderman/events/MDRequestEvent.h" -#include "server/sparkd/tracing/bts_trace.h" +#include "lib/tracing/bts_trace.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 317b4e511..6f990a261 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -11,7 +11,7 @@ #include "lib/orderman/orderman_utils/fix_order_codec.h" #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/orderman/securities/ISecurityDB.h" -#include "server/sparkd/tracing/bts_trace.h" +#include "lib/tracing/bts_trace.h" #include "lib/orderman/actors/order_manager/OrderServices.h" diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 9865f1ba5..ee9989a06 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -6,7 +6,7 @@ #include "lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h" -#include "server/sparkd/tracing/bts_trace.h" +#include "lib/tracing/bts_trace.h" #include "lib/utils/helper_macros.h" namespace bts { diff --git a/src/server/sparkd/tracing/bts_trace.h b/src/lib/tracing/bts_trace.h similarity index 100% rename from src/server/sparkd/tracing/bts_trace.h rename to src/lib/tracing/bts_trace.h diff --git a/src/server/sparkd/tracing/bts_trace_c.c b/src/lib/tracing/bts_trace_c.c similarity index 100% rename from src/server/sparkd/tracing/bts_trace_c.c rename to src/lib/tracing/bts_trace_c.c diff --git a/src/server/sparkd/tracing/bts_trace_c.h b/src/lib/tracing/bts_trace_c.h similarity index 91% rename from src/server/sparkd/tracing/bts_trace_c.h rename to src/lib/tracing/bts_trace_c.h index b23bbb26d..0e30ef277 100644 --- a/src/server/sparkd/tracing/bts_trace_c.h +++ b/src/lib/tracing/bts_trace_c.h @@ -2,7 +2,7 @@ #define TRACEPOINT_PROVIDER bts_trace #undef TRACEPOINT_INCLUDE -#define TRACEPOINT_INCLUDE "server/sparkd/tracing/bts_trace_c.h" +#define TRACEPOINT_INCLUDE "lib/tracing/bts_trace_c.h" #if !defined(_BTS_TP_H) || defined(TRACEPOINT_HEADER_MULTI_READ) #define _BTS_TP_H diff --git a/src/sdk/example/build_example.sh b/src/sdk/example/build_example.sh index b5dd70fdd..1f06f8091 100755 --- a/src/sdk/example/build_example.sh +++ b/src/sdk/example/build_example.sh @@ -7,5 +7,7 @@ g++ -isystem ../externals/include \ example.cpp \ -Wl,-rpath,../lib \ -L ../lib \ - -l spark + -l spark \ + -llttng-ust \ + -ldl diff --git a/src/sdk/example/example.cpp b/src/sdk/example/example.cpp index 58c2a8783..335bb63e9 100644 --- a/src/sdk/example/example.cpp +++ b/src/sdk/example/example.cpp @@ -3,6 +3,7 @@ #include "spark/lib/utils/bts_chrono.h" #include "spark/lib/md/MDProducer.h" #include "spark/lib/utils/PBUtils.h" +#include "spark/lib/tracing/bts_trace_c.c" using namespace bts; using namespace bts::md; diff --git a/src/sdk/make_sdk.sh b/src/sdk/make_sdk.sh index 5c04b6e4f..4f7837e76 100755 --- a/src/sdk/make_sdk.sh +++ b/src/sdk/make_sdk.sh @@ -13,6 +13,7 @@ mkdir -p $1/sdk/externals/ # lib headers (cd $2/.. && find lib -type f -name "*.h" -exec cp --parents \{\} $1/sdk/include/spark/ \;) +(cd $2/.. && find lib -type f -name "bts_trace_c.c" -exec cp --parents \{\} $1/sdk/include/spark/ \;) # generated headers (cd $1/src && find lib -type f -name "*.h" -exec cp --parents \{\} $1/sdk/include/spark/ \;) diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index f77356803..90c4bc110 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;main.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;tracing/bts_trace_c.c;user/AdminServiceServer.cpp;user/UserServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file +set(sources bts_trace.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;main.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceServer.cpp;user/UserServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/bts_trace.cpp b/src/server/sparkd/bts_trace.cpp new file mode 100644 index 000000000..786166a1c --- /dev/null +++ b/src/server/sparkd/bts_trace.cpp @@ -0,0 +1 @@ +#include "lib/tracing/bts_trace_c.c" diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h index 467b666ed..5acdc50e6 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h @@ -3,7 +3,7 @@ #include "lib/utils/bts_no_copy.h" #include "lib/md/coconut2.h" #include "CMESecurityIndex.h" -#include "server/sparkd/tracing/bts_trace.h" +#include "lib/tracing/bts_trace.h" #include "onixs.h" #include