Weak pointers to clients in subscription store

Wiebe Cazemier
1 parent f8e062bf
Showing 3 changed files with 7 additions and 14 deletions
subscriptionstore.cpp
subscriptionstore.h
threaddata.cpp
@@ -49,13 +49,6 @@ void SubscriptionStore::addSubscription(Client_p &amp;client, const std::string &amp;top
     giveClientRetainedMessages(client, topic);
 }
-void SubscriptionStore::removeClient(const Client_p &client)
-{
-    RWLockGuard lock_guard(&subscriptionsRwlock);
-    lock_guard.wrlock();
-    clients_by_id.erase(client->getClientId());
-}
-
 // TODO: should I implement cache, this needs to be changed to returning a list of clients.
 void SubscriptionStore::publishNonRecursively(const MqttPacket &packet, const std::forward_list<std::string> &subscribers) const
 {
@@ -64,7 +57,11 @@ void SubscriptionStore::publishNonRecursively(const MqttPacket &amp;packet, const st
         auto client_it = clients_by_id_const.find(client_id);
         if (client_it != clients_by_id_const.end())
         {
-            client_it->second->writeMqttPacketAndBlameThisClient(packet);
+            if (!client_it->second.expired())
+            {
+                Client_p c = client_it->second.lock();
+                c->writeMqttPacketAndBlameThisClient(packet);
+            }
         }
     }
 }
@@ -36,8 +36,8 @@ class SubscriptionStore
 {
     std::unique_ptr<SubscriptionNode> root;
     pthread_rwlock_t subscriptionsRwlock = PTHREAD_RWLOCK_INITIALIZER;
-    std::unordered_map<std::string, Client_p> clients_by_id;
-    const std::unordered_map<std::string, Client_p> &clients_by_id_const;
+    std::unordered_map<std::string, std::weak_ptr<Client>> clients_by_id;
+    const std::unordered_map<std::string, std::weak_ptr<Client>> &clients_by_id_const;
     pthread_rwlock_t retainedMessagesRwlock = PTHREAD_RWLOCK_INITIALIZER;
     std::unordered_set<RetainedMessage> retainedMessages;
@@ -49,7 +49,6 @@ public:
     SubscriptionStore();
     void addSubscription(Client_p &client, const std::string &topic);
-    void removeClient(const Client_p &client);
     void queuePacketAtSubscribers(const std::string &topic, const MqttPacket &packet, const Client_p &sender);
     void giveClientRetainedMessages(Client_p &client, const std::string &subscribe_topic);
@@ -52,7 +52,6 @@ void ThreadData::removeClient(Client_p client)
     std::lock_guard<std::mutex> lck(clients_by_fd_mutex);
     clients_by_fd.erase(client->getFd());
-    subscriptionStore->removeClient(client);
 }
 void ThreadData::removeClient(int fd)
@@ -62,7 +61,6 @@ void ThreadData::removeClient(int fd)
     if (client_it != this->clients_by_fd.end())
     {
         client_it->second->markAsDisconnecting();
-        subscriptionStore->removeClient(client_it->second);
         this->clients_by_fd.erase(fd);
     }
 }
@@ -85,7 +83,6 @@ bool ThreadData::doKeepAliveCheck()
         Client_p &client = it->second;
         if (client->keepAliveExpired())
         {
-            subscriptionStore->removeClient(client);
             it = clients_by_fd.erase(it);
         }
         else