From 30c77497df874f150ce1bf949e8ff456343ab68d Mon Sep 17 00:00:00 2001 From: Chris Simons Date: Mon, 4 May 2020 23:21:03 -0700 Subject: [PATCH 1/2] Fix TIS/TSM in logs Silences the "is calling TIS/TSM in non-main thread environment" messages in the log when running a MacOS server as it is a red herring that causes a lot of issues to be filed. --- src/cmd/barriers/barriers.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/cmd/barriers/barriers.cpp b/src/cmd/barriers/barriers.cpp index cd67bcbe..3de577cf 100644 --- a/src/cmd/barriers/barriers.cpp +++ b/src/cmd/barriers/barriers.cpp @@ -38,6 +38,13 @@ main(int argc, char** argv) // record window instance for tray icon, etc ArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL)); #endif + +#ifdef __APPLE__ + /* Silence "is calling TIS/TSM in non-main thread environment" as it is a red + herring that causes a lot of issues to be filed for the MacOS client/server. + */ + setenv("OS_ACTIVITY_DT_MODE", "NO", true); +#endif Arch arch; arch.init(); From 7a2b38ad56cdcfda5904d40694767fbc17b85f06 Mon Sep 17 00:00:00 2001 From: Chris Simons Date: Thu, 7 May 2020 16:56:42 -0700 Subject: [PATCH 2/2] replace tabs with spaces --- src/cmd/barriers/barriers.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cmd/barriers/barriers.cpp b/src/cmd/barriers/barriers.cpp index 3de577cf..21c4d80b 100644 --- a/src/cmd/barriers/barriers.cpp +++ b/src/cmd/barriers/barriers.cpp @@ -40,10 +40,10 @@ main(int argc, char** argv) #endif #ifdef __APPLE__ - /* Silence "is calling TIS/TSM in non-main thread environment" as it is a red - herring that causes a lot of issues to be filed for the MacOS client/server. - */ - setenv("OS_ACTIVITY_DT_MODE", "NO", true); + /* Silence "is calling TIS/TSM in non-main thread environment" as it is a red + herring that causes a lot of issues to be filed for the MacOS client/server. + */ + setenv("OS_ACTIVITY_DT_MODE", "NO", true); #endif Arch arch;