Skip to content

Commit bfd62b8

Browse files
ktfktf
committed
DPL: adapt to new InputRecord API
1 parent 71404a6 commit bfd62b8

6 files changed

Lines changed: 23 additions & 11 deletions

File tree

‎Framework/Core/test/benchmark_InputRecord.cxx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ static void BM_InputRecordGenericGetters(benchmark::State& state)
4848
// First of all we test if an empty registry behaves as expected, raising a
4949
// bunch of exceptions.
5050
InputSpan span{[](size_t) { return DataRef{nullptr, nullptr, nullptr}; }, 0};
51-
InputRecord emptyRecord(schema, span);
51+
CallbackService callbacks;
52+
ObjectCache cache;
53+
InputRecord emptyRecord(schema, span, cache, callbacks);
5254

5355
std::vector<void*> inputs;
5456

@@ -82,7 +84,7 @@ static void BM_InputRecordGenericGetters(benchmark::State& state)
8284
createMessage(dh2, 2);
8385
createEmpty();
8486
InputSpan span2{[&inputs](size_t i) { return DataRef{nullptr, static_cast<char const*>(inputs[2 * i]), static_cast<char const*>(inputs[2 * i + 1])}; }, inputs.size() / 2};
85-
InputRecord record{schema, span2};
87+
InputRecord record{schema, span2, cache, callbacks};
8688

8789
for (auto _ : state) {
8890
// Checking we can get the whole ref by name

‎Framework/Core/test/test_InputRecord.cxx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ BOOST_AUTO_TEST_CASE(TestInputRecord)
5151
InputSpan span{
5252
[](size_t) { return DataRef{nullptr, nullptr, nullptr}; },
5353
0};
54-
InputRecord emptyRecord(schema, span);
54+
CallbackService callbacks;
55+
ObjectCache cache;
56+
InputRecord emptyRecord(schema, span, cache, callbacks);
5557

5658
BOOST_CHECK_EXCEPTION(emptyRecord.get("x"), RuntimeErrorRef, any_exception);
5759
BOOST_CHECK_EXCEPTION(emptyRecord.get("y"), RuntimeErrorRef, any_exception);
@@ -93,7 +95,7 @@ BOOST_AUTO_TEST_CASE(TestInputRecord)
9395
createMessage(dh2, 2);
9496
createEmpty();
9597
InputSpan span2{[&inputs](size_t i) { return DataRef{nullptr, static_cast<char const*>(inputs[2 * i]), static_cast<char const*>(inputs[2 * i + 1])}; }, inputs.size() / 2};
96-
InputRecord record{schema, span2};
98+
InputRecord record{schema, span2, cache, callbacks};
9799

98100
// Checking we can get the whole ref by name
99101
BOOST_CHECK_NO_THROW(record.get("x"));

‎Framework/Core/test/test_InputRecordWalker.cxx‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ struct DataSet {
3939
using TaggedSet = std::pair<o2::header::DataOrigin, MessageSet>;
4040
using Messages = std::vector<TaggedSet>;
4141
using CheckType = std::vector<std::string>;
42-
DataSet(std::vector<InputRoute>&& s, Messages&& m, CheckType&& v)
42+
DataSet(std::vector<InputRoute>&& s, Messages&& m, CheckType&& v, ObjectCache& cache, CallbackService& callbacks)
4343
: schema{std::move(s)}, messages{std::move(m)}, span{[this](size_t i, size_t part) {
4444
BOOST_REQUIRE(i < this->messages.size());
4545
BOOST_REQUIRE(part < this->messages[i].second.size() / 2);
@@ -48,7 +48,7 @@ struct DataSet {
4848
return DataRef{nullptr, header, payload};
4949
},
5050
[this](size_t i) { return i < this->messages.size() ? messages[i].second.size() / 2 : 0; }, this->messages.size()},
51-
record{schema, span},
51+
record{schema, span, cache, callbacks},
5252
values{std::move(v)}
5353
{
5454
BOOST_REQUIRE(messages.size() == schema.size());
@@ -63,6 +63,8 @@ struct DataSet {
6363

6464
DataSet createData()
6565
{
66+
static CallbackService callbacks;
67+
static ObjectCache cache;
6668
// Create the routes we want for the InputRecord
6769
std::vector<InputSpec> inputspecs = {
6870
InputSpec{"tpc", "TPC", "SOMEDATA", 0, Lifetime::Timeframe},
@@ -138,7 +140,7 @@ DataSet createData()
138140
createMessage(dh3);
139141
createMessage(dh4);
140142

141-
return {std::move(schema), std::move(messages), std::move(checkValues)};
143+
return {std::move(schema), std::move(messages), std::move(checkValues), cache, callbacks};
142144
}
143145

144146
BOOST_AUTO_TEST_CASE(test_DPLRawParser)

‎Framework/Utils/test/RawPageTestData.cxx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ DataSet createData(std::vector<InputSpec> const& inputspecs, std::vector<DataHea
8686
}
8787
}
8888

89-
return {std::move(schema), std::move(messages), std::move(checkValues)};
89+
static ObjectCache cache;
90+
static CallbackService callbacks;
91+
return {std::move(schema), std::move(messages), std::move(checkValues), cache, callbacks};
9092
}
9193

9294
} // namespace test

‎Framework/Utils/test/RawPageTestData.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static const size_t PAGESIZE = 8192;
4141
struct DataSet {
4242
// not nice with the double vector but for quick unit test ok
4343
using Messages = std::vector<std::vector<std::unique_ptr<std::vector<char>>>>;
44-
DataSet(std::vector<InputRoute>&& s, Messages&& m, std::vector<int>&& v)
44+
DataSet(std::vector<InputRoute>&& s, Messages&& m, std::vector<int>&& v, ObjectCache& cache, CallbackService& callbacks)
4545
: schema{std::move(s)},
4646
messages{std::move(m)},
4747
span{[this](size_t i, size_t part) {
@@ -50,7 +50,7 @@ struct DataSet {
5050
return DataRef{nullptr, header, payload};
5151
},
5252
[this](size_t i) { return i < this->messages.size() ? messages[i].size() / 2 : 0; }, this->messages.size()},
53-
record{schema, span},
53+
record{schema, span, cache, callbacks},
5454
values{std::move(v)}
5555
{
5656
}

‎Framework/Utils/test/test_RootTreeWriter.cxx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,13 @@ BOOST_AUTO_TEST_CASE(test_RootTreeWriter)
221221
return DataRef{nullptr, static_cast<char const*>(store[2 * i]->GetData()), static_cast<char const*>(store[2 * i + 1]->GetData())};
222222
};
223223
InputSpan span{getter, store.size() / 2};
224+
ObjectCache cache;
225+
CallbackService callbacks;
224226
InputRecord inputs{
225227
schema,
226-
span};
228+
span,
229+
cache,
230+
callbacks};
227231

228232
writer(inputs);
229233
writer.close();

0 commit comments

Comments
 (0)