gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commented out pthread_setname_np to address portability concern #116

Browse Source
This commit is contained in:
Joseph Henry
2021-05-06 00:38:09 -07:00
parent c4b9518361
commit 0890e2608f
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Controls.cpp
View File

@@ -270,7 +270,7 @@ void* cbRun(void* arg)
{ {
ZTS_UNUSED_ARG(arg); ZTS_UNUSED_ARG(arg);
#if defined(__APPLE__) #if defined(__APPLE__)
pthread_setname_np(ZTS_EVENT_CALLBACK_THREAD_NAME); //pthread_setname_np(ZTS_EVENT_CALLBACK_THREAD_NAME);
#endif #endif
zts_events->run(); zts_events->run();
//#if ZTS_ENABLE_JAVA //#if ZTS_ENABLE_JAVA
@@ -485,7 +485,7 @@ void* _runNodeService(void* arg)
{ {
ZTS_UNUSED_ARG(arg); ZTS_UNUSED_ARG(arg);
#if defined(__APPLE__) #if defined(__APPLE__)
pthread_setname_np(ZTS_SERVICE_THREAD_NAME); //pthread_setname_np(ZTS_SERVICE_THREAD_NAME);
#endif #endif
try { try {
zts_service->run(); zts_service->run();
@@ -526,7 +526,7 @@ int zts_node_start()
if ((res = pthread_create(&cbThread, NULL, cbRun, NULL)) != 0) {} if ((res = pthread_create(&cbThread, NULL, cbRun, NULL)) != 0) {}
#endif #endif
#if defined(__linux__) #if defined(__linux__)
pthread_setname_np(cbThread, ZTS_EVENT_CALLBACK_THREAD_NAME); //pthread_setname_np(cbThread, ZTS_EVENT_CALLBACK_THREAD_NAME);
#endif #endif
if (res != ZTS_ERR_OK) { if (res != ZTS_ERR_OK) {
zts_events->clrState(ZTS_STATE_CALLBACKS_RUNNING); 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) {} if ((res = pthread_create(&service_thread, NULL, _runNodeService, (void*)NULL)) != 0) {}
#endif #endif
#if defined(__linux__) #if defined(__linux__)
pthread_setname_np(service_thread, ZTS_SERVICE_THREAD_NAME); //pthread_setname_np(service_thread, ZTS_SERVICE_THREAD_NAME);
#endif #endif
if (res != ZTS_ERR_OK) { if (res != ZTS_ERR_OK) {
zts_events->clrState(ZTS_STATE_NODE_RUNNING); zts_events->clrState(ZTS_STATE_NODE_RUNNING);

8
src/VirtualTap.cpp
View File

@@ -246,10 +246,10 @@ void VirtualTap::threadMain() throw()
FD_ZERO(&nullfds); FD_ZERO(&nullfds);
int nfds = (int)std::max(_shutdownSignalPipe[0], 0) + 1; int nfds = (int)std::max(_shutdownSignalPipe[0], 0) + 1;
#if defined(__linux__) #if defined(__linux__)
pthread_setname_np(pthread_self(), vtap_full_name); //pthread_setname_np(pthread_self(), vtap_full_name);
#endif #endif
#if defined(__APPLE__) #if defined(__APPLE__)
pthread_setname_np(vtap_full_name); //pthread_setname_np(vtap_full_name);
#endif #endif
while (true) { while (true) {
FD_SET(_shutdownSignalPipe[0], &readfds); 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) static void zts_main_lwip_driver_loop(void* arg)
{ {
#if defined(__linux__) #if defined(__linux__)
pthread_setname_np(pthread_self(), ZTS_LWIP_THREAD_NAME); //pthread_setname_np(pthread_self(), ZTS_LWIP_THREAD_NAME);
#endif #endif
#if defined(__APPLE__) #if defined(__APPLE__)
pthread_setname_np(ZTS_LWIP_THREAD_NAME); //pthread_setname_np(ZTS_LWIP_THREAD_NAME);
#endif #endif
sys_sem_t sem; sys_sem_t sem;
LWIP_UNUSED_ARG(arg); LWIP_UNUSED_ARG(arg);