Only unlock in branch where try_lock was successful

Potential double mutex release issue.
COMBINE-lab · Aug 22, 2016 · c7e60c8 · c7e60c8
1 parent 594469d
commit c7e60c8
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/src/SalmonUtils.cpp b/src/SalmonUtils.cpp
@@ -1922,18 +1922,19 @@ Eigen::VectorXd updateEffectiveLengths(SalmonOpts& sopt, ReadExpT& readExp,
             } // end sequence-specific factor calculation
 
             if (numProcessed > nextUpdate) {
-              updateMutex.try_lock();
-              if (numProcessed > nextUpdate) {
-                sopt.jointLog->info(
-                    "processed bias for {:3.1f}% of the transcripts",
-                    100.0 *
-                        (numProcessed / static_cast<double>(numTranscripts)));
-                nextUpdate += stepSize;
-                if (nextUpdate > numTranscripts) {
-                  nextUpdate = numTranscripts - 1;
+                if (updateMutex.try_lock()) {
+                    if (numProcessed > nextUpdate) {
+                        sopt.jointLog->info(
+                                            "processed bias for {:3.1f}% of the transcripts",
+                                            100.0 *
+                                            (numProcessed / static_cast<double>(numTranscripts)));
+                        nextUpdate += stepSize;
+                        if (nextUpdate > numTranscripts) {
+                            nextUpdate = numTranscripts - 1;
+                        }
+                    }
+                    updateMutex.unlock();
                 }
-              }
-              updateMutex.unlock();
             }
             ++numProcessed;