Merge branch 'release-5.0'

fdbbackup/backup.actor.cpp

@@ -23,6 +23,7 @@
 #include "flow/serialize.h"
 #include "flow/IRandom.h"
 #include "flow/genericactors.actor.h"
+#include "flow/SignalSafeUnwind.h"
 
 #include "fdbclient/FDBTypes.h"
 #include "fdbclient/BackupAgent.h"
@@ -1820,6 +1821,7 @@ extern uint8_t *g_extra_memory;
 
 int main(int argc, char* argv[]) {
 	platformInit();
+	initSignalSafeUnwind();
 
 	int	status = FDB_EXIT_SUCCESS;
 

fdbcli/fdbcli.actor.cpp

@@ -30,6 +30,7 @@
 #include "fdbclient/FDBOptions.g.h"
 
 #include "flow/DeterministicRandom.h"
+#include "flow/SignalSafeUnwind.h"
 #include "fdbrpc/TLSConnection.h"
 #include "fdbrpc/Platform.h"
 
@@ -2861,6 +2862,7 @@ ACTOR Future<Void> timeExit(double duration) {
 
 int main(int argc, char **argv) {
 	platformInit();
+	initSignalSafeUnwind();
 	Error::init();
 
 	registerCrashHandler();

flow/SignalSafeUnwind.cpp

@@ -76,7 +76,11 @@ extern "C" int dl_iterate_phdr(
     } else {
         // This path is NOT async signal safe, and serves until and unless initSignalSafeUnwind() is called
         initChain();
-        return chain_dl_iterate_phdr(callback, data);
+
+		setProfilingEnabled(0);
+        int result = chain_dl_iterate_phdr(callback, data);
+		setProfilingEnabled(1);
+		return result;
     }
 }