646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
185 lines
7.0 KiB
Diff
185 lines
7.0 KiB
Diff
From effdf4d0f3a3d2332ec2a61eefe076ff37964594 Mon Sep 17 00:00:00 2001
|
|
From: Randy Eckenrode <randy@largeandhighquality.com>
|
|
Date: Wed, 13 Nov 2024 13:53:14 -0500
|
|
Subject: [PATCH 05/18] Use std::atomics and std::mutex for portability
|
|
|
|
---
|
|
src/ld/InputFiles.cpp | 15 +++++++--------
|
|
src/ld/InputFiles.h | 9 +++++----
|
|
src/ld/OutputFile.cpp | 13 +++++++------
|
|
src/ld/ld.cpp | 11 +++++------
|
|
4 files changed, 24 insertions(+), 24 deletions(-)
|
|
|
|
diff --git a/src/ld/InputFiles.cpp b/src/ld/InputFiles.cpp
|
|
index 4d49ba3..e045e90 100644
|
|
--- a/src/ld/InputFiles.cpp
|
|
+++ b/src/ld/InputFiles.cpp
|
|
@@ -42,12 +42,11 @@
|
|
#include <mach-o/dyld.h>
|
|
#include <mach-o/fat.h>
|
|
#include <sys/sysctl.h>
|
|
-#include <libkern/OSAtomic.h>
|
|
#if HAVE_LIBDISPATCH
|
|
#include <dispatch/dispatch.h>
|
|
#endif
|
|
|
|
-#include <string>
|
|
+#include <atomic>
|
|
#include <map>
|
|
#include <set>
|
|
#include <string>
|
|
@@ -387,16 +386,16 @@ ld::File* InputFiles::makeFile(const Options::FileInfo& info, bool indirectDylib
|
|
|
|
ld::relocatable::File* objResult = mach_o::relocatable::parse(p, len, info.path, info.modTime, info.ordinal, objOpts);
|
|
if ( objResult != NULL ) {
|
|
- OSAtomicAdd64(len, &_totalObjectSize);
|
|
- OSAtomicIncrement32(&_totalObjectLoaded);
|
|
+ _totalObjectSize += len;
|
|
+ ++_totalObjectLoaded;
|
|
return objResult;
|
|
}
|
|
|
|
// see if it is an llvm object file
|
|
objResult = lto::parse(p, len, info.path, info.modTime, info.ordinal, _options.architecture(), _options.subArchitecture(), _options.logAllFiles(), _options.verboseOptimizationHints());
|
|
if ( objResult != NULL ) {
|
|
- OSAtomicAdd64(len, &_totalObjectSize);
|
|
- OSAtomicIncrement32(&_totalObjectLoaded);
|
|
+ _totalObjectSize += len;
|
|
+ ++_totalObjectLoaded;
|
|
return objResult;
|
|
}
|
|
|
|
@@ -444,8 +443,8 @@ ld::File* InputFiles::makeFile(const Options::FileInfo& info, bool indirectDylib
|
|
ld::archive::File* archiveResult = ::archive::parse(p, len, info.path, info.modTime, info.ordinal, archOpts);
|
|
if ( archiveResult != NULL ) {
|
|
|
|
- OSAtomicAdd64(len, &_totalArchiveSize);
|
|
- OSAtomicIncrement32(&_totalArchivesLoaded);
|
|
+ _totalArchiveSize += len;
|
|
+ ++_totalArchivesLoaded;
|
|
return archiveResult;
|
|
}
|
|
|
|
diff --git a/src/ld/InputFiles.h b/src/ld/InputFiles.h
|
|
index c18ccf8..40353fa 100644
|
|
--- a/src/ld/InputFiles.h
|
|
+++ b/src/ld/InputFiles.h
|
|
@@ -46,6 +46,7 @@
|
|
#include <pthread.h>
|
|
#endif
|
|
|
|
+#include <atomic>
|
|
#include <vector>
|
|
|
|
#include "Options.h"
|
|
@@ -78,10 +79,10 @@ public:
|
|
size_t count() const { return _inputFiles.size(); }
|
|
|
|
// for -print_statistics
|
|
- volatile int64_t _totalObjectSize;
|
|
- volatile int64_t _totalArchiveSize;
|
|
- volatile int32_t _totalObjectLoaded;
|
|
- volatile int32_t _totalArchivesLoaded;
|
|
+ std::atomic<int64_t> _totalObjectSize;
|
|
+ std::atomic<int64_t> _totalArchiveSize;
|
|
+ std::atomic<int32_t> _totalObjectLoaded;
|
|
+ std::atomic<int32_t> _totalArchivesLoaded;
|
|
int32_t _totalDylibsLoaded;
|
|
|
|
|
|
diff --git a/src/ld/OutputFile.cpp b/src/ld/OutputFile.cpp
|
|
index 487b338..2a175a7 100644
|
|
--- a/src/ld/OutputFile.cpp
|
|
+++ b/src/ld/OutputFile.cpp
|
|
@@ -47,7 +47,8 @@
|
|
extern "C" {
|
|
#include <corecrypto/ccsha2.h>
|
|
}
|
|
-#include <string>
|
|
+
|
|
+#include <mutex>
|
|
#include <string>
|
|
#include <list>
|
|
#include <algorithm>
|
|
@@ -1315,7 +1316,7 @@ void OutputFile::rangeCheckRISCVBranch20(int64_t displacement, ld::Internal& sta
|
|
|
|
|
|
#if SUPPORT_ARCH_arm64e
|
|
-static os_lock_unfair_s sAuthenticatedFixupDataLock = OS_LOCK_UNFAIR_INIT; // to serialize building of _authenticatedFixupData
|
|
+static std::mutex sAuthenticatedFixupDataLock; // to serialize building of _authenticatedFixupData
|
|
#endif
|
|
|
|
void OutputFile::applyFixUps(ld::Internal& state, uint64_t mhAddress, const ld::Atom* atom, uint8_t* buffer)
|
|
@@ -1690,11 +1691,11 @@ void OutputFile::applyFixUps(ld::Internal& state, uint64_t mhAddress, const ld::
|
|
}
|
|
else {
|
|
auto fixupOffset = (uintptr_t)(fixUpLocation - mhAddress);
|
|
- os_lock_lock(&sAuthenticatedFixupDataLock);
|
|
+ sAuthenticatedFixupDataLock.lock();
|
|
assert(_authenticatedFixupData.find(fixupOffset) == _authenticatedFixupData.end());
|
|
auto authneticatedData = std::make_pair(authData, accumulator);
|
|
_authenticatedFixupData[fixupOffset] = authneticatedData;
|
|
- os_lock_unlock(&sAuthenticatedFixupDataLock);
|
|
+ sAuthenticatedFixupDataLock.unlock();
|
|
// Zero out this entry which we will expect later.
|
|
set64LE(fixUpLocation, 0);
|
|
}
|
|
@@ -1721,11 +1722,11 @@ void OutputFile::applyFixUps(ld::Internal& state, uint64_t mhAddress, const ld::
|
|
}
|
|
else {
|
|
auto fixupOffset = (uintptr_t)(fixUpLocation - mhAddress);
|
|
- os_lock_lock(&sAuthenticatedFixupDataLock);
|
|
+ sAuthenticatedFixupDataLock.lock();
|
|
assert(_authenticatedFixupData.find(fixupOffset) == _authenticatedFixupData.end());
|
|
auto authneticatedData = std::make_pair(authData, accumulator);
|
|
_authenticatedFixupData[fixupOffset] = authneticatedData;
|
|
- os_lock_unlock(&sAuthenticatedFixupDataLock);
|
|
+ sAuthenticatedFixupDataLock.unlock();
|
|
// Zero out this entry which we will expect later.
|
|
set64LE(fixUpLocation, 0);
|
|
}
|
|
diff --git a/src/ld/ld.cpp b/src/ld/ld.cpp
|
|
index b532c9a..8608ea5 100644
|
|
--- a/src/ld/ld.cpp
|
|
+++ b/src/ld/ld.cpp
|
|
@@ -47,9 +47,8 @@ extern "C" double log2 ( double );
|
|
#include <mach-o/dyld.h>
|
|
#include <dlfcn.h>
|
|
#include <AvailabilityMacros.h>
|
|
-#include <os/lock_private.h>
|
|
|
|
-#include <string>
|
|
+#include <mutex>
|
|
#include <map>
|
|
#include <set>
|
|
#include <string>
|
|
@@ -1539,8 +1538,8 @@ int main(int argc, const char* argv[])
|
|
statistics.vmEnd.faults-statistics.vmStart.faults);
|
|
fprintf(stderr, "memory active: %lu, wired: %lu\n", statistics.vmEnd.active_count * vm_page_size, statistics.vmEnd.wire_count * vm_page_size);
|
|
char temp[40];
|
|
- fprintf(stderr, "processed %3u object files, totaling %15s bytes\n", inputFiles._totalObjectLoaded, commatize(inputFiles._totalObjectSize, temp));
|
|
- fprintf(stderr, "processed %3u archive files, totaling %15s bytes\n", inputFiles._totalArchivesLoaded, commatize(inputFiles._totalArchiveSize, temp));
|
|
+ fprintf(stderr, "processed %3u object files, totaling %15s bytes\n", inputFiles._totalObjectLoaded.load(), commatize(inputFiles._totalObjectSize.load(), temp));
|
|
+ fprintf(stderr, "processed %3u archive files, totaling %15s bytes\n", inputFiles._totalArchivesLoaded.load(), commatize(inputFiles._totalArchiveSize.load(), temp));
|
|
fprintf(stderr, "processed %3u dylib files\n", inputFiles._totalDylibsLoaded);
|
|
fprintf(stderr, "wrote output file totaling %15s bytes\n", commatize(out.fileSize(), temp));
|
|
}
|
|
@@ -1570,12 +1569,12 @@ int main(int argc, const char* argv[])
|
|
#ifndef NDEBUG
|
|
|
|
// now that the linker is multi-threaded, only allow one assert() to be processed
|
|
-static os_lock_unfair_s sAssertLock = OS_LOCK_UNFAIR_INIT;
|
|
+static std::mutex sAssertLock;
|
|
|
|
// implement assert() function to print out a backtrace before aborting
|
|
void __assert_rtn(const char* func, const char* file, int line, const char* failedexpr)
|
|
{
|
|
- os_lock_lock(&sAssertLock);
|
|
+ sAssertLock.lock();
|
|
|
|
Snapshot *snapshot = Snapshot::globalSnapshot;
|
|
|
|
--
|
|
2.47.2
|
|
|