[Commit-gnuradio] [gnuradio] 24/28: basic: set inplace on gr-basic math blocks

[git]

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

nwest pushed a commit to annotated tag gr_basic_work
in repository gnuradio.

commit 64a5ba2d413fbeaf6f24bc182172ef9013bc8e71
Author: Josh Blum <address@hidden>
Date:   Tue Nov 15 10:18:15 2011 -0800

    basic: set inplace on gr-basic math blocks
---
 gr-basic/lib/gr_basic_add.cc            |  7 ++++++-
 gr-basic/lib/gr_basic_add_const.cc      |  1 +
 gr-basic/lib/gr_basic_divide.cc         |  4 +++-
 gr-basic/lib/gr_basic_multiply.cc       | 10 +++++++++-
 gr-basic/lib/gr_basic_multiply_const.cc |  3 +++
 gr-basic/lib/gr_basic_subtract.cc       |  4 +++-
 6 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/gr-basic/lib/gr_basic_add.cc b/gr-basic/lib/gr_basic_add.cc
index 614e1d7..1d5c4dd 100644
--- a/gr-basic/lib/gr_basic_add.cc
+++ b/gr-basic/lib/gr_basic_add.cc
@@ -40,6 +40,9 @@ public:
     {
         const int alignment_multiple = volk_get_alignment() / 
(sizeof(float)*vlen);
         set_output_multiple(std::max(1, alignment_multiple));
+        //due to implementation, only first 2 ports can be inplaced
+        this->set_inplace(true, 0);
+        this->set_inplace(true, 1);
     }
 
     int work(
@@ -78,7 +81,9 @@ public:
         ),
         _vlen(vlen)
     {
-        //NOP
+        //due to implementation, only first 2 ports can be inplaced
+        this->set_inplace(true, 0);
+        this->set_inplace(true, 1);
     }
 
     int work(
diff --git a/gr-basic/lib/gr_basic_add_const.cc 
b/gr-basic/lib/gr_basic_add_const.cc
index af305d8..959282b 100644
--- a/gr-basic/lib/gr_basic_add_const.cc
+++ b/gr-basic/lib/gr_basic_add_const.cc
@@ -50,6 +50,7 @@ public:
         )
     {
         _val.resize(vlen);
+        this->set_inplace(true);
     }
 
     int work(
diff --git a/gr-basic/lib/gr_basic_divide.cc b/gr-basic/lib/gr_basic_divide.cc
index a3b1223..b79ddf1 100644
--- a/gr-basic/lib/gr_basic_divide.cc
+++ b/gr-basic/lib/gr_basic_divide.cc
@@ -39,7 +39,9 @@ public:
         ),
         _vlen(vlen)
     {
-        //NOP
+        //due to implementation, only first 2 ports can be inplaced
+        this->set_inplace(true, 0);
+        this->set_inplace(true, 1);
     }
 
     int work(
diff --git a/gr-basic/lib/gr_basic_multiply.cc 
b/gr-basic/lib/gr_basic_multiply.cc
index 770ee77..30a3537 100644
--- a/gr-basic/lib/gr_basic_multiply.cc
+++ b/gr-basic/lib/gr_basic_multiply.cc
@@ -40,6 +40,9 @@ public:
     {
         const int alignment_multiple = volk_get_alignment() / 
(sizeof(std::complex<float>)*vlen);
         set_output_multiple(std::max(1, alignment_multiple));
+        //due to implementation, only first 2 ports can be inplaced
+        this->set_inplace(true, 0);
+        this->set_inplace(true, 1);
     }
 
     int work(
@@ -79,6 +82,9 @@ public:
     {
         const int alignment_multiple = volk_get_alignment() / 
(sizeof(float)*vlen);
         set_output_multiple(std::max(1, alignment_multiple));
+        //due to implementation, only first 2 ports can be inplaced
+        this->set_inplace(true, 0);
+        this->set_inplace(true, 1);
     }
 
     int work(
@@ -117,7 +123,9 @@ public:
         ),
         _vlen(vlen)
     {
-        //NOP
+        //due to implementation, only first 2 ports can be inplaced
+        this->set_inplace(true, 0);
+        this->set_inplace(true, 1);
     }
 
     int work(
diff --git a/gr-basic/lib/gr_basic_multiply_const.cc 
b/gr-basic/lib/gr_basic_multiply_const.cc
index eb4a133..37f2575 100644
--- a/gr-basic/lib/gr_basic_multiply_const.cc
+++ b/gr-basic/lib/gr_basic_multiply_const.cc
@@ -53,6 +53,7 @@ public:
         _val.resize(1);
         const int alignment_multiple = volk_get_alignment() / (sizeof(type));
         set_output_multiple(std::max(1, alignment_multiple));
+        this->set_inplace(true);
     }
 
     int work(
@@ -97,6 +98,7 @@ public:
         _val.resize(1);
         const int alignment_multiple = volk_get_alignment() / sizeof(type);
         set_output_multiple(std::max(1, alignment_multiple));
+        this->set_inplace(true);
     }
 
     int work(
@@ -138,6 +140,7 @@ public:
         )
     {
         _val.resize(vlen);
+        this->set_inplace(true);
     }
 
     int work(
diff --git a/gr-basic/lib/gr_basic_subtract.cc 
b/gr-basic/lib/gr_basic_subtract.cc
index df46716..2476a5e 100644
--- a/gr-basic/lib/gr_basic_subtract.cc
+++ b/gr-basic/lib/gr_basic_subtract.cc
@@ -39,7 +39,9 @@ public:
         ),
         _vlen(vlen)
     {
-        //NOP
+        //due to implementation, only first 2 ports can be inplaced
+        this->set_inplace(true, 0);
+        this->set_inplace(true, 1);
     }
 
     int work(