t/gr-foo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

random: fix initialization order and cleanup

Browse Source
This commit is contained in:
Bastian Bloessl
2016-04-23 11:29:53 +02:00
parent 842db2eeea
commit 614b88275e
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/random_periodic_msg_source_impl.cc
+7 -8
View File
@@ -107,15 +107,14 @@ random_periodic_msg_source_impl::run(random_periodic_msg_source_impl *instance)
// Generate a random message // Generate a random message
pmt::pmt_t pmt::pmt_t
random_periodic_msg_source_impl::generate_msg() { random_periodic_msg_source_impl::generate_msg() {
// Construct random vector of specified length uint8_t vec[d_msg_len];
std::vector<unsigned char> vec(d_msg_len);
// Fill w/random bytes for(int i = 0; i < d_msg_len; i++) {
for( int i=0; i<d_msg_len; i++ ) { vec[i] = d_randbytes();
vec[i] = ((unsigned char) d_randbytes());
} }
// Construct the PDU
pmt::pmt_t vecpmt(pmt::make_blob(&vec[0], d_msg_len)); pmt::pmt_t blob = pmt::make_blob(vec, d_msg_len);
return pmt::cons(pmt::PMT_NIL, vecpmt); return pmt::cons(pmt::PMT_NIL, blob);
} }
void void
random_periodic_msg_source_impl::set_nmsg(int nmsg) { random_periodic_msg_source_impl::set_nmsg(int nmsg) {
lib/random_periodic_msg_source_impl.h
+1 -1
View File
@@ -39,8 +39,8 @@ namespace foo {
boost::thread *d_thread; boost::thread *d_thread;
gr::thread::mutex d_mutex; gr::thread::mutex d_mutex;
boost::mt19937 d_rng; boost::mt19937 d_rng;
boost::variate_generator< boost::mt19937, boost::uniform_int<> > d_randbytes;
boost::uniform_int<> d_brange; boost::uniform_int<> d_brange;
boost::variate_generator< boost::mt19937, boost::uniform_int<> > d_randbytes;
public: public:
random_periodic_msg_source_impl(int msg_len, random_periodic_msg_source_impl(int msg_len,