TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into release

Browse Source 
Change-Id: Iaeb2144000bba05bf9532a55518b9549d7662361
This commit is contained in:
Alexey Polyudov
2020-06-30 00:29:25 -07:00
parent 1c44f4bbdd 07c6fcbdf0
commit fc41a86ba2
39 changed files with 1229 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpp/core_v2/internal/payload_manager.cc
+17 -9
View File
@@ -58,7 +58,7 @@ bool PayloadManager::SendPayloadLoop(
for (const auto& endpoint : unavailable_endpoints) {
HandleFinishedOutgoingPayload(
client, {endpoint->id}, payload_header, next_chunk_offset,
EndpointInfoStatusToPayloadStatus(endpoint->status));
EndpointInfoStatusToPayloadStatus(endpoint->status.Get()));
}
// Update the still-active recipients of this payload.
@@ -156,8 +156,8 @@ PayloadManager::GetAvailableAndUnavailableEndpoints(
Endpoints unavailable;
for (auto* endpoint_info : pending_payload.GetEndpoints()) {
NEARBY_LOG(INFO, "EndpointInfo: %p; id=%s; status=%d", endpoint_info,
endpoint_info->id.c_str(), endpoint_info->status);
if (endpoint_info->status ==
endpoint_info->id.c_str(), endpoint_info->status.Get());
if (endpoint_info->status.Get() ==
PayloadManager::EndpointInfo::Status::kAvailable) {
available.push_back(endpoint_info);
} else {
@@ -253,12 +253,16 @@ void PayloadManager::CancelAllPayloads() {
}
}
PayloadManager::~PayloadManager() {
NEARBY_LOG(INFO, "PayloadManager: going down; self=%p", this);
shutdown_.Set(true);
void PayloadManager::DisconnectFromEndpointManager() {
if (shutdown_.Set(true)) return;
// Unregister ourselves from the FrameProcessors.
endpoint_manager_->UnregisterFrameProcessor(V1Frame::PAYLOAD_TRANSFER,
handle_, true);
}
PayloadManager::~PayloadManager() {
NEARBY_LOG(INFO, "PayloadManager: going down; self=%p", this);
DisconnectFromEndpointManager();
CancelAllPayloads();
NEARBY_LOG(INFO, "PayloadManager: turn down payload executors; self=%p",
this);
@@ -399,7 +403,11 @@ void PayloadManager::OnIncomingFrame(
void PayloadManager::OnEndpointDisconnect(ClientProxy* client,
const std::string& endpoint_id,
CountDownLatch* barrier) {
RunOnStatusUpdateThread([this, client, endpoint_id, &barrier]() {
if (shutdown_.Get()) {
if (barrier) barrier->CountDown();
return;
}
RunOnStatusUpdateThread([this, client, endpoint_id, barrier]() {
// Iterate through all our payloads and look for payloads associated
// with this endpoint.
MutexLock lock(&mutex_);
@@ -921,7 +929,7 @@ PayloadManager::EndpointInfo::ControlMessageEventToEndpointInfoStatus(
void PayloadManager::EndpointInfo::SetStatusFromControlMessage(
const PayloadTransferFrame::ControlMessage& control_message) {
status = ControlMessageEventToEndpointInfoStatus(control_message.event());
status.Set(ControlMessageEventToEndpointInfoStatus(control_message.event()));
}
//////////////////////////////// PendingPayload ////////////////////////////////
@@ -938,7 +946,7 @@ PayloadManager::PendingPayload::PendingPayload(
for (const auto& id : endpoint_ids) {
endpoints_.emplace(id, EndpointInfo{
.id = id,
.status = EndpointInfo::Status::kAvailable,
.status {EndpointInfo::Status::kAvailable},
});
}
}