[hamradio-commits] [gnss-sdr] 21/303: Consume all samples in each iteration

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.

commit 838e643d51f551480ac6ec93498332707b23345a
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sat Aug 13 18:28:05 2016 +0200

    Consume all samples in each iteration
---
 .../acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc    | 2 +-
 src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc     | 4 +---
 src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.cc     | 4 +---
 .../acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc         | 2 +-
 .../acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc      | 2 +-
 .../acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc           | 2 +-
 6 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
index 13a0be9..3662ee8 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
@@ -369,7 +369,7 @@ int galileo_pcps_8ms_acquisition_cc::general_work(int noutput_items,
                     d_state = 3; // Negative acquisition
                 }
 
-            consume_each(1);
+            consume_each(ninput_items[0]);
 
             break;
         }
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc
index c48d79c..944ff0b 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc
@@ -431,9 +431,7 @@ int pcps_acquisition_cc::general_work(int noutput_items,
                         }
                 }
 
-            consume_each(1);
-
-            DLOG(INFO) << "Done. Consumed 1 item.";
+            consume_each(ninput_items[0]);
 
             break;
         }
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.cc
index 855ec01..af116f3 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.cc
@@ -431,9 +431,7 @@ int pcps_acquisition_sc::general_work(int noutput_items,
                         }
                 }
 
-            consume_each(1);
-
-            DLOG(INFO) << "Done. Consumed 1 item.";
+            consume_each(ninput_items[0]);
 
             break;
         }
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
index 23457b4..a089af5 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
@@ -393,7 +393,7 @@ int pcps_cccwsr_acquisition_cc::general_work(int noutput_items,
                     d_state = 3; // Negative acquisition
                 }
 
-            consume_each(1);
+            consume_each(ninput_items[0]);
 
             break;
         }
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
index 60fd668..0c6cd86 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
@@ -521,7 +521,7 @@ int pcps_quicksync_acquisition_cc::general_work(int noutput_items,
             volk_free(in_temp_folded);
             volk_free(in_1code);
             volk_free(corr_output);
-            consume_each(1);
+            consume_each(ninput_items[0]);
 
             break;
         }
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
index 15d6901..a698eb8 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
@@ -391,7 +391,7 @@ int pcps_tong_acquisition_cc::general_work(int noutput_items,
                 {
                     d_state = 3; // Negative acquisition
                 }
-            consume_each(1);
+            consume_each(ninput_items[0]);
 
             break;
         }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git