summaryrefslogtreecommitdiff
path: root/databases/foundationdb-devel/files
diff options
context:
space:
mode:
authorDave Cottlehuber <dch@FreeBSD.org>2021-03-29 09:27:33 +0000
committerDave Cottlehuber <dch@FreeBSD.org>2021-03-29 09:27:33 +0000
commit65ceac45ccb365e4b6bc7e54c14c6246a125a616 (patch)
tree2a734ffc2c85346ea57001a075dd31822a0eeb53 /databases/foundationdb-devel/files
parentsysutils/fwup: update to 1.8.4 (diff)
databases/foundationdb-devel: update to 20210224 snapshot
Sponsored by: SkunkWerks, GmbH
Diffstat (limited to 'databases/foundationdb-devel/files')
-rw-r--r--databases/foundationdb-devel/files/patch-flow_Platform.actor.cpp11
-rw-r--r--databases/foundationdb-devel/files/patch-flow_ThreadPrimitives.h23
2 files changed, 0 insertions, 34 deletions
diff --git a/databases/foundationdb-devel/files/patch-flow_Platform.actor.cpp b/databases/foundationdb-devel/files/patch-flow_Platform.actor.cpp
deleted file mode 100644
index 85557d8234f2..000000000000
--- a/databases/foundationdb-devel/files/patch-flow_Platform.actor.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- flow/Platform.actor.cpp.orig 2021-01-03 23:00:51 UTC
-+++ flow/Platform.actor.cpp
-@@ -2406,7 +2406,7 @@ ACTOR Future<vector<std::string>> findFiles( std::stri
- return result;
- }
-
--#elif (defined(__linux__) || defined(__APPLE__))
-+#elif (defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__))
- #define FILE_ATTRIBUTE_DATA mode_t
-
- bool acceptFile( FILE_ATTRIBUTE_DATA fileAttributes, std::string const& name, std::string const& extension ) {
diff --git a/databases/foundationdb-devel/files/patch-flow_ThreadPrimitives.h b/databases/foundationdb-devel/files/patch-flow_ThreadPrimitives.h
deleted file mode 100644
index fe00d9506ec2..000000000000
--- a/databases/foundationdb-devel/files/patch-flow_ThreadPrimitives.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- flow/ThreadPrimitives.h.orig 2021-01-03 22:45:20 UTC
-+++ flow/ThreadPrimitives.h
-@@ -47,9 +47,9 @@
-
- // TODO: We should make this dependent on the CPU. Maybe cmake
- // can set this variable properly?
--constexpr size_t CACHE_LINE_SIZE = 64;
-+constexpr size_t MAX_CACHE_LINE_SIZE = 64;
-
--class alignas(CACHE_LINE_SIZE) ThreadSpinLock {
-+class alignas(MAX_CACHE_LINE_SIZE) ThreadSpinLock {
- public:
- // #ifdef _WIN32
- ThreadSpinLock() {
-@@ -90,7 +90,7 @@ class alignas(CACHE_LINE_SIZE) ThreadSpinLock { (priva
- std::atomic_flag isLocked = ATOMIC_FLAG_INIT;
- // We want a spin lock to occupy a cache line in order to
- // prevent false sharing.
-- std::array<uint8_t, CACHE_LINE_SIZE - sizeof(isLocked)> padding;
-+ std::array<uint8_t, MAX_CACHE_LINE_SIZE - sizeof(isLocked)> padding;
- };
-
- class ThreadSpinLockHolder {