Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pkg in tree #2

Open
wants to merge 37 commits into
base: pkg-master
Choose a base branch
from
Open

Pkg in tree #2

wants to merge 37 commits into from

Conversation

mormj
Copy link
Owner

@mormj mormj commented Mar 12, 2021

testing out in-tree packaging

GNU Radio builds done with conda do path subsitution to replace the
build prefix with the installed prefix, but it struggles when multiple
path separator styles are used in the same file. This makes it so that
all of the paths that would be subsitituted use the same style (forward
slash separators) so that build prefix replacement happens correctly.

Signed-off-by: Ryan Volz <ryan.volz@gmail.com>
ZackerySpytz and others added 11 commits March 13, 2021 13:13
Signed-off-by: Zackery Spytz <zspytz@gmail.com>
Where std::filesystem is used to allow linking properly on Debian and
Centos 8

Signed-off-by: Josh Morman <jmorman@perspectalabs.com>
Signed-off-by: Josh Morman <jmorman@perspectalabs.com>
Signed-off-by: Ron Economos <w6rz@comcast.net>
…n win

Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
…4279)

1. Add option to show variable name only
2. Add option to show variable name and value
3. default to traditional behavior

Signed-off-by: Jason Uher <jason.uher@jhuapl.edu>
The multi_usrp behaviour is deprecated.

Signed-off-by: Martin Braun <martin.braun@ettus.com>
Rather than adding/searching for tags, just put plinfo on its own
streaming port.  This should be more efficient than putting tags on
every item.

Signed-off-by: Josh Morman <jmorman@perspectalabs.com>
Signed-off-by: Josh Morman <jmorman@perspectalabs.com>
Signed-off-by: Josh Morman <jmorman@perspectalabs.com>
uhd_fft and uhd_siggen_gui are standalone apps that, a long time ago,
were spun off from GRC apps. In the last years, there were some fixes to
Qt apps that haven't yet made it into these two UHD apps:

- 0cc238f: Better terminate handling
- 40f5e6c: XInitThreads() as early as possible. This was accidentally
  moved downwards as part of refactoring in 77871a9.

Signed-off-by: Martin Braun <martin.braun@ettus.com>
@mormj mormj force-pushed the pkg-in-tree branch 2 times, most recently from 72cf0dd to 5aac755 Compare March 16, 2021 18:41
ThomasHabets and others added 5 commits March 16, 2021 15:14
Problem introduced in
4b7006d. `d_cbuffers` and `d_buffers`
are not the same size.

It appears to be the only instance of this mistake in that commit.

Fixes: gnuradio#4396
Signed-off-by: Thomas Habets <habets@google.com>
Fixes gnuradio#4402

Signed-off-by: Thomas Habets <habets@google.com>
Signed-off-by: Volker Schroer <3470424+dl1ksv@users.noreply.github.com>
Signed-off-by: Ron Economos <w6rz@comcast.net>
The phase-relations plot didn't specify a handle for the Qt parent,
which used to be OK (it would default to None) but no longer is.

Signed-off-by: Martin Braun <martin@gnuradio.org>
Jacob Gilbert and others added 7 commits March 18, 2021 16:35
There is only one simple block in here for now, and there are probably
some doxygen issues but it builds and tests properly.

Signed-off-by: Jacob Gilbert <jacob.gilbert@protonmail.com>
Moving the following from gr::blocks into gr-pdu:
  - pdu_filter block
  - pdu_remove block
  - pdu_set block
  - pdu_to_tagged_stream block
  - random_pdu block
  - tagged_stream_to_pdu block

Moving the following from gr::blocks into gr-network:
  - socket_pdu block
  - stream_pdu_base (noblock)
  - tcp_connection (noblock)
  - tuntap_pdu block

Moving the following from gr::blocks into gr:
  - pdu (noblock, general PDU functions)

Signed-off-by: Jacob Gilbert <jacob.gilbert@protonmail.com>
The following have been moved to the new gr::pdu module or to
gr::network and are no longer needed in gr::blocks:
  - pdu (noblock)
  - pdu_filter block
  - pdu_remove block
  - pdu_set block
  - pdu_to_tagged_stream block
  - random_pdu block
  - socket_pdu block
  - stream_pdu_base (noblock)
  - tagged_stream_to_pdu block
  - tcp_connection (noblock)
  - tuntap_pdu block

The digital and FEC modules had a large number of references to the PDU
blocks that were moved from gr-blocks to gr-pdu, this updates these
changes in example flowgraphs and a few python files. The usage-manual
update will be propagated to the wiki so that future exports will remain
up to date.

Signed-off-by: Jacob Gilbert <jacob.gilbert@protonmail.com>
The functionality in pdu.h has been moved go gnuradio runtime and is
not needed in gr-pdu anymore.

Signed-off-by: Jacob Gilbert <jacob.gilbert@protonmail.com>
These are not used yet but are valid PDUs and should be included here
so as not to imply PDUs can have only byte/float/complex type uvec's

Signed-off-by: Jacob Gilbert <jacob.gilbert@protonmail.com>
Signed-off-by: Ron Economos <w6rz@comcast.net>
Signed-off-by: Ron Economos <w6rz@comcast.net>
marcusmueller and others added 13 commits March 20, 2021 18:45
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
This seems to be a common confusion, so let's alleviate the confusion by
letting users know what CMake does and why failing to find GMP is not a
problem when MPIR is present.

Since we preferred GMP over MPIR anyways, only check for MPIR if GMP
detection fails.

Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
Signed-off-by: Josh Morman <jmorman@perspectalabs.com>
Signed-off-by: Volker Schroer <3470424+dl1ksv@users.noreply.github.com>
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
revert Calculate checkbox index from wintype string

This reverts commit 96d590b.

Signed-off-by: Josh Morman <jmorman@perspectalabs.com>
Signed-off-by: Josh Morman <jmorman@perspectalabs.com>
mormj pushed a commit that referenced this pull request Dec 3, 2021
ERROR: AddressSanitizer: alloc-dealloc-mismatch (operator new [] vs operator delete) on 0x631000028800
    #0 0x7f87c88129d7 in operator delete(void*, unsigned long) (/lib64/libasan.so.6+0xad9d7)
    #1 0x7f87c5378c57 in std::default_delete<char>::operator()(char*) const /usr/include/c++/10/bits/unique_ptr.h:85
    #2 0x7f87c5378c57 in std::unique_ptr<char, std::default_delete<char> >::~unique_ptr() /usr/include/c++/10/bits/unique_ptr.h:361
    #3 0x7f87c5378c57 in gr::host_buffer::~host_buffer() /home/user/src/gnuradio/gnuradio-runtime/lib/host_buffer.cc:65
    #4 0x7f87c5384654 in gr::host_buffer::~host_buffer() /home/user/src/gnuradio/gnuradio-runtime/lib/host_buffer.cc:65

0x631000028800 is located 0 bytes inside of 65536-byte region [0x631000028800,0x631000038800)
allocated by thread T0 here:
    #0 0x7f87c8811cb7 in operator new[](unsigned long) (/lib64/libasan.so.6+0xaccb7)
    #1 0x7f87c5377a7a in gr::host_buffer::do_allocate_buffer(unsigned long, unsigned long) /home/user/src/gnuradio/gnuradio-runtime/lib/host_buffer.cc:123
    #2 0x7f87c56deebf  (/home/user/src/gnuradio/build/gnuradio-runtime/lib/libgnuradio-runtime.so.3.10.0git+0x3475ebf)

Signed-off-by: Vasil Velichkov <vvvelichkov@gmail.com>
mormj pushed a commit that referenced this pull request Dec 3, 2021
ERROR: AddressSanitizer: alloc-dealloc-mismatch (operator new [] vs operator delete) on 0x631000014800
    #0 0x7ffbdc10f9d7 in operator delete(void*, unsigned long) (/lib64/libasan.so.6+0xad9d7)
    #1 0x7ffbd8a6646f in std::default_delete<char>::operator()(char*) const /usr/include/c++/10/bits/unique_ptr.h:85
    #2 0x7ffbd8a6646f in std::unique_ptr<char, std::default_delete<char> >::~unique_ptr() /usr/include/c++/10/bits/unique_ptr.h:361
    #3 0x7ffbd8a6646f in gr::buffer_single_mapped::~buffer_single_mapped() /home/user/src/gnuradio/gnuradio-runtime/lib/buffer_single_mapped.cc:46
    #4 0x7ffbd8c805c4 in gr::host_buffer::~host_buffer() /home/user/src/gnuradio/gnuradio-runtime/lib/host_buffer.cc:65

0x631000014800 is located 0 bytes inside of 65536-byte region [0x631000014800,0x631000024800)
allocated by thread T0 here:
    #0 0x7ffbdc10ecb7 in operator new[](unsigned long) (/lib64/libasan.so.6+0xaccb7)
    #1 0x7ffbd8c73a60 in gr::host_buffer::do_allocate_buffer(unsigned long, unsigned long) /home/user/src/gnuradio/gnuradio-runtime/lib/host_buffer.cc:119
    #2 0x7ffbd8fdaebf  (/home/user/src/gnuradio/build/gnuradio-runtime/lib/libgnuradio-runtime.so.3.10.0git+0x3475ebf)

Signed-off-by: Vasil Velichkov <vvvelichkov@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants