Compare commits
1 Commits
Author | SHA1 | Date |
---|---|---|
|
64d74cfa3e |
|
@ -0,0 +1,47 @@
|
|||
From 2a7810f39cb113570efcde5f65e5440ff9587ae0 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Wed, 11 Nov 2015 17:08:06 +0100
|
||||
Subject: [PATCH] Disable erasure_codelib neon build
|
||||
|
||||
---
|
||||
src/erasure-code/jerasure/Makefile.am | 6 +++---
|
||||
src/erasure-code/shec/Makefile.am | 6 +++---
|
||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/erasure-code/jerasure/Makefile.am b/src/erasure-code/jerasure/Makefile.am
|
||||
index 6ffe3ed..01f5112 100644
|
||||
--- a/src/erasure-code/jerasure/Makefile.am
|
||||
+++ b/src/erasure-code/jerasure/Makefile.am
|
||||
@@ -75,9 +75,9 @@ if LINUX
|
||||
libec_jerasure_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
|
||||
endif
|
||||
|
||||
-if HAVE_NEON
|
||||
-erasure_codelib_LTLIBRARIES += libec_jerasure_neon.la
|
||||
-endif
|
||||
+#if HAVE_NEON
|
||||
+#erasure_codelib_LTLIBRARIES += libec_jerasure_neon.la
|
||||
+#endif
|
||||
|
||||
libec_jerasure_sse3_la_SOURCES = ${jerasure_sources}
|
||||
libec_jerasure_sse3_la_CFLAGS = ${AM_CFLAGS} \
|
||||
diff --git a/src/erasure-code/shec/Makefile.am b/src/erasure-code/shec/Makefile.am
|
||||
index cd93132..948979b 100644
|
||||
--- a/src/erasure-code/shec/Makefile.am
|
||||
+++ b/src/erasure-code/shec/Makefile.am
|
||||
@@ -81,9 +81,9 @@ if LINUX
|
||||
libec_shec_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
|
||||
endif
|
||||
|
||||
-if HAVE_NEON
|
||||
-erasure_codelib_LTLIBRARIES += libec_shec_neon.la
|
||||
-endif
|
||||
+#if HAVE_NEON
|
||||
+#erasure_codelib_LTLIBRARIES += libec_shec_neon.la
|
||||
+#endif
|
||||
|
||||
libec_shec_sse3_la_SOURCES = ${shec_sources}
|
||||
libec_shec_sse3_la_CFLAGS = ${AM_CFLAGS} \
|
||||
--
|
||||
2.7.4
|
||||
|
|
@ -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
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
From f7abffec751e454d119df273dc6e49e5f7106078 Mon Sep 17 00:00:00 2001
|
||||
From: Sage Weil <sage@redhat.com>
|
||||
Date: Wed, 7 Dec 2016 18:25:55 -0600
|
||||
Subject: [PATCH] msg/simple/Pipe: avoid returning 0 on poll timeout
|
||||
|
||||
If poll times out it will return 0 (no data to read on socket). In
|
||||
165e5abdbf6311974d4001e43982b83d06f9e0cc we changed tcp_read_wait from
|
||||
returning -1 to returning -errno, which means we return 0 instead of -1
|
||||
in this case.
|
||||
|
||||
This makes tcp_read() get into an infinite loop by repeatedly trying to
|
||||
read from the socket and getting EAGAIN.
|
||||
|
||||
Fix by explicitly checking for a 0 return from poll(2) and returning
|
||||
EAGAIN in that case.
|
||||
|
||||
Fixes: http://tracker.ceph.com/issues/18184
|
||||
Signed-off-by: Sage Weil <sage@redhat.com>
|
||||
(cherry picked from commit 6c3d015c6854a12cda40673848813d968ff6afae)
|
||||
---
|
||||
src/msg/simple/Pipe.cc | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/msg/simple/Pipe.cc b/src/msg/simple/Pipe.cc
|
||||
index 80b948d..cfb1986 100644
|
||||
--- a/src/msg/simple/Pipe.cc
|
||||
+++ b/src/msg/simple/Pipe.cc
|
||||
@@ -2500,8 +2500,11 @@ int Pipe::tcp_read_wait()
|
||||
if (has_pending_data())
|
||||
return 0;
|
||||
|
||||
- if (poll(&pfd, 1, msgr->timeout) <= 0)
|
||||
+ int r = poll(&pfd, 1, msgr->timeout);
|
||||
+ if (r < 0)
|
||||
return -errno;
|
||||
+ if (r == 0)
|
||||
+ return -EAGAIN;
|
||||
|
||||
evmask = POLLERR | POLLHUP | POLLNVAL;
|
||||
#if defined(__linux__)
|
||||
--
|
||||
2.7.4
|
||||
|
|
@ -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}")
|
Loading…
Reference in New Issue