From 4f9a9068e97041550f34e6160e7b8643659cc01c Mon Sep 17 00:00:00 2001
From: Javier Arribas <javiarribas@gmail.com>
Date: Wed, 5 Jul 2023 15:51:01 +0200
Subject: [PATCH] Bug fix in iio signal source and ip packet source

---
 .../gnuradio_blocks/gr_complex_ip_packet_source.cc         | 5 ++++-
 src/algorithms/signal_source/libs/ad936x_iio_custom.cc     | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc
index 04840a799..d5659d0dc 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc
@@ -19,6 +19,7 @@
 
 #include "gr_complex_ip_packet_source.h"
 #include <gnuradio/io_signature.h>
+#include <volk/volk.h>
 #include <array>
 #include <cstdint>
 #include <utility>
@@ -110,7 +111,7 @@ Gr_Complex_Ip_Packet_Source::Gr_Complex_Ip_Packet_Source(std::string src_device,
       d_pcap_thread(nullptr),
       d_src_device(std::move(src_device)),
       descr(nullptr),
-      fifo_buff(new char[FIFO_SIZE]),
+      fifo_buff(static_cast<char *>(volk_malloc(static_cast<int32_t>(FIFO_SIZE * sizeof(char)), volk_get_alignment()))),
       fifo_read_ptr(0),
       fifo_write_ptr(0),
       fifo_items(0),
@@ -297,6 +298,7 @@ void Gr_Complex_Ip_Packet_Source::pcap_callback(__attribute__((unused)) u_char *
                             if (aligned_write_items >= payload_length_bytes)
                                 {
                                     // write all in a single memcpy
+                                    gr::thread::scoped_lock guard(d_setlock);
                                     memcpy(&fifo_buff[fifo_write_ptr], &udp_payload[0], payload_length_bytes);  // size in bytes
                                     fifo_write_ptr += payload_length_bytes;
                                     if (fifo_write_ptr == FIFO_SIZE)
@@ -308,6 +310,7 @@ void Gr_Complex_Ip_Packet_Source::pcap_callback(__attribute__((unused)) u_char *
                             else
                                 {
                                     // two step wrap write
+                                    gr::thread::scoped_lock guard(d_setlock);
                                     memcpy(&fifo_buff[fifo_write_ptr], &udp_payload[0], aligned_write_items);  // size in bytes
                                     fifo_write_ptr = payload_length_bytes - aligned_write_items;
                                     memcpy(&fifo_buff[0], &udp_payload[aligned_write_items], fifo_write_ptr);  // size in bytes
diff --git a/src/algorithms/signal_source/libs/ad936x_iio_custom.cc b/src/algorithms/signal_source/libs/ad936x_iio_custom.cc
index c99dba789..e487d29b5 100644
--- a/src/algorithms/signal_source/libs/ad936x_iio_custom.cc
+++ b/src/algorithms/signal_source/libs/ad936x_iio_custom.cc
@@ -581,9 +581,11 @@ bool ad936x_iio_custom::init_config_ad9361_rx(long long bandwidth_,
     //        {
     //            std::cout << "Warning: Unable to set AD936x RX filter parameters!\n";
     //        }
+    n_channels = 0;
     if (enable_ch0 == true)
         {
-            std::cerr << "* Get AD9361 Phy RX channel 0...\n";
+            n_channels++;
+            std::cout << "* Get AD9361 Phy RX channel 0...\n";
             std::stringstream name;
             name.str("");
             name << "voltage";
@@ -634,7 +636,8 @@ bool ad936x_iio_custom::init_config_ad9361_rx(long long bandwidth_,
 
     if (enable_ch1 == true)
         {
-            std::cerr << "* Get AD9361 Phy RX channel 1...\n";
+            n_channels++;
+            std::cout << "* Get AD9361 Phy RX channel 1...\n";
             std::stringstream name;
             name.str("");
             name << "voltage";