From 683e3579aa1f80f61ac1c4dff954b8f7a6d43bf7 Mon Sep 17 00:00:00 2001
From: zapek <dg@zapek.com>
Date: Wed, 3 Apr 2019 21:29:34 +0200
Subject: [PATCH 1/2] fixed wrong file hash daylight saving time warnings on
 windows

---
 libretroshare/src/file_sharing/hash_cache.cc | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/libretroshare/src/file_sharing/hash_cache.cc b/libretroshare/src/file_sharing/hash_cache.cc
index 222bb81e0..fcb20c540 100644
--- a/libretroshare/src/file_sharing/hash_cache.cc
+++ b/libretroshare/src/file_sharing/hash_cache.cc
@@ -261,14 +261,6 @@ bool HashStorage::requestHash(const std::string& full_path,uint64_t size,rstime_
     {
         it->second.time_stamp = now ;
 
-#ifdef WINDOWS_SYS
-        if(it->second.time_stamp != (uint64_t)mod_time)
-        {
-            std::cerr << "(WW) detected a 1 hour shift in file modification time. This normally happens to many files at once, when daylight saving time shifts (file=\"" << full_path << "\")." << std::endl;
-            it->second.time_stamp = (uint64_t)mod_time;
-        }
-#endif
-
         known_hash = it->second.hash;
 #ifdef HASHSTORAGE_DEBUG
         std::cerr << "Found in cache." << std::endl ;

From 3f8611f40ffded18581fbddd7707ebf4062afd3e Mon Sep 17 00:00:00 2001
From: zapek <dg@zapek.com>
Date: Sat, 6 Apr 2019 00:15:01 +0200
Subject: [PATCH 2/2] the cache is corrected and saved

---
 libretroshare/src/file_sharing/hash_cache.cc | 39 ++++++++++++++++----
 libretroshare/src/file_sharing/hash_cache.h  |  3 ++
 libretroshare/src/util/rsthreads.cc          |  2 +-
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/libretroshare/src/file_sharing/hash_cache.cc b/libretroshare/src/file_sharing/hash_cache.cc
index fcb20c540..340391f03 100644
--- a/libretroshare/src/file_sharing/hash_cache.cc
+++ b/libretroshare/src/file_sharing/hash_cache.cc
@@ -133,12 +133,7 @@ void HashStorage::data_tick()
 
                 if(!mChanged)	// otherwise it might prevent from saving the hash cache
                 {
-                    std::cerr << "Stopping hashing thread." << std::endl;
-                    shutdown();
-                    mRunning = false ;
-                    mTotalSizeToHash = 0;
-                    mTotalFilesToHash = 0;
-                    std::cerr << "done." << std::endl;
+                    stopHashThread();
                 }
 
                 RsServer::notify()->notifyHashingInfo(NOTIFY_HASHTYPE_FINISH, "") ;
@@ -261,6 +256,16 @@ bool HashStorage::requestHash(const std::string& full_path,uint64_t size,rstime_
     {
         it->second.time_stamp = now ;
 
+#ifdef WINDOWS_SYS
+        if(it->second.modf_stamp != (uint64_t)mod_time)
+        {
+            std::cerr << "(WW) detected a 1 hour shift in file modification time. This normally happens to many files at once, when daylight saving time shifts (file=\"" << full_path << "\")." << std::endl;
+            it->second.modf_stamp = (uint64_t)mod_time;
+            mChanged = true;
+            startHashThread();
+        }
+#endif
+
         known_hash = it->second.hash;
 #ifdef HASHSTORAGE_DEBUG
         std::cerr << "Found in cache." << std::endl ;
@@ -293,6 +298,13 @@ bool HashStorage::requestHash(const std::string& full_path,uint64_t size,rstime_
     mTotalSizeToHash += size ;
     ++mTotalFilesToHash;
 
+    startHashThread();
+
+    return false;
+}
+
+void HashStorage::startHashThread()
+{
     if(!mRunning)
     {
         mRunning = true ;
@@ -300,10 +312,21 @@ bool HashStorage::requestHash(const std::string& full_path,uint64_t size,rstime_
         mHashCounter = 0;
         mTotalHashedSize = 0;
 
-		start("fs hash cache") ;
+        start("fs hash cache") ;
     }
+}
 
-    return false;
+void HashStorage::stopHashThread()
+{
+    if (mRunning)
+    {
+        std::cerr << "Stopping hashing thread." << std::endl;
+        shutdown();
+        mRunning = false ;
+        mTotalSizeToHash = 0;
+        mTotalFilesToHash = 0;
+        std::cerr << "done." << std::endl;
+    }
 }
 
 void HashStorage::clean()
diff --git a/libretroshare/src/file_sharing/hash_cache.h b/libretroshare/src/file_sharing/hash_cache.h
index 3cf8f6c3a..ecf19802a 100644
--- a/libretroshare/src/file_sharing/hash_cache.h
+++ b/libretroshare/src/file_sharing/hash_cache.h
@@ -97,6 +97,9 @@ private:
      */
     void clean() ;
 
+    void startHashThread();
+    void stopHashThread();
+
     // loading/saving the entire hash database to a file
 
     void locked_save() ;
diff --git a/libretroshare/src/util/rsthreads.cc b/libretroshare/src/util/rsthreads.cc
index 1e3196036..4d6189d12 100644
--- a/libretroshare/src/util/rsthreads.cc
+++ b/libretroshare/src/util/rsthreads.cc
@@ -201,7 +201,7 @@ void RsThread::start(const std::string &threadName)
                 if(threadName.length() > 15)
                 {
 #ifdef DEBUG_THREADS
-                    THREAD_DEBUG << "RsThread::start called with to long name '" << name << "' truncating..." << std::endl;
+                    THREAD_DEBUG << "RsThread::start called with to long name '" << threadName << "' truncating..." << std::endl;
 #endif
                     RS_pthread_setname_np(mTid, threadName.substr(0, 15).c_str());
                 } else {