Use std::make_shared and std::make_unique

This saves some allocations. This also meant having to set the C++ standard to 2014. The getCopy() methods of sessions and mqttpackets can't be changed, because of access errors (private).

Use std::make_shared and std::make_unique
This saves some allocations. This also meant having to set the C++ standard to 2014. The getCopy() methods of sessions and mqttpackets can't be changed, because of access errors (private).
Wiebe Cazemier
1 parent f44f1e79
Showing 8 changed files with 24 additions and 22 deletions
CMakeLists.txt
acltree.cpp
authplugin.cpp
configfileparser.cpp
listener.cpp
mainapp.cpp
sessionsandsubscriptionsdb.cpp
subscriptionstore.cpp
@@ -7,7 +7,7 @@ project(FlashMQ VERSION 0.9.9 LANGUAGES CXX)
 add_definitions(-DOPENSSL_API_COMPAT=0x10100000L)
 add_definitions(-DFLASHMQ_VERSION=\"${PROJECT_VERSION}\")
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 SET(CMAKE_CXX_FLAGS "-msse4.2")
@@ -14,7 +14,7 @@ AclNode *AclNode::getChildren(const std::string &amp;subtopic, bool registerPattern)
     if (!node)
     {
-        node.reset(new AclNode());
+        node = std::make_unique<AclNode>();
         if (registerPattern)
         {
@@ -44,7 +44,7 @@ const AclNode *AclNode::getChildren(const std::string &amp;subtopic) const
 AclNode *AclNode::getChildrenPlus()
 {
     if (!childrenPlus)
-        childrenPlus.reset(new AclNode());
+        childrenPlus = std::make_unique<AclNode>();
     return childrenPlus.get();
 }
@@ -417,7 +417,8 @@ void Authentication::loadMosquittoPasswordFile()
     try
     {
         std::ifstream infile(this->mosquittoPasswordFile, std::ios::in);
-        std::unique_ptr<std::unordered_map<std::string, MosquittoPasswordFileEntry>> passwordEntries_tmp(new std::unordered_map<std::string, MosquittoPasswordFileEntry>());
+        std::unique_ptr<std::unordered_map<std::string, MosquittoPasswordFileEntry>> passwordEntries_tmp =
+                std::make_unique<std::unordered_map<std::string, MosquittoPasswordFileEntry>>();
         for(std::string line; getline(infile, line ); )
         {
@@ -121,7 +121,7 @@ ConfigFileParser::ConfigFileParser(const std::string &amp;path) :
     validListenKeys.insert("inet4_bind_address");
     validListenKeys.insert("inet6_bind_address");
-    settings.reset(new Settings());
+    settings = std::make_unique<Settings>();
 }
 void ConfigFileParser::loadFile(bool test)
@@ -202,7 +202,7 @@ void ConfigFileParser::loadFile(bool test)
     ConfigParseLevel curParseLevel = ConfigParseLevel::Root;
     std::shared_ptr<Listener> curListener;
-    std::unique_ptr<Settings> tmpSettings(new Settings);
+    std::unique_ptr<Settings> tmpSettings = std::make_unique<Settings>();
     // Then once we know the config file is valid, process it.
     for (std::string &line : lines)
@@ -215,7 +215,7 @@ void ConfigFileParser::loadFile(bool test)
             if (matches[1].str() == "listen")
             {
                 curParseLevel = ConfigParseLevel::Listen;
-                curListener.reset(new Listener);
+                curListener = std::make_shared<Listener>();
             }
             else
             {
@@ -481,7 +481,7 @@ void ConfigFileParser::loadFile(bool test)
 std::unique_ptr<Settings> ConfigFileParser::moveSettings()
 {
     std::unique_ptr<Settings> tmp = std::move(settings);
-    settings.reset(new Settings);
+    settings = std::make_unique<Settings>();
     return tmp;
 }
@@ -83,7 +83,7 @@ void Listener::loadCertAndKeyFromConfig()
     if (!sslctx)
     {
-        sslctx.reset(new SslCtxManager());
+        sslctx = std::make_unique<SslCtxManager>();
         SSL_CTX_set_options(sslctx->get(), SSL_OP_NO_SSLv3); // TODO: config option
         SSL_CTX_set_options(sslctx->get(), SSL_OP_NO_TLSv1); // TODO: config option
     }
@@ -23,6 +23,7 @@ License along with FlashMQ. If not, see &lt;https://www.gnu.org/licenses/&gt;.
 #include <stdio.h>
 #include <sys/sysinfo.h>
 #include <arpa/inet.h>
+#include <memory>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
@@ -36,12 +37,12 @@ License along with FlashMQ. If not, see &lt;https://www.gnu.org/licenses/&gt;.
 MainApp *MainApp::instance = nullptr;
 MainApp::MainApp(const std::string &configFilePath) :
-    subscriptionStore(new SubscriptionStore())
+    subscriptionStore(std::make_shared<SubscriptionStore>())
 {
     epollFdAccept = check<std::runtime_error>(epoll_create(999));
     taskEventFd = eventfd(0, EFD_NONBLOCK);
-    confFileParser.reset(new ConfigFileParser(configFilePath));
+    confFileParser = std::make_unique<ConfigFileParser>(configFilePath);
     loadConfig();
     this->num_threads = get_nprocs();
@@ -437,14 +438,14 @@ void MainApp::start()
             Authentication auth(settingsLocalCopy);
             ThreadGlobals::assign(&auth);
-            std::shared_ptr<ThreadData> threaddata(new ThreadData(0, subscriptionStore, settings));
+            std::shared_ptr<ThreadData> threaddata = std::make_shared<ThreadData>(0, subscriptionStore, settings);
-            std::shared_ptr<Client> client(new Client(fd, threaddata, nullptr, fuzzWebsockets, nullptr, settings, true));
-            std::shared_ptr<Client> subscriber(new Client(fdnull, threaddata, nullptr, fuzzWebsockets, nullptr, settings, true));
+            std::shared_ptr<Client> client = std::make_shared<Client>(fd, threaddata, nullptr, fuzzWebsockets, nullptr, settings, true);
+            std::shared_ptr<Client> subscriber = std::make_shared<Client>(fdnull, threaddata, nullptr, fuzzWebsockets, nullptr, settings, true);
             subscriber->setClientProperties(ProtocolVersion::Mqtt311, "subscriber", "subuser", true, 60, true);
             subscriber->setAuthenticated(true);
-            std::shared_ptr<Client> websocketsubscriber(new Client(fdnull2, threaddata, nullptr, true, nullptr, settings, true));
+            std::shared_ptr<Client> websocketsubscriber = std::make_shared<Client>(fdnull2, threaddata, nullptr, true, nullptr, settings, true);
             websocketsubscriber->setClientProperties(ProtocolVersion::Mqtt311, "websocketsubscriber", "websocksubuser", true, 60, true);
             websocketsubscriber->setAuthenticated(true);
             websocketsubscriber->setFakeUpgraded();
@@ -483,7 +484,7 @@ void MainApp::start()
     for (int i = 0; i < num_threads; i++)
     {
-        std::shared_ptr<ThreadData> t(new ThreadData(i, subscriptionStore, settings));
+        std::shared_ptr<ThreadData> t = std::make_shared<ThreadData>(i, subscriptionStore, settings);
         t->start(&do_thread_work);
         threads.push_back(t);
     }
@@ -542,7 +543,7 @@ void MainApp::start()
                         SSL_set_fd(clientSSL, fd);
                     }
-                    std::shared_ptr<Client> client(new Client(fd, thread_data, clientSSL, listener->websocket, addr, settings));
+                    std::shared_ptr<Client> client = std::make_shared<Client>(fd, thread_data, clientSSL, listener->websocket, addr, settings);
                     thread_data->giveClient(client);
                 }
                 else
@@ -655,7 +656,7 @@ void MainApp::loadConfig()
     if (settings->listeners.empty())
     {
-        std::shared_ptr<Listener> defaultListener(new Listener());
+        std::shared_ptr<Listener> defaultListener = std::make_shared<Listener>();
         defaultListener->isValid();
         settings->listeners.push_back(defaultListener);
     }
@@ -88,7 +88,7 @@ SessionsAndSubscriptionsResult SessionsAndSubscriptionsDB::readDataV1()
             readCheck(buf.data(), 1, clientIdLength, f);
             std::string clientId(buf.data(), clientIdLength);
-            std::shared_ptr<Session> ses(new Session());
+            std::shared_ptr<Session> ses = std::make_shared<Session>();
             result.sessions.push_back(ses);
             ses->username = username;
             ses->client_id = clientId;
@@ -122,7 +122,7 @@ SubscriptionNode *SubscriptionStore::getDeepestNode(const std::string &amp;topic, co
         if (!node)
         {
-            node.reset(new SubscriptionNode(subtopic));
+            node = std::make_unique<SubscriptionNode>(subtopic);
         }
         deepestNode = node.get();
     }
@@ -240,7 +240,7 @@ void SubscriptionStore::registerClientAndKickExistingOne(std::shared_ptr&lt;Client&gt;
     if (!session || client->getCleanSession() || originalClientDemandsSessionDestruction)
     {
-        session.reset(new Session());
+        session = std::make_shared<Session>();
         sessionsById[client->getClientId()] = session;
     }
@@ -448,7 +448,7 @@ void SubscriptionStore::setRetainedMessage(const std::string &amp;topic, const std::
         if (!selectedChildren)
         {
-            selectedChildren.reset(new RetainedMessageNode());
+            selectedChildren = std::make_unique<RetainedMessageNode>();
         }
         deepestNode = selectedChildren.get();
     }