1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
|
Regressed by https://github.com/boostorg/date_time/commit/f9f2aaf5216c
src/rbd_replay/Replayer.cc:353:65: error: no matching conversion for functional-style cast from 'float' to 'boost::posix_time::microseconds' (aka 'subsecond_duration<boost::posix_time::time_duration, 1000000>')
boost::system_time sub_release_time(action_completed_time + boost::posix_time::microseconds(dep.time_delta * m_latency_multiplier / 1000));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/local/include/boost/date_time/time_duration.hpp:270:30: note: candidate constructor (the implicit copy constructor) not viable: no known conversion from 'float' to 'const boost::date_time::subsecond_duration<boost::posix_time::time_duration, 1000000>' for 1st argument
class BOOST_SYMBOL_VISIBLE subsecond_duration : public base_duration
^
/usr/local/include/boost/date_time/time_duration.hpp:270:30: note: candidate constructor (the implicit move constructor) not viable: no known conversion from 'float' to 'boost::date_time::subsecond_duration<boost::posix_time::time_duration, 1000000>' for 1st argument
/usr/local/include/boost/date_time/time_duration.hpp:286:59: note: candidate template ignored: disabled by 'enable_if' [with T = float]
typename boost::enable_if<boost::is_integral<T>, void>::type* = 0) :
^
src/test/librbd/test_mock_Journal.cc:485:42: error: reference to '_1' is ambiguous
std::bind(&invoke_replay_complete, _1, 0));
^
/usr/local/include/boost/bind/placeholders.hpp:46:38: note: candidate found by name lookup is 'boost::placeholders::_1'
BOOST_STATIC_CONSTEXPR boost::arg<1> _1;
^
/usr/include/c++/v1/functional:2021:21: note: candidate found by name lookup is 'std::__1::placeholders::_1'
constexpr __ph<1> _1{};
^
--- src/rbd_replay/Replayer.cc.orig 2018-02-26 21:47:18 UTC
+++ src/rbd_replay/Replayer.cc
@@ -350,7 +350,7 @@ void Replayer::wait_for_actions(const action::Dependen
dout(DEPGRAPH_LEVEL) << "Finished waiting for " << dep.id << " after " << micros << " microseconds" << dendl;
// Apparently the nanoseconds constructor is optional:
// http://www.boost.org/doc/libs/1_46_0/doc/html/date_time/details.html#compile_options
- boost::system_time sub_release_time(action_completed_time + boost::posix_time::microseconds(dep.time_delta * m_latency_multiplier / 1000));
+ boost::system_time sub_release_time(action_completed_time + boost::posix_time::microseconds(long(dep.time_delta * m_latency_multiplier / 1000)));
if (sub_release_time > release_time) {
release_time = sub_release_time;
}
--- src/test/librbd/test_mock_Journal.cc.orig 2018-02-26 21:47:18 UTC
+++ src/test/librbd/test_mock_Journal.cc
@@ -214,7 +214,6 @@ using ::testing::Return;
using ::testing::SaveArg;
using ::testing::SetArgPointee;
using ::testing::WithArg;
-using namespace std::placeholders;
ACTION_P2(StartReplay, wq, ctx) {
wq->queue(ctx, 0);
@@ -482,7 +481,7 @@ class TestMockJournal : public TestMockFixture { (publ
expect_get_max_append_size(mock_journaler, 1 << 16);
expect_start_replay(
mock_image_ctx, mock_journaler,
- std::bind(&invoke_replay_complete, _1, 0));
+ std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
MockJournalReplay mock_journal_replay;
expect_stop_replay(mock_journaler);
@@ -530,7 +529,7 @@ TEST_F(TestMockJournal, StateTransitions) {
expect_get_max_append_size(mock_journaler, 1 << 16);
expect_start_replay(
mock_image_ctx, mock_journaler,
- std::bind(&invoke_replay_ready, _1));
+ std::bind(&invoke_replay_ready, std::placeholders::_1));
::journal::MockReplayEntry mock_replay_entry;
MockJournalReplay mock_journal_replay;
@@ -539,11 +538,11 @@ TEST_F(TestMockJournal, StateTransitions) {
expect_try_pop_front(mock_image_ctx, mock_journaler, true, mock_replay_entry);
expect_replay_process(mock_journal_replay);
expect_try_pop_front(mock_image_ctx, mock_journaler, false, mock_replay_entry,
- std::bind(&invoke_replay_ready, _1));
+ std::bind(&invoke_replay_ready, std::placeholders::_1));
expect_try_pop_front(mock_image_ctx, mock_journaler, true, mock_replay_entry);
expect_replay_process(mock_journal_replay);
expect_try_pop_front(mock_image_ctx, mock_journaler, false, mock_replay_entry,
- std::bind(&invoke_replay_complete, _1, 0));
+ std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
expect_stop_replay(mock_journaler);
expect_shut_down_replay(mock_image_ctx, mock_journal_replay, 0);
@@ -599,7 +598,7 @@ TEST_F(TestMockJournal, ReplayCompleteError) {
expect_get_max_append_size(mock_journaler, 1 << 16);
expect_start_replay(
mock_image_ctx, mock_journaler,
- std::bind(&invoke_replay_complete, _1, -EINVAL));
+ std::bind(&invoke_replay_complete, std::placeholders::_1, -EINVAL));
MockJournalReplay mock_journal_replay;
expect_stop_replay(mock_journaler);
@@ -613,7 +612,7 @@ TEST_F(TestMockJournal, ReplayCompleteError) {
expect_get_max_append_size(mock_journaler, 1 << 16);
expect_start_replay(
mock_image_ctx, mock_journaler,
- std::bind(&invoke_replay_complete, _1, 0));
+ std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
expect_stop_replay(mock_journaler);
expect_shut_down_replay(mock_image_ctx, mock_journal_replay, 0);
@@ -645,14 +644,14 @@ TEST_F(TestMockJournal, FlushReplayError) {
expect_get_max_append_size(mock_journaler, 1 << 16);
expect_start_replay(
mock_image_ctx, mock_journaler,
- std::bind(&invoke_replay_ready, _1));
+ std::bind(&invoke_replay_ready, std::placeholders::_1));
::journal::MockReplayEntry mock_replay_entry;
MockJournalReplay mock_journal_replay;
expect_try_pop_front(mock_image_ctx, mock_journaler, true, mock_replay_entry);
expect_replay_process(mock_journal_replay);
expect_try_pop_front(mock_image_ctx, mock_journaler, false, mock_replay_entry,
- std::bind(&invoke_replay_complete, _1, 0));
+ std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
expect_stop_replay(mock_journaler);
expect_shut_down_replay(mock_image_ctx, mock_journal_replay, -EINVAL);
expect_shut_down_journaler(mock_journaler);
@@ -664,7 +663,7 @@ TEST_F(TestMockJournal, FlushReplayError) {
expect_get_max_append_size(mock_journaler, 1 << 16);
expect_start_replay(
mock_image_ctx, mock_journaler,
- std::bind(&invoke_replay_complete, _1, 0));
+ std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
expect_stop_replay(mock_journaler);
expect_shut_down_replay(mock_image_ctx, mock_journal_replay, 0);
@@ -696,7 +695,7 @@ TEST_F(TestMockJournal, CorruptEntry) {
expect_get_max_append_size(mock_journaler, 1 << 16);
expect_start_replay(
mock_image_ctx, mock_journaler,
- std::bind(&invoke_replay_ready, _1));
+ std::bind(&invoke_replay_ready, std::placeholders::_1));
::journal::MockReplayEntry mock_replay_entry;
MockJournalReplay mock_journal_replay;
@@ -713,7 +712,7 @@ TEST_F(TestMockJournal, CorruptEntry) {
expect_get_max_append_size(mock_journaler, 1 << 16);
expect_start_replay(
mock_image_ctx, mock_journaler,
- std::bind(&invoke_replay_complete, _1, 0));
+ std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
expect_stop_replay(mock_journaler);
expect_shut_down_replay(mock_image_ctx, mock_journal_replay, 0);
expect_start_append(mock_journaler);
@@ -744,7 +743,7 @@ TEST_F(TestMockJournal, StopError) {
expect_get_max_append_size(mock_journaler, 1 << 16);
expect_start_replay(
mock_image_ctx, mock_journaler,
- std::bind(&invoke_replay_complete, _1, 0));
+ std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
MockJournalReplay mock_journal_replay;
expect_stop_replay(mock_journaler);
@@ -777,7 +776,7 @@ TEST_F(TestMockJournal, ReplayOnDiskPreFlushError) {
expect_start_replay(
mock_image_ctx, mock_journaler,
- std::bind(&invoke_replay_ready, _1));
+ std::bind(&invoke_replay_ready, std::placeholders::_1));
::journal::MockReplayEntry mock_replay_entry;
MockJournalReplay mock_journal_replay;
@@ -803,7 +802,7 @@ TEST_F(TestMockJournal, ReplayOnDiskPreFlushError) {
expect_get_max_append_size(mock_journaler, 1 << 16);
expect_start_replay(
mock_image_ctx, mock_journaler, {
- std::bind(&invoke_replay_complete, _1, 0)
+ std::bind(&invoke_replay_complete, std::placeholders::_1, 0)
});
expect_stop_replay(mock_journaler);
@@ -857,14 +856,14 @@ TEST_F(TestMockJournal, ReplayOnDiskPostFlushError) {
expect_get_max_append_size(mock_journaler, 1 << 16);
expect_start_replay(
mock_image_ctx, mock_journaler,
- std::bind(&invoke_replay_ready, _1));
+ std::bind(&invoke_replay_ready, std::placeholders::_1));
::journal::MockReplayEntry mock_replay_entry;
MockJournalReplay mock_journal_replay;
expect_try_pop_front(mock_image_ctx, mock_journaler, true, mock_replay_entry);
expect_replay_process(mock_journal_replay);
expect_try_pop_front(mock_image_ctx, mock_journaler, false, mock_replay_entry,
- std::bind(&invoke_replay_complete, _1, 0));
+ std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
expect_stop_replay(mock_journaler);
Context *on_flush = nullptr;
@@ -880,7 +879,7 @@ TEST_F(TestMockJournal, ReplayOnDiskPostFlushError) {
expect_get_max_append_size(mock_journaler, 1 << 16);
expect_start_replay(
mock_image_ctx, mock_journaler,
- std::bind(&invoke_replay_complete, _1, 0));
+ std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
expect_stop_replay(mock_journaler);
expect_shut_down_replay(mock_image_ctx, mock_journal_replay, 0);
|
