Fix some dataraces from tsan

variar · Apr 11, 2021 · 3001501 · 3001501
1 parent 4aeb691
commit 3001501
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/logdata/src/logdataworker.cpp b/src/logdata/src/logdataworker.cpp
@@ -143,7 +143,7 @@ void IndexingData::addAll( const QByteArray& block, LineLength length,
 
     if ( !block.isEmpty() ) {
         hash_.size += block.size();
-        
+
         const auto& config = Configuration::get();
         if ( !config.fastModificationDetection() ) {
             hashBuilder_.addData( block.data(), static_cast<size_t>( block.size() ) );
@@ -444,14 +444,14 @@ void IndexOperation::doIndex( LineOffset initialPosition )
 
             QtConcurrent::run(
                 &localThreadPool, [this, &file, &ioDuration, gw = std::ref( gateway )] {
-                    QByteArray readBuffer( IndexingBlockSize, Qt::Uninitialized );
-                    BlockData blockData;
                     while ( !file.atEnd() ) {
 
                         if ( interruptRequest_ ) {
                             break;
                         }
+                        QByteArray readBuffer( IndexingBlockSize, Qt::Uninitialized );
 
+                        BlockData blockData;
                         blockData.first = file.pos();
                         clock::time_point ioT1 = clock::now();
                         const auto readBytes = file.read( readBuffer.data(), readBuffer.size() );
@@ -497,10 +497,10 @@ void IndexOperation::doIndex( LineOffset initialPosition )
                 return tbb::flow::continue_msg{};
             }
 
-            guessEncoding( block, state );
-
             IndexingData::MutateAccessor scopedAccessor{ &indexing_data_ };
 
+            guessEncoding( block, state );
+
             if ( !block.isEmpty() ) {
                 const auto line_positions = parseDataBlock( block_beginning, block, state );
                 auto max_length = state.max_length;

diff --git a/src/utils/include/synchronization.h b/src/utils/include/synchronization.h
@@ -24,7 +24,7 @@
 #include <absl/synchronization/mutex.h>
 
 using Lock = absl::Mutex;
-using ScopedLock = absl::MutexLock;
+using ScopedLock = absl::WriterMutexLock;
 using ScopedReaderLock = absl::ReaderMutexLock;
 
 using RecursiveLock = std::recursive_mutex;