frozenleaves/pytorch
1
0
Fork 0
mirror of https://github.com/pytorch/pytorch.git synced 2025-10-21 13:44:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make futures vector a local function var (#36677)

Browse Source 
Summary:
Pull Request resolved: https://github.com/pytorch/pytorch/pull/36677

Move the `futures` vector to be a local function var like `errorFutures`. Holding the lock to clear the vector is now unnecessary.
ghstack-source-id: 102265569

Differential Revision: D20884589

fbshipit-source-id: c9a13258bee737d86f9b0d11cdd28263bb923697
This commit is contained in:
Omkar Salpekar
2020-04-16 10:06:56 -07:00
committed by Facebook GitHub Bot
parent f11c4f90c2
commit f5c230b892
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
torch/csrc/distributed/rpc/rpc_agent.cpp
View File

@ -83,7 +83,11 @@ std::shared_ptr<FutureMessage> RpcAgent::sendWithRetries(
}
void RpcAgent::retryExpiredRpcs() {
// storing futures and exception messages for non-retriable error-ed futures.
// Stores the retried futures so callbacks can be added outside the lock.
std::vector<
std::pair<std::shared_ptr<FutureMessage>, std::shared_ptr<RpcRetryInfo>>>
futures;
// Stores futures and exception messages for non-retriable error-ed futures.
std::vector<std::pair<std::shared_ptr<FutureMessage>, std::string>>
errorFutures;
@ -164,6 +168,7 @@ void RpcAgent::retryExpiredRpcs() {
rpcRetryCallback(fm, newTime, earliestRpc);
});
}
futures.clear();
// For exceptions caught while retrying RPC's above, we set those futures
// with errors now that we have released the lock.
@ -175,11 +180,9 @@ void RpcAgent::retryExpiredRpcs() {
errorFutures.clear();
// If there are no more RPC's set to be retried at the current timepoint,
// we can remove the corresponsing unordered_set from the retry map. We
// must also clear the futures vector.
// we can remove the corresponsing unordered_set from the retry map.
{
std::lock_guard<std::mutex> retryMapLock(rpcRetryMutex_);
futures.clear();
if (earliestRpcList.empty()) {
rpcRetryMap_.erase(earliestTimeout);
}