Compare commits
26 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
af48e05750 | ||
|
21ee093831 | ||
|
ef6cebb5fd | ||
|
61198a290b | ||
|
c2f40f6bf6 | ||
|
cba5e9554c | ||
|
c01db1f5b0 | ||
|
8e6771dba7 | ||
|
615188d81c | ||
|
651026bc41 | ||
|
26ff0145e7 | ||
|
fa0655c5ea | ||
|
85761f4d79 | ||
|
a497e4464b | ||
|
de771f742d | ||
|
95fe85df9e | ||
|
c90c05b686 | ||
|
711bd40c4e | ||
|
a5375edeaf | ||
|
9db102749d | ||
|
7ba3ecfe8f | ||
|
bb93fe97da | ||
|
b833068178 | ||
|
d5a5e9b77d | ||
|
1b9a141a37 | ||
|
47fe109fff |
27
0001-gperftools-deprecated-google-includes.patch
Normal file
27
0001-gperftools-deprecated-google-includes.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
From 6c280200b42758d3e84cfd1a5b256171cab132d1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Boris Ranto <branto@redhat.com>
|
||||||
|
Date: Wed, 14 Jan 2015 07:46:56 +0100
|
||||||
|
Subject: [PATCH 1/3] gperftools deprecated google/* includes
|
||||||
|
|
||||||
|
---
|
||||||
|
src/perfglue/heap_profiler.cc | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/perfglue/heap_profiler.cc b/src/perfglue/heap_profiler.cc
|
||||||
|
index 6b079b8..cdd5ccb 100644
|
||||||
|
--- a/src/perfglue/heap_profiler.cc
|
||||||
|
+++ b/src/perfglue/heap_profiler.cc
|
||||||
|
@@ -12,8 +12,8 @@
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
-#include <google/heap-profiler.h>
|
||||||
|
-#include <google/malloc_extension.h>
|
||||||
|
+#include <gperftools/heap-profiler.h>
|
||||||
|
+#include <gperftools/malloc_extension.h>
|
||||||
|
#include "heap_profiler.h"
|
||||||
|
#include "common/environment.h"
|
||||||
|
#include "common/LogClient.h"
|
||||||
|
--
|
||||||
|
1.9.3
|
||||||
|
|
@ -1,65 +0,0 @@
|
|||||||
From a45270a441d483ce57db48cda699a0d2d9c01f18 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Boris Ranto <branto@redhat.com>
|
|
||||||
Date: Thu, 28 Feb 2019 00:58:12 +0100
|
|
||||||
Subject: [PATCH] s390x: A compile hack
|
|
||||||
|
|
||||||
Signed-off-by: Boris Ranto <branto@redhat.com>
|
|
||||||
---
|
|
||||||
src/rgw/rgw_dmclock_async_scheduler.cc | 2 ++
|
|
||||||
src/test/rgw/test_rgw_dmclock_scheduler.cc | 8 ++++----
|
|
||||||
2 files changed, 6 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/rgw/rgw_dmclock_async_scheduler.cc b/src/rgw/rgw_dmclock_async_scheduler.cc
|
|
||||||
index 18ba5a5e32..08657cf2b5 100644
|
|
||||||
--- a/src/rgw/rgw_dmclock_async_scheduler.cc
|
|
||||||
+++ b/src/rgw/rgw_dmclock_async_scheduler.cc
|
|
||||||
@@ -41,6 +41,7 @@ int AsyncScheduler::schedule_request_impl(const client_id& client,
|
|
||||||
const Time& time, const Cost& cost,
|
|
||||||
optional_yield yield_ctx)
|
|
||||||
{
|
|
||||||
+#ifdef HAVE_BOOST_CONTEXT
|
|
||||||
ceph_assert(yield_ctx);
|
|
||||||
|
|
||||||
auto &yield = yield_ctx.get_yield_context();
|
|
||||||
@@ -53,6 +54,7 @@ int AsyncScheduler::schedule_request_impl(const client_id& client,
|
|
||||||
else
|
|
||||||
return -ec.value();
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
diff --git a/src/test/rgw/test_rgw_dmclock_scheduler.cc b/src/test/rgw/test_rgw_dmclock_scheduler.cc
|
|
||||||
index 4e4177cb0b..ddbfd12217 100644
|
|
||||||
--- a/src/test/rgw/test_rgw_dmclock_scheduler.cc
|
|
||||||
+++ b/src/test/rgw/test_rgw_dmclock_scheduler.cc
|
|
||||||
@@ -14,6 +14,8 @@
|
|
||||||
|
|
||||||
//#define BOOST_ASIO_ENABLE_HANDLER_TRACKING
|
|
||||||
|
|
||||||
+#ifdef HAVE_BOOST_CONTEXT
|
|
||||||
+
|
|
||||||
#include "rgw/rgw_dmclock_sync_scheduler.h"
|
|
||||||
#include "rgw/rgw_dmclock_async_scheduler.h"
|
|
||||||
|
|
||||||
@@ -395,8 +397,6 @@ TEST(Queue, CrossExecutorRequest)
|
|
||||||
EXPECT_EQ(PhaseType::priority, *p2);
|
|
||||||
}
|
|
||||||
|
|
||||||
-#ifdef HAVE_BOOST_CONTEXT
|
|
||||||
-
|
|
||||||
TEST(Queue, SpawnAsyncRequest)
|
|
||||||
{
|
|
||||||
boost::asio::io_context context;
|
|
||||||
@@ -426,6 +426,6 @@ TEST(Queue, SpawnAsyncRequest)
|
|
||||||
EXPECT_TRUE(context.stopped());
|
|
||||||
}
|
|
||||||
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
} // namespace rgw::dmclock
|
|
||||||
+
|
|
||||||
+#endif
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
25
0002-Wno-format-causes-compiler-options-collision.patch
Normal file
25
0002-Wno-format-causes-compiler-options-collision.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From 213613337d56bf1b1257f043c7b737ee86b0e1be Mon Sep 17 00:00:00 2001
|
||||||
|
From: Boris Ranto <branto@redhat.com>
|
||||||
|
Date: Wed, 14 Jan 2015 07:47:47 +0100
|
||||||
|
Subject: [PATCH 2/3] -Wno-format causes compiler options collision
|
||||||
|
|
||||||
|
---
|
||||||
|
src/test/Makefile.am | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
|
||||||
|
index 69f9e84..9ede275 100644
|
||||||
|
--- a/src/test/Makefile.am
|
||||||
|
+++ b/src/test/Makefile.am
|
||||||
|
@@ -646,7 +646,7 @@ bin_DEBUGPROGRAMS += ceph_test_librbd
|
||||||
|
if LINUX
|
||||||
|
ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c
|
||||||
|
ceph_test_librbd_fsx_LDADD = $(LIBRBD) $(LIBRADOS) -lm
|
||||||
|
-ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format
|
||||||
|
+ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS}
|
||||||
|
bin_DEBUGPROGRAMS += ceph_test_librbd_fsx
|
||||||
|
endif
|
||||||
|
|
||||||
|
--
|
||||||
|
1.9.3
|
||||||
|
|
@ -1,13 +0,0 @@
|
|||||||
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
|
|
||||||
index 65ba10b0f1..eeedc29c37 100644
|
|
||||||
--- a/src/common/CMakeLists.txt
|
|
||||||
+++ b/src/common/CMakeLists.txt
|
|
||||||
@@ -165,7 +165,7 @@ elseif(HAVE_ARMV8_CRC)
|
|
||||||
crc32c_aarch64.c)
|
|
||||||
endif(HAVE_INTEL)
|
|
||||||
|
|
||||||
-add_library(crc32 ${crc32_srcs})
|
|
||||||
+add_library(crc32 STATIC ${crc32_srcs})
|
|
||||||
if(HAVE_ARMV8_CRC)
|
|
||||||
set_target_properties(crc32 PROPERTIES
|
|
||||||
COMPILE_FLAGS "${CMAKE_C_FLAGS} ${ARMV8_CRC_COMPILE_FLAGS}")
|
|
27
0003-Backport-pull-request-2937-to-firefly.patch
Normal file
27
0003-Backport-pull-request-2937-to-firefly.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
From 149481ac6dc52a852fb53800384a99e3d69ad11a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Boris Ranto <branto@redhat.com>
|
||||||
|
Date: Mon, 8 Dec 2014 08:36:37 +0100
|
||||||
|
Subject: [PATCH 3/3] Backport pull request #2937 to firefly
|
||||||
|
|
||||||
|
---
|
||||||
|
src/common/RWLock.h | 4 +++-
|
||||||
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/common/RWLock.h b/src/common/RWLock.h
|
||||||
|
index f901ac0..f4d1937 100644
|
||||||
|
--- a/src/common/RWLock.h
|
||||||
|
+++ b/src/common/RWLock.h
|
||||||
|
@@ -36,7 +36,9 @@ public:
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual ~RWLock() {
|
||||||
|
- pthread_rwlock_unlock(&L);
|
||||||
|
+ // The following check is racy but we are about to destroy
|
||||||
|
+ // the object and we assume that there are no other users.
|
||||||
|
+ //assert(!is_locked()); -- hacky backport, no is_locked in firefly
|
||||||
|
pthread_rwlock_destroy(&L);
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
1.9.3
|
||||||
|
|
Loading…
Reference in New Issue
Block a user