Commit ebc9fd5d authored by DEPRECATED (Jonathan Mace) (Use @JonathanMace instead)'s avatar DEPRECATED (Jonathan Mace) (Use @JonathanMace instead)
Browse files

Do protocol buffers generation during make, to resolve some of the versioning problems

parent eddc52e3
......@@ -12,15 +12,17 @@ find_package(Threads REQUIRED)
find_package(Boost COMPONENTS system filesystem REQUIRED)
find_package(Protobuf REQUIRED)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS proto/xtrace.proto)
add_library (libxtrace SHARED
src/atomlayer.cpp
src/thread_local_baggage.cpp
src/pubsub.cpp
src/xtrace.cpp
src/xtrace.pb.cc
src/xtrace_baggage.cpp
src/lexvarint.cpp
${PROTO_SRCS}
)
set_target_properties(libxtrace
PROPERTIES
......
//package pubsub;
syntax = 'proto2';
option java_package = "edu.brown.cs.systems.xtrace";
option java_outer_classname = "Reporting";
......
......@@ -22,9 +22,12 @@ void printvector(std::vector<uint8_t> bytes) {
}
int main(int argc, char *argv[]) {
std::cout << XTrace::IsTracing() << std::endl;
XTRACE("a");
XTrace::StartTrace("main.cc");
std::cout << XTrace::IsTracing() << std::endl;
std::map<std::string, std::string> mymap = {{"key1", "value1"}, {"key2", "value2"}};
......@@ -65,7 +68,7 @@ int main(int argc, char *argv[]) {
branched_thread.join();
branched_thread2.join();
JOIN_CURRENT_BAGGAGE(branched_baggage);
JOIN_CURRENT_BAGGAGE(branched_baggage2);
JOIN_CURRENT_BAGGAGE(inline_branched_baggage);
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment