Page MenuHomePhabricator
Files F2786841

D4100.id12999.diff
No OneTemporary
Actions

D4100.id12999.diff
View Options

diff --git a/services/tunnelbroker/src/DeliveryBroker/DeliveryBroker.h b/services/tunnelbroker/src/DeliveryBroker/DeliveryBroker.h
--- a/services/tunnelbroker/src/DeliveryBroker/DeliveryBroker.h
+++ b/services/tunnelbroker/src/DeliveryBroker/DeliveryBroker.h
@@ -27,6 +27,7 @@
bool isEmpty(const std::string deviceID);
DeliveryBrokerMessage pop(const std::string deviceID);
void erase(const std::string deviceID);
+ void deleteQueueIfEmpty(const std::string clientDeviceID);
};
} // namespace network
diff --git a/services/tunnelbroker/src/DeliveryBroker/DeliveryBroker.cpp b/services/tunnelbroker/src/DeliveryBroker/DeliveryBroker.cpp
--- a/services/tunnelbroker/src/DeliveryBroker/DeliveryBroker.cpp
+++ b/services/tunnelbroker/src/DeliveryBroker/DeliveryBroker.cpp
@@ -66,5 +66,14 @@
this->messagesMap.erase(deviceID);
};
+void DeliveryBroker::deleteQueueIfEmpty(const std::string clientDeviceID) {
+ // If clientDeviceID messages queue is empty we don't need to store
+ // `folly::MPMCQueue` for it and need to free memory to fix possible 'ghost'
+ // queues.
+ if (DeliveryBroker::getInstance().isEmpty(clientDeviceID)) {
+ DeliveryBroker::getInstance().erase(clientDeviceID);
+ }
+};
+
} // namespace network
} // namespace comm

File Metadata

Mime Type
text/plain
Expires
Sun, Sep 22, 2:24 AM (21 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2166558
Default Alt Text
D4100.id12999.diff (1 KB)

Event Timeline