This is an automated email from the ASF dual-hosted git repository.
wkaras pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 0e9b5dd1f1 Remove POSIX_THREAD constants and fix unmigrated
HAVE_PTHREAD_MUTEXATTR_SETTYPE (#10867)
0e9b5dd1f1 is described below
commit 0e9b5dd1f15d5c393c3fc6d3e8b1e2e418eb6409
Author: Phong Nguyen <[email protected]>
AuthorDate: Wed Jan 10 09:14:56 2024 -0800
Remove POSIX_THREAD constants and fix unmigrated
HAVE_PTHREAD_MUTEXATTR_SETTYPE (#10867)
* Remove POSIX_THREAD define
* Clean up feature flags
* Remove long-disabled PTHREAD_PROCESS_SHARED setting
---
CMakeLists.txt | 2 ++
include/tscore/ink_config.h.cmake.in | 1 +
include/tscore/ink_defs.h | 3 ---
include/tscore/ink_queue.h | 7 -------
include/tscore/ink_thread.h | 10 ----------
src/tscore/ink_mutex.cc | 4 ----
6 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1608d2290d..6e1790ef6c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -401,6 +401,8 @@ check_symbol_exists(sendmmsg sys/socket.h HAVE_SENDMMSG)
check_symbol_exists(strlcat string.h HAVE_STRLCAT)
check_symbol_exists(strlcpy string.h HAVE_STRLCPY)
check_symbol_exists(strsignal string.h HAVE_STRSIGNAL)
+check_symbol_exists(pthread_mutexattr_settype pthread.h
HAVE_PTHREAD_MUTEXATTR_SETTYPE)
+
if(TS_USE_HWLOC)
check_source_compiles(
C "#include <hwloc.h>
diff --git a/include/tscore/ink_config.h.cmake.in
b/include/tscore/ink_config.h.cmake.in
index 45efd60d00..6f7a065685 100644
--- a/include/tscore/ink_config.h.cmake.in
+++ b/include/tscore/ink_config.h.cmake.in
@@ -96,6 +96,7 @@
#cmakedefine01 HAVE_STRLCAT
#cmakedefine01 HAVE_STRLCPY
#cmakedefine01 HAVE_STRSIGNAL
+#cmakedefine01 HAVE_PTHREAD_MUTEXATTR_SETTYPE
#cmakedefine01 HAVE_HWLOC_OBJ_PU
diff --git a/include/tscore/ink_defs.h b/include/tscore/ink_defs.h
index b53641090c..7adc4f0afc 100644
--- a/include/tscore/ink_defs.h
+++ b/include/tscore/ink_defs.h
@@ -38,9 +38,6 @@
#define INT32_MIN (-2147483647 - 1)
#endif
-#define POSIX_THREAD
-#define POSIX_THREAD_10031c
-
#ifndef ETIME
#ifdef ETIMEDOUT
#define ETIME ETIMEDOUT
diff --git a/include/tscore/ink_queue.h b/include/tscore/ink_queue.h
index 647b0a1d5c..3b4b9ce204 100644
--- a/include/tscore/ink_queue.h
+++ b/include/tscore/ink_queue.h
@@ -49,13 +49,6 @@
the pointer was required by the standard.
*/
-/*
-#if defined(POSIX_THREAD)
-#include <pthread.h>
-#include <stdlib.h>
-#endif
-*/
-
void ink_queue_load_64(void *dst, void *src);
#ifdef __x86_64__
diff --git a/include/tscore/ink_thread.h b/include/tscore/ink_thread.h
index b4a9f45a24..e2beb4d147 100644
--- a/include/tscore/ink_thread.h
+++ b/include/tscore/ink_thread.h
@@ -38,7 +38,6 @@
//
//////////////////////////////////////////////////////////////////////////////
-#if defined(POSIX_THREAD)
#include <pthread.h>
#include <csignal>
#include <semaphore.h>
@@ -83,17 +82,11 @@ struct ink_semaphore {
}
};
-#endif /* #if defined(POSIX_THREAD) */
-
/*******************************************************************
*** Condition variables
******************************************************************/
-#ifdef POSIX_THREAD_10031c
using ink_timestruc = struct timespec;
-#else
-typedef timestruc_t ink_timestruc;
-#endif
#include <cerrno>
#include "tscore/ink_mutex.h"
@@ -104,7 +97,6 @@ typedef timestruc_t ink_timestruc;
// The POSIX threads interface
//
//////////////////////////////////////////////////////////////////////////////
-#if defined(POSIX_THREAD)
// NOTE(cmcfarlen): removed posix thread local key functions, use thread_local
@@ -306,5 +298,3 @@ ink_get_thread_name(char *name, size_t len)
snprintf(name, len, "0x%" PRIx64, (uint64_t)ink_thread_self());
#endif
}
-
-#endif /* #if defined(POSIX_THREAD) */
diff --git a/src/tscore/ink_mutex.cc b/src/tscore/ink_mutex.cc
index ccbc0666bc..1f8dd3f5a6 100644
--- a/src/tscore/ink_mutex.cc
+++ b/src/tscore/ink_mutex.cc
@@ -35,10 +35,6 @@ public:
x_pthread_mutexattr_t()
{
pthread_mutexattr_init(&attr);
-#ifndef POSIX_THREAD_10031c
- pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED);
-#endif
-
#if DEBUG && HAVE_PTHREAD_MUTEXATTR_SETTYPE
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
#endif
