From 5f0593e970ce542847deaabd7179b6e816f83169 Mon Sep 17 00:00:00 2001 From: "Vanilla I. Shu" Date: Fri, 12 Apr 2019 13:04:58 +0000 Subject: 1: Update to 6.1.1. 2: fix building with boost 1.70. 3: remove BROKEN. --- databases/foundationdb/files/patch-fdbserver_worker.actor.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'databases/foundationdb/files/patch-fdbserver_worker.actor.cpp') diff --git a/databases/foundationdb/files/patch-fdbserver_worker.actor.cpp b/databases/foundationdb/files/patch-fdbserver_worker.actor.cpp index 3530b30f7824..aa1d330917de 100644 --- a/databases/foundationdb/files/patch-fdbserver_worker.actor.cpp +++ b/databases/foundationdb/files/patch-fdbserver_worker.actor.cpp @@ -1,6 +1,6 @@ ---- fdbserver/worker.actor.cpp.orig 2019-01-09 22:28:32 UTC +--- fdbserver/worker.actor.cpp.orig 2019-04-09 00:11:05 UTC +++ fdbserver/worker.actor.cpp -@@ -39,7 +39,7 @@ +@@ -41,7 +41,7 @@ #include "fdbclient/ClientWorkerInterface.h" #include "flow/Profiler.h" @@ -9,7 +9,7 @@ #ifdef USE_GPERFTOOLS #include "gperftools/profiler.h" #endif -@@ -272,7 +272,7 @@ ACTOR Future registrationClient( Reference registrationClient( } } @@ -18,7 +18,7 @@ //A set of threads that should be profiled std::set profiledThreads; -@@ -284,7 +284,7 @@ int filter_in_thread(void *arg) { +@@ -385,7 +385,7 @@ int filter_in_thread(void *arg) { //Enables the calling thread to be profiled void registerThreadForProfiling() { @@ -27,7 +27,7 @@ //Not sure if this is actually needed, but a call to backtrace was advised here: //http://groups.google.com/group/google-perftools/browse_thread/thread/0dfd74532e038eb8/2686d9f24ac4365f?pli=1 profiledThreads.insert(std::this_thread::get_id()); -@@ -298,7 +298,7 @@ void registerThreadForProfiling() { +@@ -399,7 +399,7 @@ void registerThreadForProfiling() { void updateCpuProfiler(ProfilerRequest req) { switch (req.type) { case ProfilerRequest::Type::GPROF: -- cgit v1.2.3