From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Wed, 16 Aug 2023 09:18:58 +0000 (+0200)
Subject: Meson: Cleanup pthread-setname module
X-Git-Tag: rec-5.1.0-alpha1~80^2~222
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c095ef2d910f7c1cf7927e709a1b126a3d027185;p=thirdparty%2Fpdns.git

Meson: Cleanup pthread-setname module
---

diff --git a/meson/pthread-setname/meson.build b/meson/pthread-setname/meson.build
index a139d92bc5..8d3827fe21 100644
--- a/meson/pthread-setname/meson.build
+++ b/meson/pthread-setname/meson.build
@@ -1,33 +1,33 @@
-# Pthread setname madness
-# Inputs: conf
-
-pthread_np_prefix = '''
-#include <pthread.h>
-#if HAVE_PTHREAD_NP_H
-#  include <pthread_np.h>
-#endif
-'''
-
 variants = [
   [
-    '2-arg pthread_setname_np', 'HAVE_PTHREAD_SETNAME_NP_2', 'pthread_setname_np takes 2 arguments (Linux/glibc, QNX, IBM)',
-    '''int main() { pthread_setname_np(pthread_self(), "foo"); return 0; }''',
+    '2-arg pthread_setname_np',
+    'HAVE_PTHREAD_SETNAME_NP_2',
+    'pthread_setname_np takes 2 arguments (Linux/glibc, QNX, IBM)',
+    fs.read('pthread_setname_np_2args.cc'),
   ],
   [
-    '2-arg pthread_set_name_np', 'HAVE_PTHREAD_SET_NAME_NP_2', 'pthread_set_name_np takes 2 arguments and does not return void (FreeBSD, OpenBSD)',
-    '''int main() { return pthread_set_name_np(pthread_self(), "foo"); }''',
+    '2-arg pthread_set_name_np',
+    'HAVE_PTHREAD_SET_NAME_NP_2',
+    'pthread_set_name_np takes 2 arguments and does not return void (FreeBSD, OpenBSD)',
+    fs.read('pthread_set_name_np_2args.cc'),
   ],
   [
-    '2-arg void pthread_set_name_np', 'HAVE_PTHREAD_SET_NAME_NP_2_VOID', 'pthread_set_name_np takes 2 arguments and returns void (FreeBSD, OpenBSD)',
-    '''int main() { pthread_set_name_np(pthread_self(), "foo"); return 0; }''',
+    '2-arg void pthread_set_name_np',
+    'HAVE_PTHREAD_SET_NAME_NP_2_VOID',
+    'pthread_set_name_np takes 2 arguments and returns void (FreeBSD, OpenBSD)',
+    fs.read('pthread_set_name_np_void_2args.cc'),
   ],
   [
-    '1-arg pthread_setname_np', 'HAVE_PTHREAD_SETNAME_NP_1', 'pthread_setname_np takes 1 argument (Darwin, MacOS)',
-    '''int main() { return pthread_setname_np("foo"); }''',
+    '1-arg pthread_setname_np',
+    'HAVE_PTHREAD_SETNAME_NP_1',
+    'pthread_setname_np takes 1 argument (Darwin, MacOS)',
+    fs.read('pthread_setname_np_1arg.cc'),
   ],
   [
-    '3-arg pthread_setname_np', 'HAVE_PTHREAD_SETNAME_NP_3', 'pthread_setname_np takes 3 arguments (NetBSD)',
-    '''int main() { return pthread_setname_np(pthread_self(), "foo", NULL); }''',
+    '3-arg pthread_setname_np',
+    'HAVE_PTHREAD_SETNAME_NP_3',
+    'pthread_setname_np takes 3 arguments (NetBSD)',
+    fs.read('pthread_setname_np_3args.cc'),
   ],
 ]
 
@@ -38,10 +38,11 @@ foreach variant: variants
   variant_description = variant[2]
   variant_program = variant[3]
 
-  if cxx.links(pthread_np_prefix + variant_program, name: variant_name)
+  if cxx.links(variant_program, name: variant_name, args: have_pthread_np_h ? ['-DHAVE_PTHREAD_NP_H'] : [])
     found = true
-    conf.set10(variant_define, true, description: variant_description)
-    summary('pthread_setname', variant_define + ' - ' + variant_description, section: 'System')
+    conf.set(variant_define, true, description: variant_description)
+    summary('pthread_setname Variant', variant_define, section: 'POSIX Threads')
+    summary('Description', variant_description, section: 'POSIX Threads')
     break
   endif
 endforeach
diff --git a/meson/pthread-setname/pthread_set_name_np_2args.cc b/meson/pthread-setname/pthread_set_name_np_2args.cc
new file mode 100644
index 0000000000..e0280244dc
--- /dev/null
+++ b/meson/pthread-setname/pthread_set_name_np_2args.cc
@@ -0,0 +1,9 @@
+#include <pthread.h>
+#if HAVE_PTHREAD_NP_H
+#include <pthread_np.h>
+#endif
+
+int main()
+{
+  return pthread_set_name_np(pthread_self(), "foo");
+}
diff --git a/meson/pthread-setname/pthread_set_name_np_void_2args.cc b/meson/pthread-setname/pthread_set_name_np_void_2args.cc
new file mode 100644
index 0000000000..8aa1bff884
--- /dev/null
+++ b/meson/pthread-setname/pthread_set_name_np_void_2args.cc
@@ -0,0 +1,9 @@
+#include <pthread.h>
+#if HAVE_PTHREAD_NP_H
+#include <pthread_np.h>
+#endif
+
+int main() {
+  pthread_set_name_np(pthread_self(), "foo");
+  return 0;
+}
diff --git a/meson/pthread-setname/pthread_setname_np_1arg.cc b/meson/pthread-setname/pthread_setname_np_1arg.cc
new file mode 100644
index 0000000000..05d9206460
--- /dev/null
+++ b/meson/pthread-setname/pthread_setname_np_1arg.cc
@@ -0,0 +1,8 @@
+#include <pthread.h>
+#if HAVE_PTHREAD_NP_H
+#include <pthread_np.h>
+#endif
+
+int main() {
+  return pthread_setname_np("foo");
+}
diff --git a/meson/pthread-setname/pthread_setname_np_2args.cc b/meson/pthread-setname/pthread_setname_np_2args.cc
new file mode 100644
index 0000000000..366e44a515
--- /dev/null
+++ b/meson/pthread-setname/pthread_setname_np_2args.cc
@@ -0,0 +1,10 @@
+#include <pthread.h>
+#if HAVE_PTHREAD_NP_H
+#include <pthread_np.h>
+#endif
+
+int main()
+{
+  pthread_setname_np(pthread_self(), "foo");
+  return 0;
+}
diff --git a/meson/pthread-setname/pthread_setname_np_3args.cc b/meson/pthread-setname/pthread_setname_np_3args.cc
new file mode 100644
index 0000000000..9988d9a60a
--- /dev/null
+++ b/meson/pthread-setname/pthread_setname_np_3args.cc
@@ -0,0 +1,8 @@
+#include <pthread.h>
+#if HAVE_PTHREAD_NP_H
+#include <pthread_np.h>
+#endif
+
+int main() {
+  return pthread_setname_np(pthread_self(), "foo", NULL);
+}