Skip to content

Commit aac42d6

Browse files
matthiasrichtermatthiasrichter
committed
Modernizing code: replacing push_back by emplace_back
No functional change
1 parent 659d378 commit aac42d6

3 files changed

Lines changed: 17 additions & 27 deletions

File tree

‎Utilities/aliceHLTwrapper/src/Component.cxx‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,11 @@ int Component::init(int argc, char** argv)
165165
if (parameterLength > 0 && parameterBuffer.get() != nullptr) {
166166
strcpy(parameterBuffer.get(), componentParameter.c_str());
167167
char* iterator = parameterBuffer.get();
168-
parameters.push_back(iterator);
168+
parameters.emplace_back(iterator);
169169
for (; *iterator != 0; iterator++) {
170170
if (*iterator != ' ') continue;
171171
*iterator = 0; // separate strings
172-
if (*(iterator + 1) != ' ' && *(iterator + 1) != 0) parameters.push_back(iterator + 1);
172+
if (*(iterator + 1) != ' ' && *(iterator + 1) != 0) parameters.emplace_back(iterator + 1);
173173
}
174174
}
175175

@@ -235,13 +235,10 @@ int Component::process(vector<MessageFormat::BufferDesc_t>& dataArray,
235235
}
236236

237237
// add event type data block
238-
AliHLTComponentBlockData eventTypeBlock;
239-
memset(&eventTypeBlock, 0, sizeof(eventTypeBlock));
240-
eventTypeBlock.fStructSize = sizeof(eventTypeBlock);
241-
// Note: no payload!
242-
eventTypeBlock.fDataType = AliHLTComponentDataTypeInitializer("EVENTTYP", "PRIV");
243-
eventTypeBlock.fSpecification = gkAliEventTypeData;
244-
inputBlocks.push_back(eventTypeBlock);
238+
// this data block describes the type of the event, set it
239+
// to 'data' by using specification gkAliEventTypeData
240+
const AliHLTComponentDataType kDataTypeEvent = AliHLTComponentDataTypeInitializer("EVENTTYP", "PRIV");
241+
inputBlocks.emplace_back(nullptr, 0, kDataTypeEvent, gkAliEventTypeData);
245242

246243
// process
247244
evtData.fBlockCnt = inputBlocks.size();
@@ -308,7 +305,7 @@ int Component::process(vector<MessageFormat::BufferDesc_t>& dataArray,
308305
AliHLTComponentBlockData* pFiltered = pOutputBlocks;
309306
for (unsigned blockIndex = 0; blockIndex < outputBlockCnt; blockIndex++, pOutputBlock++) {
310307
// filter special data blocks
311-
if (pOutputBlock->fDataType == eventTypeBlock.fDataType) continue;
308+
if (pOutputBlock->fDataType == kDataTypeEvent) continue;
312309

313310
// block descriptors without any attached payload are propagated
314311
bool bValid = pOutputBlock->fSize == 0;

‎Utilities/aliceHLTwrapper/src/MessageFormat.cxx‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -192,20 +192,13 @@ int MessageFormat::readHOMERFormat(uint8_t* buffer, unsigned size,
192192
if (reader->ReadNextEvent() == 0) {
193193
nofBlocks = reader->GetBlockCnt();
194194
for (unsigned i = 0; i < nofBlocks; i++) {
195-
AliHLTComponentBlockData block;
196-
memset(&block, 0, sizeof(AliHLTComponentBlockData));
197-
block.fStructSize = sizeof(AliHLTComponentBlockData);
198-
block.fDataType.fStructSize = sizeof(AliHLTComponentDataType);
195+
descriptorList.emplace_back(const_cast<void*>(reader->GetBlockData(i)), reader->GetBlockDataLength(i), kAliHLTVoidDataType, reader->GetBlockDataSpec(i));
199196
homer_uint64 id = byteSwap64(reader->GetBlockDataType(i));
200197
homer_uint32 origin = byteSwap32(reader->GetBlockDataOrigin(i));
201-
memcpy(&block.fDataType.fID, &id,
198+
memcpy(&descriptorList.back().fDataType.fID, &id,
202199
sizeof(id) > kAliHLTComponentDataTypefIDsize ? kAliHLTComponentDataTypefIDsize : sizeof(id));
203-
memcpy(&block.fDataType.fOrigin, &origin,
200+
memcpy(&descriptorList.back().fDataType.fOrigin, &origin,
204201
sizeof(origin) > kAliHLTComponentDataTypefOriginSize ? kAliHLTComponentDataTypefOriginSize : sizeof(origin));
205-
block.fSpecification = reader->GetBlockDataSpec(i);
206-
block.fPtr = const_cast<void*>(reader->GetBlockData(i));
207-
block.fSize = reader->GetBlockDataLength(i);
208-
descriptorList.push_back(block);
209202
}
210203
}
211204

@@ -443,7 +436,7 @@ int MessageFormat::insertEvtData(const AliHLTComponentEventData& evtData)
443436
{
444437
// insert event header to list, sort by time, oldest first
445438
if (mListEvtData.size()==0) {
446-
mListEvtData.push_back(evtData);
439+
mListEvtData.emplace_back(evtData);
447440
} else {
448441
auto it=mListEvtData.begin();
449442
for (; it!=mListEvtData.end(); it++) {

‎Utilities/aliceHLTwrapper/src/WrapperDevice.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ void WrapperDevice::InitTask()
112112
assert(semantic->max_tokens() && semantic->min_tokens());
113113
if (semantic->min_tokens() > 0 ) {
114114
// add the token
115-
argstrings.push_back(varit.second.as<std::string>());
115+
argstrings.emplace_back(varit.second.as<std::string>());
116116
}
117117
}
118118
}
@@ -127,10 +127,10 @@ void WrapperDevice::InitTask()
127127
string id="";
128128
id=GetProperty(FairMQDevice::Id, id);
129129
vector<char*> argv;
130-
argv.push_back(&idkey[0]);
131-
argv.push_back(&id[0]);
130+
argv.emplace_back(&idkey[0]);
131+
argv.emplace_back(&id[0]);
132132
for (auto& argstringiter : argstrings) {
133-
argv.push_back(&argstringiter[0]);
133+
argv.emplace_back(&argstringiter[0]);
134134
}
135135

136136
if ((iResult=component->init(argv.size(), &argv[0]))<0) {
@@ -286,7 +286,7 @@ void WrapperDevice::Run()
286286
}
287287
uint8_t* pTarget = reinterpret_cast<uint8_t*>(msg->GetData());
288288
memcpy(pTarget, opayload.mP, opayload.mSize);
289-
mMessages.push_back(move(msg));
289+
mMessages.emplace_back(move(msg));
290290
} else {
291291
if (errorCount == maxError && errorCount++ > 0)
292292
LOG(ERROR) << "persistent error, suppressing further output";
@@ -341,6 +341,6 @@ unsigned char* WrapperDevice::createMessageBuffer(unsigned size)
341341
if (mVerbosity > 2) {
342342
LOG(DEBUG) << "allocating message of size " << size;
343343
}
344-
mMessages.push_back(move(msg));
344+
mMessages.emplace_back(move(msg));
345345
return reinterpret_cast<uint8_t*>(mMessages.back()->GetData());
346346
}

0 commit comments

Comments
 (0)