]> git.hungrycats.org Git - bees/commitdiff
process: replace crucible::gettid() with a weak symbol
authorZygo Blaxell <bees@furryterror.org>
Thu, 9 Jan 2025 06:22:49 +0000 (01:22 -0500)
committerZygo Blaxell <bees@furryterror.org>
Thu, 9 Jan 2025 06:37:44 +0000 (01:37 -0500)
Since we're now using weak symbols for dodgy libc functions, we might
as well do it for gettid() too.

Use the ::gettid() global namespace and let libc override it.

Signed-off-by: Zygo Blaxell <bees@furryterror.org>
include/crucible/lockset.h
include/crucible/process.h
lib/chatter.cc
lib/process.cc
src/bees-trace.cc

index 6b53cf48a0bb98c3ef2f745f5e01a99ea22ab653..98a107dd09e6599ee852c04828f3585f4507bfab 100644 (file)
@@ -117,7 +117,7 @@ namespace crucible {
                while (full() || locked(name)) {
                        m_condvar.wait(lock);
                }
-               auto rv = m_set.insert(make_pair(name, crucible::gettid()));
+               auto rv = m_set.insert(make_pair(name, gettid()));
                THROW_CHECK0(runtime_error, rv.second);
        }
 
@@ -129,7 +129,7 @@ namespace crucible {
                if (full() || locked(name)) {
                        return false;
                }
-               auto rv = m_set.insert(make_pair(name, crucible::gettid()));
+               auto rv = m_set.insert(make_pair(name, gettid()));
                THROW_CHECK1(runtime_error, name, rv.second);
                return true;
        }
index 52549b25d40cc994c41ff792f7909c0025ec0748..845ab277dd0c58ca8cc8b0a30444b9622e3686c9 100644 (file)
 #include <sys/wait.h>
 #include <unistd.h>
 
+extern "C" {
+       pid_t gettid() throw();
+};
+
 namespace crucible {
        using namespace std;
 
@@ -73,7 +77,6 @@ namespace crucible {
 
        typedef ResourceHandle<Process::id, Process> Pid;
 
-       pid_t gettid();
        double getloadavg1();
        double getloadavg5();
        double getloadavg15();
index efa17afb74d02342316def290dd95d8fb12ef61f..56cee513bd4307e9004f84292c24e6d11536f545 100644 (file)
@@ -76,7 +76,7 @@ namespace crucible {
                        DIE_IF_ZERO(strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &ltm));
 
                        header_stream << buf;
-                       header_stream << " " << getpid() << "." << crucible::gettid();
+                       header_stream << " " << getpid() << "." << gettid();
                        if (add_prefix_level) {
                                header_stream << "<" << m_loglevel << ">";
                        }
@@ -88,7 +88,7 @@ namespace crucible {
                                header_stream << "<" << m_loglevel << ">";
                        }
                        header_stream << (m_name.empty() ? "thread" : m_name);
-                       header_stream << "[" << crucible::gettid() << "]";
+                       header_stream << "[" << gettid() << "]";
                }
 
                header_stream << ": ";
index b838cddc005b4db1c60f47dc24cd996a9eb3b414..808073eee6033ee26f80ad2348320497a7d8562c 100644 (file)
@@ -7,13 +7,18 @@
 #include <cstdlib>
 #include <utility>
 
-// for gettid()
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
 #include <unistd.h>
 #include <sys/syscall.h>
 
+extern "C" {
+       pid_t
+       __attribute__((weak))
+       gettid() throw()
+       {
+               return syscall(SYS_gettid);
+       }
+};
+
 namespace crucible {
        using namespace std;
 
@@ -111,12 +116,6 @@ namespace crucible {
                }
        }
 
-       pid_t
-       gettid()
-       {
-               return syscall(SYS_gettid);
-       }
-
        double
        getloadavg1()
        {
index d04d4c1b59cf44ffe3e061526cb06aae8998ca6d..5e585323e2a25e2b4560c0c93caa8e58f6947da9 100644 (file)
@@ -91,9 +91,9 @@ BeesNote::~BeesNote()
        tl_next = m_prev;
        unique_lock<mutex> lock(s_mutex);
        if (tl_next) {
-               s_status[crucible::gettid()] = tl_next;
+               s_status[gettid()] = tl_next;
        } else {
-               s_status.erase(crucible::gettid());
+               s_status.erase(gettid());
        }
 }
 
@@ -104,7 +104,7 @@ BeesNote::BeesNote(function<void(ostream &os)> f) :
        m_prev = tl_next;
        tl_next = this;
        unique_lock<mutex> lock(s_mutex);
-       s_status[crucible::gettid()] = tl_next;
+       s_status[gettid()] = tl_next;
 }
 
 void