diff options
| author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2019-02-24 01:41:01 +0000 |
|---|---|---|
| committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2019-02-24 01:41:01 +0000 |
| commit | 642e7c2be8ad6f6b3283fee5c97d185d231b6c37 (patch) | |
| tree | 5cb8fda2912a8637a1dec8095c66388e14362865 /databases/foundationdb/files/patch-fdbserver_worker.actor.cpp | |
| parent | graphics/llpp: Mark as broken and deprecate (diff) | |
Update to 6.0.18, and fix building error @ current.
Diffstat (limited to 'databases/foundationdb/files/patch-fdbserver_worker.actor.cpp')
| -rw-r--r-- | databases/foundationdb/files/patch-fdbserver_worker.actor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/databases/foundationdb/files/patch-fdbserver_worker.actor.cpp b/databases/foundationdb/files/patch-fdbserver_worker.actor.cpp index 7e25dfa8e2b1..3530b30f7824 100644 --- a/databases/foundationdb/files/patch-fdbserver_worker.actor.cpp +++ b/databases/foundationdb/files/patch-fdbserver_worker.actor.cpp @@ -1,4 +1,4 @@ ---- fdbserver/worker.actor.cpp.orig 2018-08-01 01:25:10 UTC +--- fdbserver/worker.actor.cpp.orig 2019-01-09 22:28:32 UTC +++ fdbserver/worker.actor.cpp @@ -39,7 +39,7 @@ #include "fdbclient/ClientWorkerInterface.h" @@ -9,7 +9,7 @@ #ifdef USE_GPERFTOOLS #include "gperftools/profiler.h" #endif -@@ -267,7 +267,7 @@ ACTOR Future<Void> registrationClient( R +@@ -272,7 +272,7 @@ ACTOR Future<Void> registrationClient( Reference<Async } } @@ -18,7 +18,7 @@ //A set of threads that should be profiled std::set<std::thread::id> profiledThreads; -@@ -279,7 +279,7 @@ int filter_in_thread(void *arg) { +@@ -284,7 +284,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()); -@@ -293,7 +293,7 @@ void registerThreadForProfiling() { +@@ -298,7 +298,7 @@ void registerThreadForProfiling() { void updateCpuProfiler(ProfilerRequest req) { switch (req.type) { case ProfilerRequest::Type::GPROF: |