diff options
| author | Sylvain Munaut <tnt@246tNt.com> | 2016-01-27 12:58:50 +0100 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-01-27 10:31:26 -0800 |
| commit | 6e482c5bb6bf49f000f6b8d35a1ca84127e38c46 (patch) | |
| tree | ee9e4e3323da08dfabe91257229b970a38dff066 /gr-zeromq/lib/base_impl.h | |
| parent | 393624c072417e0b8a74480979eeccdfb8278e77 (diff) | |
gr-zeromq: Big rework for performance and correctness
- Use class hierarchy trying to maximize code re-use.
- Dont' drop samples on receive if the output buffer doesn't have
enough space.
- Don't drop tags on receive by putting tags in the future.
- Better metadata creation/parsing avoiding copying lots data.
- Always do as much work as possible in a single call to work()
to avoid scheduler overhead as long as possible.
- Allow setting the high watermark to avoid older version of
zeromq's default of buffering infinite messages and causing a
paging thrash to/from disk when the flow graph can't keep up.
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Diffstat (limited to 'gr-zeromq/lib/base_impl.h')
| -rw-r--r-- | gr-zeromq/lib/base_impl.h | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/gr-zeromq/lib/base_impl.h b/gr-zeromq/lib/base_impl.h new file mode 100644 index 0000000000..ed1695102e --- /dev/null +++ b/gr-zeromq/lib/base_impl.h @@ -0,0 +1,77 @@ +/* -*- c++ -*- */ +/* + * Copyright 2016 Free Software Foundation, Inc. + * + * This file is part of GNU Radio. + * + * This is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#ifndef INCLUDED_ZEROMQ_BASE_IMPL_H +#define INCLUDED_ZEROMQ_BASE_IMPL_H + +#include <zmq.hpp> + +#include <gnuradio/sync_block.h> + +namespace gr { + namespace zeromq { + + class base_impl : public virtual gr::sync_block + { + public: + base_impl(int type, size_t itemsize, size_t vlen, int timeout, bool pass_tags); + virtual ~base_impl(); + + protected: + zmq::context_t *d_context; + zmq::socket_t *d_socket; + size_t d_vsize; + int d_timeout; + bool d_pass_tags; + }; + + class base_sink_impl : public base_impl + { + public: + base_sink_impl(int type, size_t itemsize, size_t vlen, char *address, int timeout, bool pass_tags, int hwm); + + protected: + int send_message(const void *in_buf, const int in_nitems, const uint64_t in_offset); + }; + + class base_source_impl : public base_impl + { + public: + base_source_impl(int type, size_t itemsize, size_t vlen, char *address, int timeout, bool pass_tags, int hwm); + + protected: + zmq::message_t d_msg; + std::vector<gr::tag_t> d_tags; + size_t d_consumed_bytes; + int d_consumed_items; + + bool has_pending(); + int flush_pending(void *out_buf, const int out_nitems, const uint64_t out_offset); + bool load_message(bool wait); + }; + + } // namespace zeromq +} // namespace gr + +#endif /* INCLUDED_ZEROMQ_BASE_IMPL_H */ + +// vim: ts=2 sw=2 expandtab |