Merge pull request #378 from albertoesmp/devel

Fine-tuning performance
3dgeo-heidelberg · Oct 5, 2023 · 4d0c4d3 · 4d0c4d3
2 parents 6818014 + d4a8449
commit 4d0c4d3
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 14 deletions.
diff --git a/src/main/helios_version.cpp b/src/main/helios_version.cpp
@@ -4,7 +4,7 @@
 
 const char * HELIOS_VERSION = "1.2.0";
 
-const char * HELIOS_GIT_HASH = "5cba90e3";
+const char * HELIOS_GIT_HASH = "3d0656db";
 
 const char * getHeliosVersion(){
     return HELIOS_VERSION;

diff --git a/src/scanner/MultiScanner.cpp b/src/scanner/MultiScanner.cpp
@@ -160,7 +160,7 @@ Rotation MultiScanner::calcAbsoluteBeamAttitude(size_t const idx){
 }
 void MultiScanner::computeSubrays(
     std::function<void(
-        Rotation &subrayRotation,
+        Rotation const &subrayRotation,
         double const divergenceAngle,
         NoiseSource<double> &intersectionHandlingNoiseSource,
         std::map<double, double> &reflections,

diff --git a/src/scanner/MultiScanner.h b/src/scanner/MultiScanner.h
@@ -157,7 +157,7 @@ class MultiScanner : public Scanner{
      */
     void computeSubrays(
         std::function<void(
-            Rotation &subrayRotation,
+            Rotation const &subrayRotation,
             double const divergenceAngle,
             NoiseSource<double> &intersectionHandlingNoiseSource,
             std::map<double, double> &reflections,

diff --git a/src/scanner/Scanner.h b/src/scanner/Scanner.h
@@ -440,7 +440,8 @@ class Scanner : public Asset {
      */
     virtual void computeSubrays(
         std::function<void(
-            Rotation &subrayRotation,
+            Rotation const
+            &subrayRotation,
             double const divergenceAngle,
             NoiseSource<double> &intersectionHandlingNoiseSource,
             std::map<double, double> &reflections,

diff --git a/src/scanner/ScanningDevice.cpp b/src/scanner/ScanningDevice.cpp
@@ -255,7 +255,7 @@ Rotation ScanningDevice::calcExactAbsoluteBeamAttitude(
 
 void ScanningDevice::computeSubrays(
     std::function<void(
-        Rotation &subrayRotation,
+        Rotation const &subrayRotation,
         double const divergenceAngle,
         NoiseSource<double> &intersectionHandlingNoiseSource,
         std::map<double, double> &reflections,

diff --git a/src/scanner/ScanningDevice.h b/src/scanner/ScanningDevice.h
@@ -317,7 +317,7 @@ class ScanningDevice : public Asset {
      */
     void computeSubrays(
         std::function<void(
-            Rotation &subrayRotation,
+            Rotation const &subrayRotation,
             double const divergenceAngle,
             NoiseSource<double> &intersectionHandlingNoiseSource,
             std::map<double, double> &reflections,

diff --git a/src/scanner/SingleScanner.cpp b/src/scanner/SingleScanner.cpp
@@ -196,7 +196,7 @@ Rotation SingleScanner::calcAbsoluteBeamAttitude(size_t const idx) {
 }
 void SingleScanner::computeSubrays(
     std::function<void(
-        Rotation &subrayRotation,
+        Rotation const &subrayRotation,
         double const divergenceAngle,
         NoiseSource<double> &intersectionHandlingNoiseSource,
         std::map<double, double> &reflections,

diff --git a/src/scanner/SingleScanner.h b/src/scanner/SingleScanner.h
@@ -130,7 +130,7 @@ class SingleScanner : public Scanner{
      */
     void computeSubrays(
         std::function<void(
-            Rotation &subrayRotation,
+            Rotation const &subrayRotation,
             double const divergenceAngle,
             NoiseSource<double> &intersectionHandlingNoiseSource,
             std::map<double, double> &reflections,

diff --git a/src/scanner/detector/FullWaveformPulseRunnable.cpp b/src/scanner/detector/FullWaveformPulseRunnable.cpp
@@ -121,7 +121,7 @@ void FullWaveformPulseRunnable::computeSubrays(
 ){
     scanner->computeSubrays(
         [&] (
-            Rotation &subrayRotation,
+            Rotation const &subrayRotation,
             double const divergenceAngle,
             NoiseSource<double> &intersectionHandlingNoiseSource,
             std::map<double, double> &reflections,
@@ -155,7 +155,7 @@ void FullWaveformPulseRunnable::computeSubrays(
 }
 
 void FullWaveformPulseRunnable::handleSubray(
-    Rotation &subrayRotation,
+    Rotation const &subrayRotation,
     double const divergenceAngle,
     NoiseSource<double> &intersectionHandlingNoiseSource,
     map<double, double> &reflections,
@@ -239,7 +239,7 @@ void FullWaveformPulseRunnable::handleSubray(
             double intensity = 0.0;
             if (intersect->prim->canComputeSigmaWithLadLut()) {
                 // LadLut based intensity computation
-                double sigma = intersect->prim->computeSigmaWithLadLut(
+                double const sigma = intersect->prim->computeSigmaWithLadLut(
                     subrayDirection
                 );
                 intensity = scanner->calcIntensity(

diff --git a/src/scanner/detector/FullWaveformPulseRunnable.h b/src/scanner/detector/FullWaveformPulseRunnable.h
@@ -103,7 +103,7 @@ class FullWaveformPulseRunnable : public AbstractPulseRunnable {
      * @see FullWaveformPulseRunnable::computeSubrays
      */
     void handleSubray(
-        Rotation &subrayRotation,
+        Rotation const &subrayRotation,
         double const divergenceAngle,
         NoiseSource<double> &intersectionHandlingNoiseSource,
         std::map<double, double> &reflections,

diff --git a/src/util/Yielder.h b/src/util/Yielder.h
@@ -70,8 +70,18 @@ class Yielder{
     inline void push(T const &elem){
         mtx.lock();
         buffer.push_back(elem);
-        mtx.unlock();
-        if(buffer.size() >= bufferSize) yield();
+        if(buffer.size() >= bufferSize){
+            // Copy what must be written before releasing the mutex
+            vector<T> copy = copyBuffer();
+            // Empty buffer before releasing the mutex
+            buffer.clear();
+            mtx.unlock();
+            // Digest temporal copy
+            digest(copy);
+        }
+        else{
+            mtx.unlock();
+        }
     }
 
     /**