From 0890e2608f2cf286fdf65fd1ad5171e5994d44c1 Mon Sep 17 00:00:00 2001
From: Joseph Henry <joseph.henry@zerotier.com>
Date: Thu, 6 May 2021 00:38:09 -0700
Subject: [PATCH] Commented out pthread_setname_np to address portability
 concern #116

---
 src/Controls.cpp   | 8 ++++----
 src/VirtualTap.cpp | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Controls.cpp b/src/Controls.cpp
index f0329d1..65340aa 100644
--- a/src/Controls.cpp
+++ b/src/Controls.cpp
@@ -270,7 +270,7 @@ void* cbRun(void* arg)
 {
     ZTS_UNUSED_ARG(arg);
 #if defined(__APPLE__)
-    pthread_setname_np(ZTS_EVENT_CALLBACK_THREAD_NAME);
+    //pthread_setname_np(ZTS_EVENT_CALLBACK_THREAD_NAME);
 #endif
     zts_events->run();
     //#if ZTS_ENABLE_JAVA
@@ -485,7 +485,7 @@ void* _runNodeService(void* arg)
 {
     ZTS_UNUSED_ARG(arg);
 #if defined(__APPLE__)
-    pthread_setname_np(ZTS_SERVICE_THREAD_NAME);
+    //pthread_setname_np(ZTS_SERVICE_THREAD_NAME);
 #endif
     try {
         zts_service->run();
@@ -526,7 +526,7 @@ int zts_node_start()
         if ((res = pthread_create(&cbThread, NULL, cbRun, NULL)) != 0) {}
 #endif
 #if defined(__linux__)
-        pthread_setname_np(cbThread, ZTS_EVENT_CALLBACK_THREAD_NAME);
+        //pthread_setname_np(cbThread, ZTS_EVENT_CALLBACK_THREAD_NAME);
 #endif
         if (res != ZTS_ERR_OK) {
             zts_events->clrState(ZTS_STATE_CALLBACKS_RUNNING);
@@ -544,7 +544,7 @@ int zts_node_start()
     if ((res = pthread_create(&service_thread, NULL, _runNodeService, (void*)NULL)) != 0) {}
 #endif
 #if defined(__linux__)
-    pthread_setname_np(service_thread, ZTS_SERVICE_THREAD_NAME);
+    //pthread_setname_np(service_thread, ZTS_SERVICE_THREAD_NAME);
 #endif
     if (res != ZTS_ERR_OK) {
         zts_events->clrState(ZTS_STATE_NODE_RUNNING);
diff --git a/src/VirtualTap.cpp b/src/VirtualTap.cpp
index 7c355ea..ba4c8d8 100644
--- a/src/VirtualTap.cpp
+++ b/src/VirtualTap.cpp
@@ -246,10 +246,10 @@ void VirtualTap::threadMain() throw()
     FD_ZERO(&nullfds);
     int nfds = (int)std::max(_shutdownSignalPipe[0], 0) + 1;
 #if defined(__linux__)
-    pthread_setname_np(pthread_self(), vtap_full_name);
+    //pthread_setname_np(pthread_self(), vtap_full_name);
 #endif
 #if defined(__APPLE__)
-    pthread_setname_np(vtap_full_name);
+    //pthread_setname_np(vtap_full_name);
 #endif
     while (true) {
         FD_SET(_shutdownSignalPipe[0], &readfds);
@@ -295,10 +295,10 @@ static void zts_tcpip_init_done(void* arg)
 static void zts_main_lwip_driver_loop(void* arg)
 {
 #if defined(__linux__)
-    pthread_setname_np(pthread_self(), ZTS_LWIP_THREAD_NAME);
+    //pthread_setname_np(pthread_self(), ZTS_LWIP_THREAD_NAME);
 #endif
 #if defined(__APPLE__)
-    pthread_setname_np(ZTS_LWIP_THREAD_NAME);
+    //pthread_setname_np(ZTS_LWIP_THREAD_NAME);
 #endif
     sys_sem_t sem;
     LWIP_UNUSED_ARG(arg);