summaryrefslogtreecommitdiff
path: root/gnuradio-core/src
diff options
context:
space:
mode:
Diffstat (limited to 'gnuradio-core/src')
-rw-r--r--gnuradio-core/src/lib/CMakeLists.txt18
-rw-r--r--gnuradio-core/src/lib/general/gr_tag_debug.cc4
-rw-r--r--gnuradio-core/src/lib/io/gr_pdu.cc24
-rw-r--r--gnuradio-core/src/lib/io/gr_pdu.h2
-rw-r--r--gnuradio-core/src/lib/io/gr_pdu.i2
-rw-r--r--gnuradio-core/src/lib/io/gr_socket_pdu.h1
-rw-r--r--gnuradio-core/src/lib/io/gr_stream_pdu_base.cc6
-rw-r--r--gnuradio-core/src/lib/runtime/gr_basic_block.h8
-rw-r--r--gnuradio-core/src/lib/runtime/gr_complex.h14
-rw-r--r--gnuradio-core/src/lib/swig/CMakeLists.txt8
-rwxr-xr-xgnuradio-core/src/python/gnuradio/gr/qa_pdu.py4
-rw-r--r--gnuradio-core/src/tests/CMakeLists.txt17
12 files changed, 61 insertions, 47 deletions
diff --git a/gnuradio-core/src/lib/CMakeLists.txt b/gnuradio-core/src/lib/CMakeLists.txt
index 9c980157d..89a1bad88 100644
--- a/gnuradio-core/src/lib/CMakeLists.txt
+++ b/gnuradio-core/src/lib/CMakeLists.txt
@@ -41,14 +41,18 @@ list(APPEND test_gnuradio_core_sources bug_work_around_6.cc)
########################################################################
# Setup the include and linker paths
########################################################################
-include_directories(${GNURADIO_CORE_INCLUDE_DIRS})
-include_directories(${VOLK_INCLUDE_DIRS})
-
-include_directories(${Boost_INCLUDE_DIRS})
-link_directories(${Boost_LIBRARY_DIRS})
+include_directories(
+ ${GNURADIO_CORE_INCLUDE_DIRS}
+ ${VOLK_INCLUDE_DIRS}
+ ${GRUEL_INCLUDE_DIRS}
+ ${Boost_INCLUDE_DIRS}
+ ${FFTW3F_INCLUDE_DIRS}
+)
-include_directories(${FFTW3F_INCLUDE_DIRS})
-link_directories(${FFTW3F_LIBRARY_DIRS})
+link_directories(
+ ${Boost_LIBRARY_DIRS}
+ ${FFTW3F_LIBRARY_DIRS}
+)
########################################################################
# Setup library
diff --git a/gnuradio-core/src/lib/general/gr_tag_debug.cc b/gnuradio-core/src/lib/general/gr_tag_debug.cc
index 5833a1891..ecf1b65e1 100644
--- a/gnuradio-core/src/lib/general/gr_tag_debug.cc
+++ b/gnuradio-core/src/lib/general/gr_tag_debug.cc
@@ -81,10 +81,10 @@ gr_tag_debug::work(int noutput_items,
get_tags_in_range(d_tags, i, abs_N, end_N);
if(d_display) {
- sout << "Input Stream: " << i << std::endl;
+ sout << "Input Stream: " << std::setw(2) << std::setfill('0') << i << std::setfill(' ') << std::endl;
for(d_tags_itr = d_tags.begin(); d_tags_itr != d_tags.end(); d_tags_itr++) {
sout << std::setw(10) << "Offset: " << d_tags_itr->offset
- << std::setw(10) << "Source: " << pmt::pmt_symbol_to_string(d_tags_itr->srcid)
+ << std::setw(10) << "Source: " << (pmt::pmt_is_symbol(d_tags_itr->srcid) ? pmt::pmt_symbol_to_string(d_tags_itr->srcid) : "n/a")
<< std::setw(10) << "Key: " << pmt::pmt_symbol_to_string(d_tags_itr->key)
<< std::setw(10) << "Value: ";
sout << d_tags_itr->value << std::endl;
diff --git a/gnuradio-core/src/lib/io/gr_pdu.cc b/gnuradio-core/src/lib/io/gr_pdu.cc
index b2757c307..302fd7b9b 100644
--- a/gnuradio-core/src/lib/io/gr_pdu.cc
+++ b/gnuradio-core/src/lib/io/gr_pdu.cc
@@ -29,11 +29,11 @@
size_t
gr_pdu_itemsize(gr_pdu_vector_type type){
switch(type){
- case BYTE:
+ case pdu_byte:
return 1;
- case FLOAT:
+ case pdu_float:
return sizeof(float);
- case COMPLEX:
+ case pdu_complex:
return sizeof(gr_complex);
default:
throw std::runtime_error("bad type!");
@@ -43,11 +43,11 @@ gr_pdu_itemsize(gr_pdu_vector_type type){
bool
gr_pdu_type_matches(gr_pdu_vector_type type, pmt::pmt_t v){
switch(type){
- case BYTE:
+ case pdu_byte:
return pmt::pmt_is_u8vector(v);
- case FLOAT:
+ case pdu_float:
return pmt::pmt_is_f32vector(v);
- case COMPLEX:
+ case pdu_complex:
return pmt::pmt_is_c32vector(v);
default:
throw std::runtime_error("bad type!");
@@ -57,11 +57,11 @@ gr_pdu_type_matches(gr_pdu_vector_type type, pmt::pmt_t v){
pmt::pmt_t
gr_pdu_make_vector(gr_pdu_vector_type type, const uint8_t* buf, size_t items){
switch(type){
- case BYTE:
+ case pdu_byte:
return pmt::pmt_init_u8vector(items, buf);
- case FLOAT:
+ case pdu_float:
return pmt::pmt_init_f32vector(items, (const float*)buf);
- case COMPLEX:
+ case pdu_complex:
return pmt::pmt_init_c32vector(items, (const gr_complex*)buf);
default:
throw std::runtime_error("bad type!");
@@ -70,10 +70,10 @@ gr_pdu_make_vector(gr_pdu_vector_type type, const uint8_t* buf, size_t items){
gr_pdu_vector_type type_from_pmt(pmt::pmt_t vector){
if(pmt_is_u8vector(vector))
- return BYTE;
+ return pdu_byte;
if(pmt_is_f32vector(vector))
- return FLOAT;
+ return pdu_float;
if(pmt_is_c32vector(vector))
- return COMPLEX;
+ return pdu_complex;
throw std::runtime_error("bad type!");
}
diff --git a/gnuradio-core/src/lib/io/gr_pdu.h b/gnuradio-core/src/lib/io/gr_pdu.h
index 5ed9cdded..a5ae87db7 100644
--- a/gnuradio-core/src/lib/io/gr_pdu.h
+++ b/gnuradio-core/src/lib/io/gr_pdu.h
@@ -29,7 +29,7 @@
#define pdu_port_id pmt::mp("pdus")
#define pdu_length_tag pmt::mp("pdu_length")
-enum gr_pdu_vector_type { BYTE, FLOAT, COMPLEX };
+enum gr_pdu_vector_type { pdu_byte, pdu_float, pdu_complex };
size_t gr_pdu_itemsize(gr_pdu_vector_type type);
bool gr_pdu_type_matches(gr_pdu_vector_type type, pmt::pmt_t v);
diff --git a/gnuradio-core/src/lib/io/gr_pdu.i b/gnuradio-core/src/lib/io/gr_pdu.i
index 7cb3c62c7..ada3a63a7 100644
--- a/gnuradio-core/src/lib/io/gr_pdu.i
+++ b/gnuradio-core/src/lib/io/gr_pdu.i
@@ -24,7 +24,7 @@
#include <gr_pdu.h>
%}
-enum gr_pdu_vector_type { BYTE, FLOAT, COMPLEX };
+enum gr_pdu_vector_type { pdu_byte, pdu_float, pdu_complex };
diff --git a/gnuradio-core/src/lib/io/gr_socket_pdu.h b/gnuradio-core/src/lib/io/gr_socket_pdu.h
index f554febdc..e30a4cc6c 100644
--- a/gnuradio-core/src/lib/io/gr_socket_pdu.h
+++ b/gnuradio-core/src/lib/io/gr_socket_pdu.h
@@ -28,6 +28,7 @@
#include <gr_message.h>
#include <gr_msg_queue.h>
#include <gr_stream_pdu_base.h>
+#include <boost/array.hpp>
#include <boost/asio.hpp>
class gr_socket_pdu;
diff --git a/gnuradio-core/src/lib/io/gr_stream_pdu_base.cc b/gnuradio-core/src/lib/io/gr_stream_pdu_base.cc
index cff7296cb..7250c33e5 100644
--- a/gnuradio-core/src/lib/io/gr_stream_pdu_base.cc
+++ b/gnuradio-core/src/lib/io/gr_stream_pdu_base.cc
@@ -24,6 +24,7 @@
#include "config.h"
#endif
+#include <ciso646>
#include <gr_stream_pdu_base.h>
#include <gr_io_signature.h>
#include <cstdio>
@@ -35,8 +36,13 @@
#include <string.h>
#include <iostream>
#include <gr_pdu.h>
+#include <boost/asio.hpp>
#include <boost/format.hpp>
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
+
static const long timeout_us = 100*1000; //100ms
gr_stream_pdu_base::gr_stream_pdu_base (int MTU)
diff --git a/gnuradio-core/src/lib/runtime/gr_basic_block.h b/gnuradio-core/src/lib/runtime/gr_basic_block.h
index f3b7b835b..9cc2ad775 100644
--- a/gnuradio-core/src/lib/runtime/gr_basic_block.h
+++ b/gnuradio-core/src/lib/runtime/gr_basic_block.h
@@ -142,9 +142,9 @@ class GR_CORE_API gr_basic_block : public gr_msg_accepter, public boost::enable_
void message_port_sub(pmt::pmt_t port_id, pmt::pmt_t target);
void message_port_unsub(pmt::pmt_t port_id, pmt::pmt_t target);
- virtual bool message_port_is_hier(pmt::pmt_t port_id) { std::cout << "is_hier\n"; return false; }
- virtual bool message_port_is_hier_in(pmt::pmt_t port_id) { std::cout << "is_hier_in\n"; return false; }
- virtual bool message_port_is_hier_out(pmt::pmt_t port_id) { std::cout << "is_hier_out\n"; return false; }
+ virtual bool message_port_is_hier(pmt::pmt_t port_id) { (void) port_id; std::cout << "is_hier\n"; return false; }
+ virtual bool message_port_is_hier_in(pmt::pmt_t port_id) { (void) port_id; std::cout << "is_hier_in\n"; return false; }
+ virtual bool message_port_is_hier_out(pmt::pmt_t port_id) { (void) port_id; std::cout << "is_hier_out\n"; return false; }
/*!
* \brief Get input message port names.
@@ -224,7 +224,7 @@ class GR_CORE_API gr_basic_block : public gr_msg_accepter, public boost::enable_
* This check is in addition to the constraints specified by the input
* and output gr_io_signatures.
*/
- virtual bool check_topology(int ninputs, int noutputs) { return true; }
+ virtual bool check_topology(int ninputs, int noutputs) { (void) ninputs; (void) noutputs; return true; }
/*!
* \brief Set the callback that is fired when messages are available.
diff --git a/gnuradio-core/src/lib/runtime/gr_complex.h b/gnuradio-core/src/lib/runtime/gr_complex.h
index 758002106..58d1525b4 100644
--- a/gnuradio-core/src/lib/runtime/gr_complex.h
+++ b/gnuradio-core/src/lib/runtime/gr_complex.h
@@ -27,13 +27,13 @@ typedef std::complex<float> gr_complex;
typedef std::complex<double> gr_complexd;
-inline bool is_complex (gr_complex x) { return true;}
-inline bool is_complex (gr_complexd x) { return true;}
-inline bool is_complex (float x) { return false;}
-inline bool is_complex (double x) { return false;}
-inline bool is_complex (int x) { return false;}
-inline bool is_complex (char x) { return false;}
-inline bool is_complex (short x) { return false;}
+inline bool is_complex (gr_complex x) { (void) x; return true;}
+inline bool is_complex (gr_complexd x) { (void) x; return true;}
+inline bool is_complex (float x) { (void) x; return false;}
+inline bool is_complex (double x) { (void) x; return false;}
+inline bool is_complex (int x) { (void) x; return false;}
+inline bool is_complex (char x) { (void) x; return false;}
+inline bool is_complex (short x) { (void) x; return false;}
// this doesn't really belong here, but there are worse places for it...
diff --git a/gnuradio-core/src/lib/swig/CMakeLists.txt b/gnuradio-core/src/lib/swig/CMakeLists.txt
index 734547131..d8a64cc0f 100644
--- a/gnuradio-core/src/lib/swig/CMakeLists.txt
+++ b/gnuradio-core/src/lib/swig/CMakeLists.txt
@@ -21,16 +21,16 @@
include(GrPython)
include(GrSwig)
-include_directories(${Boost_INCLUDE_DIRS})
-link_directories(${Boost_LIBRARY_DIRS})
-
set(GR_SWIG_INCLUDE_DIRS
${CMAKE_CURRENT_BINARY_DIR}
- ${GRUEL_INCLUDE_DIRS}
${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+ ${GRUEL_INCLUDE_DIRS}
+ ${Boost_INCLUDE_DIRS}
)
set(GR_SWIG_LIBRARIES gnuradio-core)
+link_directories(${Boost_LIBRARY_DIRS})
+
########################################################################
# Build and install the swig targets
########################################################################
diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_pdu.py b/gnuradio-core/src/python/gnuradio/gr/qa_pdu.py
index ebc365b61..572d8b186 100755
--- a/gnuradio-core/src/python/gnuradio/gr/qa_pdu.py
+++ b/gnuradio-core/src/python/gnuradio/gr/qa_pdu.py
@@ -36,8 +36,8 @@ class test_pdu(gr_unittest.TestCase):
# Just run some data through and make sure it doesn't puke.
src_data = (1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
- src = gr.pdu_to_tagged_stream(gr.BYTE)
- snk3 = gr.tagged_stream_to_pdu(gr.BYTE)
+ src = gr.pdu_to_tagged_stream(gr.pdu_byte)
+ snk3 = gr.tagged_stream_to_pdu(gr.pdu_byte)
snk2 = gr.vector_sink_b()
snk = gr.tag_debug(1, "test")
diff --git a/gnuradio-core/src/tests/CMakeLists.txt b/gnuradio-core/src/tests/CMakeLists.txt
index 680141e7b..dbd52f05c 100644
--- a/gnuradio-core/src/tests/CMakeLists.txt
+++ b/gnuradio-core/src/tests/CMakeLists.txt
@@ -24,14 +24,17 @@ GR_CHECK_HDR_N_DEF(sys/resource.h HAVE_SYS_RESOURCE_H)
########################################################################
# Setup the include and linker paths
########################################################################
-include_directories(${GRUEL_INCLUDE_DIRS})
-include_directories(${GNURADIO_CORE_INCLUDE_DIRS})
-
-include_directories(${Boost_INCLUDE_DIRS})
-link_directories(${Boost_LIBRARY_DIRS})
+include_directories(
+ ${GNURADIO_CORE_INCLUDE_DIRS}
+ ${GRUEL_INCLUDE_DIRS}
+ ${Boost_INCLUDE_DIRS}
+ ${CPPUNIT_INCLUDE_DIRS}
+)
-include_directories(${CPPUNIT_INCLUDE_DIRS})
-link_directories(${CPPUNIT_LIBRARY_DIRS})
+link_directories(
+ ${Boost_LIBRARY_DIRS}
+ ${CPPUNIT_LIBRARY_DIRS}
+)
########################################################################
# Build benchmarks and non-registered tests
generated by cgit (git 2.34.1) at 2025-06-26 03:05:37 +0000