From f28ac955c36e8ec97a4759e8b250678e59b5bb90 Mon Sep 17 00:00:00 2001 From: sfc-gh-tclinkenbeard Date: Mon, 10 May 2021 16:32:02 -0700 Subject: [PATCH] Remove unnecessary temporary objects while growing objects of type std::vector> --- bindings/c/test/unit/unit_tests.cpp | 2 +- fdbbackup/backup.actor.cpp | 6 +++--- fdbcli/fdbcli.actor.cpp | 2 +- fdbclient/FDBOptions.h | 4 ++-- fdbclient/ManagementAPI.actor.cpp | 2 +- fdbclient/MonitorLeader.actor.cpp | 12 ++++++------ fdbclient/MultiVersionTransaction.actor.cpp | 6 +++--- fdbclient/ThreadSafeTransaction.cpp | 2 +- fdbmonitor/fdbmonitor.cpp | 2 +- fdbrpc/HealthMonitor.actor.cpp | 2 +- fdbserver/ClusterController.actor.cpp | 4 ++-- fdbserver/CommitProxyServer.actor.cpp | 6 +++--- fdbserver/DataDistribution.actor.cpp | 4 ++-- fdbserver/DataDistributionQueue.actor.cpp | 2 +- fdbserver/KeyValueStoreMemory.actor.cpp | 2 +- fdbserver/OldTLogServer_4_6.actor.cpp | 6 +++--- fdbserver/Resolver.actor.cpp | 2 +- fdbserver/RestoreWorker.actor.cpp | 2 +- fdbserver/Status.actor.cpp | 2 +- fdbserver/StorageMetrics.actor.h | 2 +- fdbserver/TagPartitionedLogSystem.actor.cpp | 4 ++-- fdbserver/fdbserver.actor.cpp | 10 +++++----- fdbservice/FDBService.cpp | 4 ++-- flow/FastAlloc.cpp | 2 +- flow/Platform.actor.cpp | 2 +- flow/SystemMonitor.cpp | 2 +- flow/TDMetric.actor.h | 4 ++-- flow/TDMetric.cpp | 2 +- 28 files changed, 51 insertions(+), 51 deletions(-) diff --git a/bindings/c/test/unit/unit_tests.cpp b/bindings/c/test/unit/unit_tests.cpp index 360284e55d..f54db2ca58 100644 --- a/bindings/c/test/unit/unit_tests.cpp +++ b/bindings/c/test/unit/unit_tests.cpp @@ -219,7 +219,7 @@ GetRangeResult get_range(fdb::Transaction& tr, for (int i = 0; i < out_count; ++i) { std::string key((const char*)out_kv[i].key, out_kv[i].key_length); std::string value((const char*)out_kv[i].value, out_kv[i].value_length); - results.push_back(std::make_pair(key, value)); + results.emplace_back(key, value); } return GetRangeResult{ results, out_more != 0, 0 }; } diff --git a/fdbbackup/backup.actor.cpp b/fdbbackup/backup.actor.cpp index 77e4b03f0d..6813baa464 100644 --- a/fdbbackup/backup.actor.cpp +++ b/fdbbackup/backup.actor.cpp @@ -3357,7 +3357,7 @@ int main(int argc, char* argv[]) { deleteData = true; break; case OPT_MIN_CLEANUP_SECONDS: - knobs.push_back(std::make_pair("min_cleanup_seconds", args->OptionArg())); + knobs.emplace_back("min_cleanup_seconds", args->OptionArg()); break; case OPT_FORCE: forceAction = true; @@ -3452,7 +3452,7 @@ int main(int argc, char* argv[]) { return FDB_EXIT_ERROR; } syn = syn.substr(7); - knobs.push_back(std::make_pair(syn, args->OptionArg())); + knobs.emplace_back(syn, args->OptionArg()); break; } case OPT_BACKUPKEYS: @@ -4212,7 +4212,7 @@ int main(int argc, char* argv[]) { s = s.substr(LiteralStringRef("struct ").size()); #endif - typeNames.push_back(std::make_pair(s, i->first)); + typeNames.emplace_back(s, i->first); } std::sort(typeNames.begin(), typeNames.end()); for (int i = 0; i < typeNames.size(); i++) { diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp index a3578a95d4..61c1aea4ff 100644 --- a/fdbcli/fdbcli.actor.cpp +++ b/fdbcli/fdbcli.actor.cpp @@ -3076,7 +3076,7 @@ struct CLIOptions { return FDB_EXIT_ERROR; } syn = syn.substr(7); - knobs.push_back(std::make_pair(syn, args.OptionArg())); + knobs.emplace_back(syn, args.OptionArg()); break; } case OPT_DEBUG_TLS: diff --git a/fdbclient/FDBOptions.h b/fdbclient/FDBOptions.h index 7007a38c13..e13e44a129 100644 --- a/fdbclient/FDBOptions.h +++ b/fdbclient/FDBOptions.h @@ -95,7 +95,7 @@ public: if (itr != optionsIndexMap.end()) { options.erase(itr->second); } - options.push_back(std::make_pair(option, value)); + options.emplace_back(option, value); optionsIndexMap[option] = --options.end(); } @@ -107,4 +107,4 @@ public: type::optionInfo.insert( \ var, FDBOptionInfo(name, comment, parameterComment, hasParameter, hidden, persistent, defaultFor)); -#endif \ No newline at end of file +#endif diff --git a/fdbclient/ManagementAPI.actor.cpp b/fdbclient/ManagementAPI.actor.cpp index 90d670e801..dcccf2ae78 100644 --- a/fdbclient/ManagementAPI.actor.cpp +++ b/fdbclient/ManagementAPI.actor.cpp @@ -741,7 +741,7 @@ ConfigureAutoResult parseConfig(StatusObject const& status) { } if (processClass.classType() != ProcessClass::TesterClass) { - machine_processes[machineId].push_back(std::make_pair(addr, processClass)); + machine_processes[machineId].emplace_back(addr, processClass); processCount++; } } diff --git a/fdbclient/MonitorLeader.actor.cpp b/fdbclient/MonitorLeader.actor.cpp index 057e546501..63b86b7b71 100644 --- a/fdbclient/MonitorLeader.actor.cpp +++ b/fdbclient/MonitorLeader.actor.cpp @@ -431,9 +431,9 @@ Optional> getLeader(const vectorCLIENT_EXAMPLE_AMOUNT) { - entry.examples.push_back(std::make_pair(ci.first, ci.second.traceLogGroup)); + entry.examples.emplace_back(ci.first, ci.second.traceLogGroup); } } if (ci.second.versions.size()) { @@ -593,19 +593,19 @@ OpenDatabaseRequest ClientData::getRequest() { auto& entry = versionMap[it]; entry.count++; if (entry.examples.size() < CLIENT_KNOBS->CLIENT_EXAMPLE_AMOUNT) { - entry.examples.push_back(std::make_pair(ci.first, ci.second.traceLogGroup)); + entry.examples.emplace_back(ci.first, ci.second.traceLogGroup); } } auto& maxEntry = maxProtocolMap[maxProtocol]; maxEntry.count++; if (maxEntry.examples.size() < CLIENT_KNOBS->CLIENT_EXAMPLE_AMOUNT) { - maxEntry.examples.push_back(std::make_pair(ci.first, ci.second.traceLogGroup)); + maxEntry.examples.emplace_back(ci.first, ci.second.traceLogGroup); } } else { auto& entry = versionMap[ClientVersionRef()]; entry.count++; if (entry.examples.size() < CLIENT_KNOBS->CLIENT_EXAMPLE_AMOUNT) { - entry.examples.push_back(std::make_pair(ci.first, ci.second.traceLogGroup)); + entry.examples.emplace_back(ci.first, ci.second.traceLogGroup); } } } diff --git a/fdbclient/MultiVersionTransaction.actor.cpp b/fdbclient/MultiVersionTransaction.actor.cpp index 18f7bc71e8..1c5124c12a 100644 --- a/fdbclient/MultiVersionTransaction.actor.cpp +++ b/fdbclient/MultiVersionTransaction.actor.cpp @@ -595,7 +595,7 @@ Reference DLApi::createDatabase(const char* clusterFilePath) { void DLApi::addNetworkThreadCompletionHook(void (*hook)(void*), void* hookParameter) { MutexHolder holder(lock); - threadCompletionHooks.push_back(std::make_pair(hook, hookParameter)); + threadCompletionHooks.emplace_back(hook, hookParameter); } // MultiVersionTransaction @@ -947,7 +947,7 @@ void MultiVersionDatabase::setOption(FDBDatabaseOptions::Option option, Optional value.castTo>()); } - dbState->options.push_back(std::make_pair(option, value.castTo>())); + dbState->options.emplace_back(option, value.castTo>()); if (dbState->db) { dbState->db->setOption(option, value); @@ -1559,7 +1559,7 @@ void MultiVersionApi::setNetworkOptionInternal(FDBNetworkOptions::Option option, runOnExternalClientsAllThreads( [option, value](Reference client) { client->api->setNetworkOption(option, value); }); } else { - options.push_back(std::make_pair(option, value.castTo>())); + options.emplace_back(option, value.castTo>()); } } } diff --git a/fdbclient/ThreadSafeTransaction.cpp b/fdbclient/ThreadSafeTransaction.cpp index aa0c6bca07..93c2854a2f 100644 --- a/fdbclient/ThreadSafeTransaction.cpp +++ b/fdbclient/ThreadSafeTransaction.cpp @@ -468,7 +468,7 @@ void ThreadSafeApi::addNetworkThreadCompletionHook(void (*hook)(void*), void* ho MutexHolder holder(lock); // We could use the network thread to protect this action, but then we can't guarantee // upon return that the hook is set. - threadCompletionHooks.push_back(std::make_pair(hook, hookParameter)); + threadCompletionHooks.emplace_back(hook, hookParameter); } IClientApi* ThreadSafeApi::api = new ThreadSafeApi(); diff --git a/fdbmonitor/fdbmonitor.cpp b/fdbmonitor/fdbmonitor.cpp index db28c81d21..2c97b7a1d8 100644 --- a/fdbmonitor/fdbmonitor.cpp +++ b/fdbmonitor/fdbmonitor.cpp @@ -856,7 +856,7 @@ void load_conf(const char* confpath, uid_t& uid, gid_t& gid, sigset_t* mask, fdb if (id_command[i.first]->kill_on_configuration_change) { kill_ids.push_back(i.first); - start_ids.push_back(std::make_pair(i.first, cmd)); + start_ids.emplace_back(i.first, cmd); } } else { log_msg(SevInfo, "Updated configuration for %s\n", id_command[i.first]->ssection.c_str()); diff --git a/fdbrpc/HealthMonitor.actor.cpp b/fdbrpc/HealthMonitor.actor.cpp index fa549a50f2..772c3b7a9c 100644 --- a/fdbrpc/HealthMonitor.actor.cpp +++ b/fdbrpc/HealthMonitor.actor.cpp @@ -24,7 +24,7 @@ void HealthMonitor::reportPeerClosed(const NetworkAddress& peerAddress) { purgeOutdatedHistory(); - peerClosedHistory.push_back(std::make_pair(now(), peerAddress)); + peerClosedHistory.emplace_back(now(), peerAddress); peerClosedNum[peerAddress] += 1; } diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp index a0586132cd..cbcab1ab1b 100644 --- a/fdbserver/ClusterController.actor.cpp +++ b/fdbserver/ClusterController.actor.cpp @@ -541,8 +541,8 @@ public: std::vector> orderedFields; for (auto& it : fieldsWithMin) { auto& fitness = field_fitness[it]; - orderedFields.push_back(std::make_tuple( - std::get<0>(fitness), std::get<1>(fitness), std::get<2>(fitness), field_count[it], it)); + orderedFields.emplace_back( + std::get<0>(fitness), std::get<1>(fitness), std::get<2>(fitness), field_count[it], it); } std::sort(orderedFields.begin(), orderedFields.end()); int totalFields = desired / minPerField; diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp index 208744e3a0..335f622d55 100644 --- a/fdbserver/CommitProxyServer.actor.cpp +++ b/fdbserver/CommitProxyServer.actor.cpp @@ -1448,7 +1448,7 @@ ACTOR static Future doKeyServerLocationRequest(GetKeyServerLocationsReques for (auto& it : r.value().src_info) { ssis.push_back(it->interf); } - rep.results.push_back(std::make_pair(r.range(), ssis)); + rep.results.emplace_back(r.range(), ssis); } else if (!req.reverse) { int count = 0; for (auto r = commitData->keyInfo.rangeContaining(req.begin); @@ -1459,7 +1459,7 @@ ACTOR static Future doKeyServerLocationRequest(GetKeyServerLocationsReques for (auto& it : r.value().src_info) { ssis.push_back(it->interf); } - rep.results.push_back(std::make_pair(r.range(), ssis)); + rep.results.emplace_back(r.range(), ssis); count++; } } else { @@ -1471,7 +1471,7 @@ ACTOR static Future doKeyServerLocationRequest(GetKeyServerLocationsReques for (auto& it : r.value().src_info) { ssis.push_back(it->interf); } - rep.results.push_back(std::make_pair(r.range(), ssis)); + rep.results.emplace_back(r.range(), ssis); if (r == commitData->keyInfo.ranges().begin()) { break; } diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp index d1762fc7cb..7d328b927c 100644 --- a/fdbserver/DataDistribution.actor.cpp +++ b/fdbserver/DataDistribution.actor.cpp @@ -447,7 +447,7 @@ ACTOR Future> getInitialDataDistribution(Data for (int i = 0; i < serverList.get().size(); i++) { auto ssi = decodeServerListValue(serverList.get()[i].value); - result->allServers.push_back(std::make_pair(ssi, id_data[ssi.locality.processId()].processClass)); + result->allServers.emplace_back(ssi, id_data[ssi.locality.processId()].processClass); server_dc[ssi.id()] = ssi.locality.dcId(); } @@ -3729,7 +3729,7 @@ ACTOR Future>> getServerL vector> results; for (int i = 0; i < serverList.get().size(); i++) { auto ssi = decodeServerListValue(serverList.get()[i].value); - results.push_back(std::make_pair(ssi, id_data[ssi.locality.processId()].processClass)); + results.emplace_back(ssi, id_data[ssi.locality.processId()].processClass); } return results; diff --git a/fdbserver/DataDistributionQueue.actor.cpp b/fdbserver/DataDistributionQueue.actor.cpp index f7b0d465c7..f5fddb0d15 100644 --- a/fdbserver/DataDistributionQueue.actor.cpp +++ b/fdbserver/DataDistributionQueue.actor.cpp @@ -1032,7 +1032,7 @@ ACTOR Future dataDistributionRelocator(DDQueueData* self, RelocateData rd, anyWithSource = true; } - bestTeams.push_back(std::make_pair(bestTeam.first.get(), bestTeam.second)); + bestTeams.emplace_back(bestTeam.first.get(), bestTeam.second); tciIndex++; } if (foundTeams && anyHealthy) { diff --git a/fdbserver/KeyValueStoreMemory.actor.cpp b/fdbserver/KeyValueStoreMemory.actor.cpp index bbe314c667..26cc5fe445 100644 --- a/fdbserver/KeyValueStoreMemory.actor.cpp +++ b/fdbserver/KeyValueStoreMemory.actor.cpp @@ -401,7 +401,7 @@ private: if (o->op == OpSet) { if (sequential) { KeyValueMapPair pair(o->p1, o->p2); - dataSets.push_back(std::make_pair(pair, pair.arena.getSize() + data.getElementBytes())); + dataSets.emplace_back(pair, pair.arena.getSize() + data.getElementBytes()); } else { data.insert(o->p1, o->p2); } diff --git a/fdbserver/OldTLogServer_4_6.actor.cpp b/fdbserver/OldTLogServer_4_6.actor.cpp index 3c5ae2ee1f..d8d6755910 100644 --- a/fdbserver/OldTLogServer_4_6.actor.cpp +++ b/fdbserver/OldTLogServer_4_6.actor.cpp @@ -838,7 +838,7 @@ void commitMessages(Reference self, TEST(true); // Splitting commit messages across multiple blocks messages1 = StringRef(block.end(), bytes); block.append(block.arena(), messages.begin(), bytes); - self->messageBlocks.push_back(std::make_pair(version, block)); + self->messageBlocks.emplace_back(version, block); addedBytes += int64_t(block.size()) * SERVER_KNOBS->TLOG_MESSAGE_BLOCK_OVERHEAD_FACTOR; messages = messages.substr(bytes); } @@ -851,7 +851,7 @@ void commitMessages(Reference self, // Copy messages into block ASSERT(messages.size() <= block.capacity() - block.size()); block.append(block.arena(), messages.begin(), messages.size()); - self->messageBlocks.push_back(std::make_pair(version, block)); + self->messageBlocks.emplace_back(version, block); addedBytes += int64_t(block.size()) * SERVER_KNOBS->TLOG_MESSAGE_BLOCK_OVERHEAD_FACTOR; messages = StringRef(block.end() - messages.size(), messages.size()); @@ -869,7 +869,7 @@ void commitMessages(Reference self, int offs = tag->messageOffsets[m]; uint8_t const* p = offs < messages1.size() ? messages1.begin() + offs : messages.begin() + offs - messages1.size(); - tsm->value.version_messages.push_back(std::make_pair(version, LengthPrefixedStringRef((uint32_t*)p))); + tsm->value.version_messages.emplace_back(version, LengthPrefixedStringRef((uint32_t*)p)); if (tsm->value.version_messages.back().second.expectedSize() > SERVER_KNOBS->MAX_MESSAGE_SIZE) { TraceEvent(SevWarnAlways, "LargeMessage") .detail("Size", tsm->value.version_messages.back().second.expectedSize()); diff --git a/fdbserver/Resolver.actor.cpp b/fdbserver/Resolver.actor.cpp index a2d769b1fc..4364ee0321 100644 --- a/fdbserver/Resolver.actor.cpp +++ b/fdbserver/Resolver.actor.cpp @@ -233,7 +233,7 @@ ACTOR Future resolveBatch(Reference self, ResolveTransactionBatc self->resolvedStateBytes += stateBytes; if (stateBytes > 0) - self->recentStateTransactionSizes.push_back(std::make_pair(req.version, stateBytes)); + self->recentStateTransactionSizes.emplace_back(req.version, stateBytes); ASSERT(req.version >= firstUnseenVersion); ASSERT(firstUnseenVersion >= self->debugMinRecentStateVersion); diff --git a/fdbserver/RestoreWorker.actor.cpp b/fdbserver/RestoreWorker.actor.cpp index 193f2631da..04bbf21ee1 100644 --- a/fdbserver/RestoreWorker.actor.cpp +++ b/fdbserver/RestoreWorker.actor.cpp @@ -189,7 +189,7 @@ ACTOR Future monitorWorkerLiveness(Reference self) { loop { std::vector> requests; for (auto& worker : self->workerInterfaces) { - requests.push_back(std::make_pair(worker.first, RestoreSimpleRequest())); + requests.emplace_back(worker.first, RestoreSimpleRequest()); } wait(sendBatchRequests(&RestoreWorkerInterface::heartbeat, self->workerInterfaces, requests)); wait(delay(60.0)); diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp index 8579fcd2df..fe871a8deb 100644 --- a/fdbserver/Status.actor.cpp +++ b/fdbserver/Status.actor.cpp @@ -1790,7 +1790,7 @@ static Future>> getServerMetrics( ++futureItr; } - results.push_back(std::make_pair(servers[i], serverResults)); + results.emplace_back(servers[i], serverResults); } return results; diff --git a/fdbserver/StorageMetrics.actor.h b/fdbserver/StorageMetrics.actor.h index 397127f098..44ba37d15d 100644 --- a/fdbserver/StorageMetrics.actor.h +++ b/fdbserver/StorageMetrics.actor.h @@ -112,7 +112,7 @@ struct TransientStorageMetricSample : StorageMetricSample { int64_t addAndExpire(KeyRef key, int64_t metric, double expiration) { int64_t x = add(key, metric); if (x) - queue.push_back(std::make_pair(expiration, std::make_pair(*sample.find(key), -x))); + queue.emplace_back(expiration, std::make_pair(*sample.find(key), -x)); return x; } diff --git a/fdbserver/TagPartitionedLogSystem.actor.cpp b/fdbserver/TagPartitionedLogSystem.actor.cpp index dc63aabc9f..3137315985 100644 --- a/fdbserver/TagPartitionedLogSystem.actor.cpp +++ b/fdbserver/TagPartitionedLogSystem.actor.cpp @@ -2117,7 +2117,7 @@ struct TagPartitionedLogSystem : ILogSystem, ReferenceCounted>> failed; for (const auto& logVar : logServers.back()->logServers) { - allLogServers.push_back(std::make_pair(logVar, coreSet.tLogPolicy)); + allLogServers.emplace_back(logVar, coreSet.tLogPolicy); failed.push_back(makeReference>()); failureTrackers.push_back(monitorLog(logVar, failed.back())); } @@ -2129,7 +2129,7 @@ struct TagPartitionedLogSystem : ILogSystem, ReferenceCountedlogServers) { - allLogServers.push_back(std::make_pair(logVar, logSet->tLogPolicy)); + allLogServers.emplace_back(logVar, logSet->tLogPolicy); } } } diff --git a/fdbserver/fdbserver.actor.cpp b/fdbserver/fdbserver.actor.cpp index ac75e87947..7320353fa5 100644 --- a/fdbserver/fdbserver.actor.cpp +++ b/fdbserver/fdbserver.actor.cpp @@ -1062,7 +1062,7 @@ private: flushAndExit(FDB_EXIT_ERROR); } syn = syn.substr(7); - knobs.push_back(std::make_pair(syn, args.OptionArg())); + knobs.emplace_back(syn, args.OptionArg()); break; } case OPT_PROFILER: { @@ -1383,10 +1383,10 @@ private: } // SOMEDAY: ideally we'd have some better way to express that a knob should be elevated to formal // parameter - knobs.push_back(std::make_pair( + knobs.emplace_back( "page_cache_4k", - format("%ld", ti.get() / 4096 * 4096))); // The cache holds 4K pages, so we can truncate this to the - // next smaller multiple of 4K. + format("%ld", ti.get() / 4096 * 4096)); // The cache holds 4K pages, so we can truncate this to the + // next smaller multiple of 4K. break; case OPT_BUGGIFY: if (!strcmp(args.OptionArg(), "on")) @@ -2177,7 +2177,7 @@ int main(int argc, char* argv[]) { s = s.substr(LiteralStringRef("struct ").size()); #endif - typeNames.push_back(std::make_pair(s, i->first)); + typeNames.emplace_back(s, i->first); } std::sort(typeNames.begin(), typeNames.end()); for (int i = 0; i < typeNames.size(); i++) { diff --git a/fdbservice/FDBService.cpp b/fdbservice/FDBService.cpp index e908ff2a7b..e214f0a031 100644 --- a/fdbservice/FDBService.cpp +++ b/fdbservice/FDBService.cpp @@ -556,7 +556,7 @@ private: LogEvent(EVENTLOG_INFORMATION_TYPE, format("Found new configuration for process (ID %d)", sp->id)); stop_processes.push_back(sp); - start_ids.push_back(std::make_pair(sp->id, cmd)); + start_ids.emplace_back(sp->id, cmd); } else if (cmd.quiet != sp->command.quiet || cmd.restartDelay != sp->command.restartDelay) { // Update restartDelay and quiet but do not restart running processes if (!cmd.quiet || !sp->command.quiet) @@ -585,7 +585,7 @@ private: std::string section(it->pItem, dot - it->pItem); Command cmd = makeCommand(ini, section, id); if (cmd.valid) { - start_ids.push_back(std::make_pair(id, cmd)); + start_ids.emplace_back(id, cmd); } else { LogEvent( EVENTLOG_ERROR_TYPE, diff --git a/flow/FastAlloc.cpp b/flow/FastAlloc.cpp index 7af1b3bf86..4a60026cd9 100644 --- a/flow/FastAlloc.cpp +++ b/flow/FastAlloc.cpp @@ -564,7 +564,7 @@ void FastAllocator::releaseThreadMagazines() { if (thr.freelist || thr.alternate) { if (thr.freelist) { ASSERT(thr.count > 0 && thr.count <= magazine_size); - globalData()->partial_magazines.push_back(std::make_pair(thr.count, thr.freelist)); + globalData()->partial_magazines.emplace_back(thr.count, thr.freelist); globalData()->partialMagazineUnallocatedMemory += thr.count * Size; } if (thr.alternate) { diff --git a/flow/Platform.actor.cpp b/flow/Platform.actor.cpp index 8cdb34f769..b743ce39b6 100644 --- a/flow/Platform.actor.cpp +++ b/flow/Platform.actor.cpp @@ -3002,7 +3002,7 @@ void outOfMemory() { else if (StringRef(s).startsWith(LiteralStringRef("struct "))) s = s.substr(LiteralStringRef("struct ").size()); #endif - typeNames.push_back(std::make_pair(s, i->first)); + typeNames.emplace_back(s, i->first); } std::sort(typeNames.begin(), typeNames.end()); for (int i = 0; i < typeNames.size(); i++) { diff --git a/flow/SystemMonitor.cpp b/flow/SystemMonitor.cpp index 37dadf9dc1..5bb2389c68 100644 --- a/flow/SystemMonitor.cpp +++ b/flow/SystemMonitor.cpp @@ -285,7 +285,7 @@ SystemStatistics customSystemMonitor(std::string eventName, StatisticsState* sta else if (StringRef(s).startsWith(LiteralStringRef("struct "))) s = s.substr(LiteralStringRef("struct ").size()); #endif - typeNames.push_back(std::make_pair(s, i->first)); + typeNames.emplace_back(s, i->first); } std::sort(typeNames.begin(), typeNames.end()); for (int i = 0; i < typeNames.size(); i++) { diff --git a/flow/TDMetric.actor.h b/flow/TDMetric.actor.h index 4867826068..21944dd0e7 100644 --- a/flow/TDMetric.actor.h +++ b/flow/TDMetric.actor.h @@ -881,7 +881,7 @@ struct EventMetric final : E, ReferenceCounted>, MetricUtil::field_indexes(), mk, rollTime, batch); if (!latestRecorded) { - batch.updates.push_back(std::make_pair(mk.packLatestKey(), StringRef())); + batch.updates.emplace_back(mk.packLatestKey(), StringRef()); latestRecorded = true; } } @@ -1249,7 +1249,7 @@ public: void flushData(const MetricKeyRef& mk, uint64_t rollTime, MetricUpdateBatch& batch) override { if (!recorded) { - batch.updates.push_back(std::make_pair(mk.packLatestKey(), getLatestAsValue())); + batch.updates.emplace_back(mk.packLatestKey(), getLatestAsValue()); recorded = true; } diff --git a/flow/TDMetric.cpp b/flow/TDMetric.cpp index c0a227266a..d1848f9708 100644 --- a/flow/TDMetric.cpp +++ b/flow/TDMetric.cpp @@ -198,7 +198,7 @@ void DynamicEventMetric::flushData(MetricKeyRef const& mk, uint64_t rollTime, Me for (auto& [name, field] : fields) field->flushField(mk, rollTime, batch); if (!latestRecorded) { - batch.updates.push_back(std::make_pair(mk.packLatestKey(), StringRef())); + batch.updates.emplace_back(mk.packLatestKey(), StringRef()); latestRecorded = true; } }