1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
|
From cf829649d66a3b876b8e5077919f42f062349e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20M=C3=BCller?= <mmueller@gnuradio.org>
Date: Sun, 8 Jun 2025 18:01:46 +0200
Subject: [PATCH 27/41] Revert "blocks/patterned interleaver: thread-unsafe
members inaccessible, flexible io"
"This commit should not be backported" (oops.)
This reverts commit 800ff1f50b5a7e0badd28fc9efe422c97a4fc7b7.
---
gr-blocks/lib/patterned_interleaver_impl.cc | 59 +++------------------
gr-blocks/lib/patterned_interleaver_impl.h | 18 ++++---
2 files changed, 20 insertions(+), 57 deletions(-)
diff --git a/gr-blocks/lib/patterned_interleaver_impl.cc b/gr-blocks/lib/patterned_interleaver_impl.cc
index 88e5e0d246..299d765eb5 100644
--- a/gr-blocks/lib/patterned_interleaver_impl.cc
+++ b/gr-blocks/lib/patterned_interleaver_impl.cc
@@ -11,7 +11,6 @@
#include "patterned_interleaver_impl.h"
#include <gnuradio/io_signature.h>
-#include <algorithm>
namespace gr {
namespace blocks {
@@ -22,49 +21,19 @@ patterned_interleaver::sptr patterned_interleaver::make(size_t itemsize,
return gnuradio::make_block_sptr<patterned_interleaver_impl>(itemsize, pattern);
}
-namespace {
-template <typename T>
-constexpr typename T::value_type pattern_max(const T& pattern)
-{
- if (pattern.empty()) {
- return -1;
- }
- return *std::max_element(pattern.cbegin(), pattern.cend());
-}
-
-template <typename T>
-auto pattern_to_iosig(const T& pattern, size_t itemsize)
-{
- if (pattern.empty()) {
- return gr::io_signature::make(0, 0, itemsize);
- }
- auto size = pattern_max(pattern) + 1;
- return gr::io_signature::make(size, gr::io_signature::IO_INFINITE, itemsize);
-}
-
-template <typename T>
-constexpr std::vector<typename T::value_type> pattern_to_count(const T& pattern)
-{
- if (pattern.empty()) {
- return {};
- }
- T counts(pattern_max(pattern) + 1);
- for (const auto& idx : pattern) {
- counts[idx]++;
- }
- return counts;
-}
-} // namespace
-
patterned_interleaver_impl::patterned_interleaver_impl(size_t itemsize,
std::vector<int> pattern)
: block("patterned_interleaver",
- pattern_to_iosig(pattern, itemsize),
+ io_signature::make(
+ pattern_max(pattern) + 1, pattern_max(pattern) + 1, itemsize),
io_signature::make(1, 1, itemsize)),
d_pattern(pattern),
- d_counts(pattern_to_count(pattern)),
+ d_counts(pattern_max(pattern) + 1, 0),
d_itemsize(itemsize)
{
+ for (const auto& i : d_pattern) {
+ d_counts[i]++;
+ }
set_output_multiple(d_pattern.size());
}
@@ -73,11 +42,9 @@ int patterned_interleaver_impl::general_work(int noutput_items,
gr_vector_const_void_star& input_items,
gr_vector_void_star& output_items)
{
- int items_left;
- unsigned int nblks;
+ const size_t nblks = noutput_items / d_pattern.size();
- for (items_left = noutput_items, nblks = 0; items_left > 0;
- items_left -= d_pattern.size(), nblks++) {
+ for (size_t i = 0; i < nblks; i++) {
for (const auto input_idx : d_pattern) {
memcpy(output_items[0], input_items[input_idx], d_itemsize);
reinterpret_cast<const char*&>(input_items[input_idx]) += d_itemsize;
@@ -100,15 +67,5 @@ void patterned_interleaver_impl::forecast(int noutput_items,
}
}
-bool patterned_interleaver_impl::check_topology(int ninput, int noutput)
-{
- if (noutput != 1) {
- return false;
- }
- /* it's not OK to have fewer inputs connected than our maximum input index, but more
- * might be OK */
- return static_cast<size_t>(ninput) >= d_counts.size();
-}
-
} /* namespace blocks */
} /* namespace gr */
diff --git a/gr-blocks/lib/patterned_interleaver_impl.h b/gr-blocks/lib/patterned_interleaver_impl.h
index 2a93c0add5..9de0fe5141 100644
--- a/gr-blocks/lib/patterned_interleaver_impl.h
+++ b/gr-blocks/lib/patterned_interleaver_impl.h
@@ -1,7 +1,6 @@
/* -*- c++ -*- */
/*
* Copyright 2012 Free Software Foundation, Inc.
- * Copyright 2025 Marcus Müller
*
* This file is part of GNU Radio
*
@@ -13,6 +12,7 @@
#define INCLUDED_PATTERNED_INTERLEAVER_IMPL_H
#include <gnuradio/blocks/patterned_interleaver.h>
+#include <algorithm>
namespace gr {
namespace blocks {
@@ -27,13 +27,19 @@ public:
gr_vector_const_void_star& input_items,
gr_vector_void_star& output_items) override;
+ static int pattern_max(std::vector<int> pattern)
+ {
+ if (pattern.empty()) {
+ return 0;
+ }
+ return *std::max_element(pattern.begin(), pattern.end());
+ }
+
void forecast(int noutput_items, gr_vector_int& ninput_items_required) override;
- bool check_topology(int ninput, int noutputs) override;
-private:
- const std::vector<int> d_pattern;
- const std::vector<int> d_counts;
- const size_t d_itemsize;
+ std::vector<int> d_pattern;
+ std::vector<int> d_counts;
+ size_t d_itemsize;
};
} /* namespace blocks */
--
2.47.3
|
