Update comments, and don't copy the shared ptr when not necessary.

3 files changed, 10 insertions, 9 deletions

diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
index ea6f5e03a80..6eab44923f7 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
@@ -802,7 +802,7 @@ void FileStorManager::onFlush(bool downwards)
     LOG(debug, "Flushed _filestorHandler->flush(!downwards);");
     for (uint32_t i = 0; i < _disks.size(); ++i) {
         for (uint32_t j = 0; j < _disks[i].size(); ++j) {
-            if (_disks[i][j].get() != NULL) {
+            if (_disks[i][j]) {
                 _disks[i][j]->flush();
                 LOG(debug, "flushed disk[%d][%d]", i, j);
             }
diff --git a/storage/src/vespa/storage/persistence/persistencethread.cpp b/storage/src/vespa/storage/persistence/persistencethread.cpp
index 77833c9af0d..d1da25269cf 100644
--- a/storage/src/vespa/storage/persistence/persistencethread.cpp
+++ b/storage/src/vespa/storage/persistence/persistencethread.cpp
@@ -894,16 +894,17 @@ bool hasBucketInfo(const api::StorageMessage& msg)
 
 }
 
-void PersistenceThread::processMessages(FileStorHandler::LockedMessage & lock) {
+void
+PersistenceThread::processLockedMessage(FileStorHandler::LockedMessage & lock) {
     std::vector<MessageTracker::UP> trackers;
     document::Bucket bucket = lock.first->getBucket();
 
-    LOG(debug, "Inside while loop %d, nodeIndex %d, ptr=%p", _env._partition, _env._nodeIndex, lock.second.get());
-    std::shared_ptr<api::StorageMessage> msg(lock.second);
+    LOG(debug, "Partition %d, nodeIndex %d, ptr=%p", _env._partition, _env._nodeIndex, lock.second.get());
+    api::StorageMessage & msg(*lock.second);
 
-    std::unique_ptr<MessageTracker> tracker = processMessage(*msg);
+    std::unique_ptr<MessageTracker> tracker = processMessage(msg);
     if (tracker && tracker->getReply()) {
-        if (hasBucketInfo(*msg)) {
+        if (hasBucketInfo(msg)) {
             if (tracker->getReply()->getResult().success()) {
                 _env.setBucketInfo(*tracker, bucket);
             }
@@ -925,7 +926,7 @@ PersistenceThread::run(framework::ThreadHandle& thread)
         FileStorHandler::LockedMessage lock(_env._fileStorHandler.getNextMessage(_env._partition, _stripeId));
 
         if (lock.first) {
-            processMessages(lock);
+            processLockedMessage(lock);
         }
 
         vespalib::MonitorGuard flushMonitorGuard(_flushMonitor);
diff --git a/storage/src/vespa/storage/persistence/persistencethread.h b/storage/src/vespa/storage/persistence/persistencethread.h
index e331c66aeee..56414835b7b 100644
--- a/storage/src/vespa/storage/persistence/persistencethread.h
+++ b/storage/src/vespa/storage/persistence/persistencethread.h
@@ -22,7 +22,7 @@ public:
     PersistenceThread(ServiceLayerComponentRegister&, const config::ConfigUri & configUri,
                       spi::PersistenceProvider& provider, FileStorHandler& filestorHandler,
                       FileStorThreadMetrics& metrics, uint16_t deviceIndex);
-    ~PersistenceThread();
+    ~PersistenceThread() override;
 
     /** Waits for current operation to be finished. */
     void flush() override;
@@ -75,7 +75,7 @@ private:
     void handleReply(api::StorageReply&);
 
     MessageTracker::UP processMessage(api::StorageMessage& msg);
-    void processMessages(FileStorHandler::LockedMessage & lock);
+    void processLockedMessage(FileStorHandler::LockedMessage & lock);
 
     // Thread main loop
     void run(framework::ThreadHandle&) override;