diff options
author | David Robillard <d@drobilla.net> | 2022-08-18 01:20:27 -0400 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2022-08-18 01:20:27 -0400 |
commit | 44381dbda9dbf8d20894789fe8e3ea941b70a1d0 (patch) | |
tree | 27c4da20f5a796825f7485aa7a1f447ff423f0f6 /src/server | |
parent | 9126ed67acf17bb2009430cb6de25b2ffd783d8e (diff) | |
download | ingen-44381dbda9dbf8d20894789fe8e3ea941b70a1d0.tar.gz ingen-44381dbda9dbf8d20894789fe8e3ea941b70a1d0.tar.bz2 ingen-44381dbda9dbf8d20894789fe8e3ea941b70a1d0.zip |
Use default member initialization
Diffstat (limited to 'src/server')
60 files changed, 120 insertions, 243 deletions
diff --git a/src/server/.clang-tidy b/src/server/.clang-tidy index b309c823..d0448c00 100644 --- a/src/server/.clang-tidy +++ b/src/server/.clang-tidy @@ -27,7 +27,6 @@ Checks: > -cppcoreguidelines-macro-usage, -cppcoreguidelines-no-malloc, -cppcoreguidelines-owning-memory, - -cppcoreguidelines-prefer-member-initializer, -cppcoreguidelines-pro-bounds-array-to-pointer-decay, -cppcoreguidelines-pro-bounds-constant-array-index, -cppcoreguidelines-pro-bounds-pointer-arithmetic, @@ -57,14 +56,12 @@ Checks: > -modernize-make-unique, -modernize-pass-by-value, -modernize-return-braced-init-list, - -modernize-use-default-member-init, -modernize-use-nodiscard, -modernize-use-trailing-return-type, -portability-simd-intrinsics, -readability-function-cognitive-complexity, -readability-identifier-length, -readability-implicit-bool-conversion, - -readability-redundant-member-init, -readability-use-anyofallof, CheckOptions: - key: modernize-use-override.AllowOverrideAndFinal diff --git a/src/server/BlockFactory.cpp b/src/server/BlockFactory.cpp index 2186b779..1d88568a 100644 --- a/src/server/BlockFactory.cpp +++ b/src/server/BlockFactory.cpp @@ -45,7 +45,6 @@ namespace server { BlockFactory::BlockFactory(ingen::World& world) : _world(world) - , _has_loaded(false) { load_internal_plugins(); } diff --git a/src/server/BlockFactory.hpp b/src/server/BlockFactory.hpp index 7cf28325..17c11bb4 100644 --- a/src/server/BlockFactory.hpp +++ b/src/server/BlockFactory.hpp @@ -62,7 +62,7 @@ private: Plugins _plugins; ingen::World& _world; - bool _has_loaded; + bool _has_loaded{false}; }; } // namespace server diff --git a/src/server/BlockImpl.cpp b/src/server/BlockImpl.cpp index 26e83eb8..a89df669 100644 --- a/src/server/BlockImpl.cpp +++ b/src/server/BlockImpl.cpp @@ -43,10 +43,7 @@ BlockImpl::BlockImpl(PluginImpl* plugin, : NodeImpl(plugin->uris(), parent, symbol) , _plugin(plugin) , _polyphony((polyphonic && parent) ? parent->internal_poly() : 1) - , _mark(Mark::UNVISITED) , _polyphonic(polyphonic) - , _activated(false) - , _enabled(true) { assert(_plugin); assert(_polyphony > 0); diff --git a/src/server/BlockImpl.hpp b/src/server/BlockImpl.hpp index c285bdac..448ebb99 100644 --- a/src/server/BlockImpl.hpp +++ b/src/server/BlockImpl.hpp @@ -208,10 +208,10 @@ protected: uint32_t _polyphony; std::set<BlockImpl*> _providers; ///< Blocks connected to this one's input ports std::set<BlockImpl*> _dependants; ///< Blocks this one's output ports are connected to - Mark _mark; ///< Mark for graph compilation algorithm + Mark _mark{Mark::UNVISITED}; ///< Mark for graph walks bool _polyphonic; - bool _activated; - bool _enabled; + bool _activated{false}; + bool _enabled{true}; }; } // namespace server diff --git a/src/server/Buffer.cpp b/src/server/Buffer.cpp index 7e14c354..18483d2d 100644 --- a/src/server/Buffer.cpp +++ b/src/server/Buffer.cpp @@ -48,13 +48,10 @@ Buffer::Buffer(BufferFactory& bufs, bool external, void*) : _factory(bufs) - , _next(nullptr) , _buf(external ? nullptr : aligned_alloc(capacity)) - , _latest_event(0) , _type(type) , _value_type(value_type) , _capacity(capacity) - , _refs(0) , _external(external) { if (!external && !_buf) { diff --git a/src/server/Buffer.hpp b/src/server/Buffer.hpp index e1ff2cf9..b1d8fb4d 100644 --- a/src/server/Buffer.hpp +++ b/src/server/Buffer.hpp @@ -229,15 +229,15 @@ private: BufferFactory& _factory; // NOLINTNEXTLINE(clang-analyzer-webkit.NoUncountedMemberChecker) - Buffer* _next; ///< Intrusive linked list for BufferFactory + Buffer* _next{nullptr}; ///< Intrusive linked list for BufferFactory void* _buf; ///< Actual buffer memory BufferRef _value_buffer; ///< Value buffer for numeric sequences - int64_t _latest_event; + int64_t _latest_event{0}; LV2_URID _type; LV2_URID _value_type; uint32_t _capacity; - std::atomic<unsigned> _refs; ///< Intrusive reference count + std::atomic<unsigned> _refs{0}; ///< Intrusive reference count bool _external; ///< Buffer is externally allocated }; diff --git a/src/server/BufferFactory.cpp b/src/server/BufferFactory.cpp index 4ecdfc3b..97a9b933 100644 --- a/src/server/BufferFactory.cpp +++ b/src/server/BufferFactory.cpp @@ -38,7 +38,6 @@ BufferFactory::BufferFactory(Engine& engine, URIs& uris) , _free_object(nullptr) , _engine(engine) , _uris(uris) - , _seq_size(0) , _silent_buffer(nullptr) { } diff --git a/src/server/BufferFactory.hpp b/src/server/BufferFactory.hpp index 5909754b..5f649e4a 100644 --- a/src/server/BufferFactory.hpp +++ b/src/server/BufferFactory.hpp @@ -96,15 +96,15 @@ private: static void free_list(Buffer* head); - std::atomic<Buffer*> _free_audio; - std::atomic<Buffer*> _free_control; - std::atomic<Buffer*> _free_sequence; - std::atomic<Buffer*> _free_object; + std::atomic<Buffer*> _free_audio{nullptr}; + std::atomic<Buffer*> _free_control{nullptr}; + std::atomic<Buffer*> _free_sequence{nullptr}; + std::atomic<Buffer*> _free_object{nullptr}; std::mutex _mutex; Engine& _engine; URIs& _uris; - uint32_t _seq_size; + uint32_t _seq_size{0}; BufferRef _silent_buffer; }; diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp index 5817bf6b..613def62 100644 --- a/src/server/Engine.cpp +++ b/src/server/Engine.cpp @@ -98,14 +98,8 @@ Engine::Engine(ingen::World& world) , _interface(_event_writer) , _atom_interface( new AtomReader(world.uri_map(), world.uris(), world.log(), *_interface)) - , _root_graph(nullptr) - , _cycle_start_time(0) , _rand_engine(reinterpret_cast<uintptr_t>(this)) - , _uniform_dist(0.0f, 1.0f) - , _quit_flag(false) - , _reset_load_flag(false) , _atomic_bundles(world.conf().option("atomic-bundles").get<int32_t>()) - , _activated(false) { if (!world.store()) { world.set_store(std::make_shared<ingen::Store>()); diff --git a/src/server/Engine.hpp b/src/server/Engine.hpp index 711e0bed..07f4c9a3 100644 --- a/src/server/Engine.hpp +++ b/src/server/Engine.hpp @@ -199,24 +199,24 @@ private: std::shared_ptr<EventWriter> _event_writer; std::shared_ptr<Interface> _interface; std::unique_ptr<AtomReader> _atom_interface; - GraphImpl* _root_graph; + GraphImpl* _root_graph{nullptr}; std::vector<std::unique_ptr<raul::RingBuffer>> _notifications; std::vector<std::unique_ptr<RunContext>> _run_contexts; - uint64_t _cycle_start_time; + uint64_t _cycle_start_time{0}; Load _run_load; Clock _clock; std::mt19937 _rand_engine; - std::uniform_real_distribution<float> _uniform_dist; + std::uniform_real_distribution<float> _uniform_dist{0.0f, 1.0f}; std::condition_variable _tasks_available; std::mutex _tasks_mutex; - bool _quit_flag; - bool _reset_load_flag; + bool _quit_flag{false}; + bool _reset_load_flag{false}; bool _atomic_bundles; - bool _activated; + bool _activated{false}; }; } // namespace server diff --git a/src/server/EnginePort.hpp b/src/server/EnginePort.hpp index ecfe59b3..d6e67f1e 100644 --- a/src/server/EnginePort.hpp +++ b/src/server/EnginePort.hpp @@ -40,9 +40,6 @@ class EnginePort : public raul::Noncopyable public: explicit EnginePort(DuplexPort* port) : _graph_port(port) - , _buffer(nullptr) - , _handle(nullptr) - , _driver_index(0) {} void set_buffer(void* buf) { _buffer = buf; } @@ -57,9 +54,9 @@ public: protected: DuplexPort* _graph_port; - void* _buffer; - void* _handle; - uint32_t _driver_index; + void* _buffer{nullptr}; + void* _handle{nullptr}; + uint32_t _driver_index{0}; }; } // namespace server diff --git a/src/server/EventWriter.cpp b/src/server/EventWriter.cpp index 9001b01a..8aeb5d83 100644 --- a/src/server/EventWriter.cpp +++ b/src/server/EventWriter.cpp @@ -36,7 +36,6 @@ namespace server { EventWriter::EventWriter(Engine& engine) : _engine(engine) - , _event_mode(Event::Mode::NORMAL) { } diff --git a/src/server/EventWriter.hpp b/src/server/EventWriter.hpp index 437f65a5..a71242c1 100644 --- a/src/server/EventWriter.hpp +++ b/src/server/EventWriter.hpp @@ -74,7 +74,7 @@ public: protected: Engine& _engine; std::shared_ptr<Interface> _respondee; - Event::Mode _event_mode; + Event::Mode _event_mode{Event::Mode::NORMAL}; private: SampleCount now() const; diff --git a/src/server/GraphImpl.cpp b/src/server/GraphImpl.cpp index a668312d..7f566041 100644 --- a/src/server/GraphImpl.cpp +++ b/src/server/GraphImpl.cpp @@ -61,7 +61,6 @@ GraphImpl::GraphImpl(Engine& engine, , _engine(engine) , _poly_pre(internal_poly) , _poly_process(internal_poly) - , _process(false) { assert(internal_poly >= 1); assert(internal_poly <= 128); diff --git a/src/server/GraphImpl.hpp b/src/server/GraphImpl.hpp index 8911efb6..185b858c 100644 --- a/src/server/GraphImpl.hpp +++ b/src/server/GraphImpl.hpp @@ -211,7 +211,7 @@ private: PortList _inputs; ///< Pre-process thread only PortList _outputs; ///< Pre-process thread only Blocks _blocks; ///< Pre-process thread only - bool _process; ///< True iff graph is enabled + bool _process{false}; ///< True iff graph is enabled }; } // namespace server diff --git a/src/server/InputPort.cpp b/src/server/InputPort.cpp index 10a525cc..8547dc35 100644 --- a/src/server/InputPort.cpp +++ b/src/server/InputPort.cpp @@ -50,7 +50,6 @@ InputPort::InputPort(BufferFactory& bufs, const Atom& value, size_t buffer_size) : PortImpl(bufs, parent, symbol, index, poly, type, buffer_type, value, buffer_size, false) - , _num_arcs(0) { const ingen::URIs& uris = bufs.uris(); diff --git a/src/server/InputPort.hpp b/src/server/InputPort.hpp index 9357c3ff..3c94d5c6 100644 --- a/src/server/InputPort.hpp +++ b/src/server/InputPort.hpp @@ -136,8 +136,8 @@ protected: uint32_t poly, size_t num_in_arcs) const override; - size_t _num_arcs; ///< Pre-process thread - Arcs _arcs; ///< Audio thread + size_t _num_arcs{0}; ///< Pre-process thread + Arcs _arcs; ///< Audio thread }; } // namespace server diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp index 69b84fb3..472379f9 100644 --- a/src/server/JackDriver.cpp +++ b/src/server/JackDriver.cpp @@ -61,22 +61,10 @@ namespace ingen { namespace server { JackDriver::JackDriver(Engine& engine) - : _engine(engine) - , _forge() - , _sem(0) - , _flag(false) - , _client(nullptr) - , _block_length(0) - , _seq_size(0) - , _sample_rate(0) - , _is_activated(false) - , _position() - , _transport_state() - , _old_bpm(120.0) - , _old_frame(0) - , _old_rolling(false) + : _engine(engine) + , _forge() + , _midi_event_type(_engine.world().uris().midi_MidiEvent) { - _midi_event_type = _engine.world().uris().midi_MidiEvent; lv2_atom_forge_init(&_forge, &engine.world().uri_map().urid_map()); } diff --git a/src/server/JackDriver.hpp b/src/server/JackDriver.hpp index d4ea03d0..49158e10 100644 --- a/src/server/JackDriver.hpp +++ b/src/server/JackDriver.hpp @@ -154,19 +154,19 @@ protected: Ports _ports; AudioBufPtr _fallback_buffer; LV2_Atom_Forge _forge; - raul::Semaphore _sem; - std::atomic<bool> _flag; - jack_client_t* _client; - jack_nframes_t _block_length; - size_t _seq_size; - jack_nframes_t _sample_rate; + raul::Semaphore _sem{0}; + std::atomic<bool> _flag{false}; + jack_client_t* _client{nullptr}; + jack_nframes_t _block_length{0}; + size_t _seq_size{0}; + jack_nframes_t _sample_rate{0}; uint32_t _midi_event_type; - bool _is_activated; - jack_position_t _position; - jack_transport_state_t _transport_state; - double _old_bpm; - jack_nframes_t _old_frame; - bool _old_rolling; + bool _is_activated{false}; + jack_position_t _position{}; + jack_transport_state_t _transport_state{}; + double _old_bpm{120.0}; + jack_nframes_t _old_frame{0}; + bool _old_rolling{false}; }; } // namespace server diff --git a/src/server/LV2Block.cpp b/src/server/LV2Block.cpp index eb2ed346..a0e67eb9 100644 --- a/src/server/LV2Block.cpp +++ b/src/server/LV2Block.cpp @@ -70,7 +70,6 @@ LV2Block::LV2Block(LV2Plugin* plugin, SampleRate srate) : BlockImpl(plugin, symbol, polyphonic, parent, srate) , _lv2_plugin(plugin) - , _worker_iface(nullptr) { assert(_lv2_plugin); } diff --git a/src/server/LV2Block.hpp b/src/server/LV2Block.hpp index 77270234..ec0b863b 100644 --- a/src/server/LV2Block.hpp +++ b/src/server/LV2Block.hpp @@ -179,7 +179,7 @@ protected: LV2Plugin* _lv2_plugin; raul::managed_ptr<Instances> _instances; raul::managed_ptr<Instances> _prepared_instances; - const LV2_Worker_Interface* _worker_iface; + const LV2_Worker_Interface* _worker_iface{nullptr}; std::mutex _work_mutex; Responses _responses; std::shared_ptr<LV2Features::FeatureArray> _features; diff --git a/src/server/PluginImpl.hpp b/src/server/PluginImpl.hpp index 3d7d596f..6164d77f 100644 --- a/src/server/PluginImpl.hpp +++ b/src/server/PluginImpl.hpp @@ -48,8 +48,6 @@ public: PluginImpl(ingen::URIs& uris, const Atom& type, const URI& uri) : Resource(uris, uri) , _type(type) - , _presets_loaded(false) - , _is_zombie(false) { } @@ -90,8 +88,8 @@ public: protected: Atom _type; Presets _presets; - bool _presets_loaded; - bool _is_zombie; + bool _presets_loaded{false}; + bool _is_zombie{false}; }; } // namespace server diff --git a/src/server/PortAudioDriver.cpp b/src/server/PortAudioDriver.cpp index fcb9cf67..68acf552 100644 --- a/src/server/PortAudioDriver.cpp +++ b/src/server/PortAudioDriver.cpp @@ -47,15 +47,7 @@ PortAudioDriver::PortAudioDriver(Engine& engine) : _engine(engine) , _inputParameters() , _outputParameters() - , _sem(0) - , _stream(nullptr) - , _seq_size(4096) , _block_length(engine.world().conf().option("buffer-size").get<int32_t>()) - , _sample_rate(48000) - , _n_inputs(0) - , _n_outputs(0) - , _flag(false) - , _is_activated(false) { } diff --git a/src/server/PortAudioDriver.hpp b/src/server/PortAudioDriver.hpp index 5f2bf7a1..4da79632 100644 --- a/src/server/PortAudioDriver.hpp +++ b/src/server/PortAudioDriver.hpp @@ -124,16 +124,16 @@ protected: Ports _ports; PaStreamParameters _inputParameters; PaStreamParameters _outputParameters; - raul::Semaphore _sem; + raul::Semaphore _sem{0}; std::unique_ptr<FrameTimer> _timer; - PaStream* _stream; - size_t _seq_size; + PaStream* _stream{nullptr}; + size_t _seq_size{4096}; uint32_t _block_length; - uint32_t _sample_rate; - uint32_t _n_inputs; - uint32_t _n_outputs; - std::atomic<bool> _flag; - bool _is_activated; + uint32_t _sample_rate{48000}; + uint32_t _n_inputs{0}; + uint32_t _n_outputs{0}; + std::atomic<bool> _flag{false}; + bool _is_activated{false}; }; } // namespace server diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp index 68392707..913c6176 100644 --- a/src/server/PortImpl.cpp +++ b/src/server/PortImpl.cpp @@ -67,24 +67,12 @@ PortImpl::PortImpl(BufferFactory& bufs, , _index(index) , _poly(poly) , _buffer_size(buffer_size) - , _frames_since_monitor(0) - , _monitor_value(0.0f) - , _peak(0.0f) , _type(type) , _buffer_type(buffer_type) , _value(value) , _min(bufs.forge().make(0.0f)) , _max(bufs.forge().make(1.0f)) , _voices(bufs.maid().make_managed<Voices>(poly)) - , _connected_flag(false) - , _monitored(false) - , _force_monitor_update(false) - , _is_morph(false) - , _is_auto_morph(false) - , _is_logarithmic(false) - , _is_sample_rate(false) - , _is_toggled(false) - , _is_driver_port(false) , _is_output(is_output) { assert(block != nullptr); diff --git a/src/server/PortImpl.hpp b/src/server/PortImpl.hpp index 11c82539..41c450e3 100644 --- a/src/server/PortImpl.hpp +++ b/src/server/PortImpl.hpp @@ -297,9 +297,9 @@ protected: uint32_t _index; uint32_t _poly; uint32_t _buffer_size; - uint32_t _frames_since_monitor; - float _monitor_value; - float _peak; + uint32_t _frames_since_monitor{0}; + float _monitor_value{0.0f}; + float _peak{0.0f}; PortType _type; LV2_URID _buffer_type; Atom _value; @@ -308,15 +308,15 @@ protected: raul::managed_ptr<Voices> _voices; raul::managed_ptr<Voices> _prepared_voices; BufferRef _user_buffer; - std::atomic_flag _connected_flag; - bool _monitored; - bool _force_monitor_update; - bool _is_morph; - bool _is_auto_morph; - bool _is_logarithmic; - bool _is_sample_rate; - bool _is_toggled; - bool _is_driver_port; + std::atomic_flag _connected_flag{false}; + bool _monitored{false}; + bool _force_monitor_update{false}; + bool _is_morph{false}; + bool _is_auto_morph{false}; + bool _is_logarithmic{false}; + bool _is_sample_rate{false}; + bool _is_toggled{false}; + bool _is_driver_port{false}; bool _is_output; }; diff --git a/src/server/PreProcessor.cpp b/src/server/PreProcessor.cpp index b2f0fd46..6922d232 100644 --- a/src/server/PreProcessor.cpp +++ b/src/server/PreProcessor.cpp @@ -39,11 +39,6 @@ namespace server { PreProcessor::PreProcessor(Engine& engine) : _engine(engine) - , _sem(0) - , _head(nullptr) - , _tail(nullptr) - , _block_state(BlockState::UNBLOCKED) - , _exit_flag(false) , _thread(&PreProcessor::run, this) {} diff --git a/src/server/PreProcessor.hpp b/src/server/PreProcessor.hpp index 05027638..832b545e 100644 --- a/src/server/PreProcessor.hpp +++ b/src/server/PreProcessor.hpp @@ -76,11 +76,11 @@ private: Engine& _engine; std::mutex _mutex; - raul::Semaphore _sem; - std::atomic<Event*> _head; - std::atomic<Event*> _tail; - std::atomic<BlockState> _block_state; - bool _exit_flag; + raul::Semaphore _sem{0}; + std::atomic<Event*> _head{nullptr}; + std::atomic<Event*> _tail{nullptr}; + std::atomic<BlockState> _block_state{BlockState::UNBLOCKED}; + bool _exit_flag{false}; std::thread _thread; }; diff --git a/src/server/RunContext.cpp b/src/server/RunContext.cpp index a61e4afb..05f57bf5 100644 --- a/src/server/RunContext.cpp +++ b/src/server/RunContext.cpp @@ -63,22 +63,13 @@ RunContext::RunContext(Engine& engine, bool threaded) : _engine(engine) , _event_sink(event_sink) - , _task(nullptr) , _thread(threaded ? new std::thread(&RunContext::run, this) : nullptr) , _id(id) - , _start(0) - , _end(0) - , _offset(0) - , _nframes(0) - , _rate(0) - , _realtime(true) {} RunContext::RunContext(const RunContext& copy) : _engine(copy._engine) , _event_sink(copy._event_sink) - , _task(nullptr) - , _thread(nullptr) , _id(copy._id) , _start(copy._start) , _end(copy._end) diff --git a/src/server/RunContext.hpp b/src/server/RunContext.hpp index 92aa1cf8..f39b5864 100644 --- a/src/server/RunContext.hpp +++ b/src/server/RunContext.hpp @@ -143,18 +143,18 @@ public: protected: void run(); - Engine& _engine; ///< Engine we're running in - raul::RingBuffer* _event_sink; ///< Updates from process context - Task* _task; ///< Currently executing task - std::unique_ptr<std::thread> _thread; ///< Thread (or null for main) - unsigned _id; ///< Context ID - - FrameTime _start; ///< Start frame of this cycle, timeline relative - FrameTime _end; ///< End frame of this cycle, timeline relative - SampleCount _offset; ///< Offset into data buffers - SampleCount _nframes; ///< Number of frames past offset to process - SampleCount _rate; ///< Sample rate in Hz - bool _realtime; ///< True iff context is hard realtime + Engine& _engine; ///< Engine we're running in + raul::RingBuffer* _event_sink; ///< Updates from notify() + Task* _task{nullptr}; ///< Currently executing task + std::unique_ptr<std::thread> _thread; ///< Thread (or null for main) + unsigned _id; ///< Context ID + + FrameTime _start{0}; ///< Start frame of this cycle (timeline) + FrameTime _end{0}; ///< End frame of this cycle (timeline) + SampleCount _offset{0}; ///< Offset into data buffers + SampleCount _nframes{0}; ///< Number of frames past offset to process + SampleCount _rate{0}; ///< Sample rate in Hz + bool _realtime{true}; ///< True iff context is hard realtime }; } // namespace server diff --git a/src/server/Task.hpp b/src/server/Task.hpp index a7657499..7a50fe8e 100644 --- a/src/server/Task.hpp +++ b/src/server/Task.hpp @@ -43,9 +43,6 @@ public: Task(Mode mode, BlockImpl* block = nullptr) : _block(block) , _mode(mode) - , _done_end(0) - , _next(0) - , _done(false) { assert(!(mode == Mode::SINGLE && !block)); } @@ -110,12 +107,12 @@ private: _children.emplace_back(std::move(t)); } - Children _children; ///< Vector of child tasks - BlockImpl* _block; ///< Used for SINGLE only - Mode _mode; ///< Execution mode - unsigned _done_end; ///< Index of rightmost done sub-task - std::atomic<unsigned> _next; ///< Index of next sub-task - std::atomic<bool> _done; ///< Completion phase + Children _children; ///< Vector of child tasks + BlockImpl* _block; ///< Used for SINGLE only + Mode _mode; ///< Execution mode + unsigned _done_end{0}; ///< Index of rightmost done sub-task + std::atomic<unsigned> _next{0}; ///< Index of next sub-task + std::atomic<bool> _done{false}; ///< Completion phase }; } // namespace server diff --git a/src/server/UndoStack.hpp b/src/server/UndoStack.hpp index a6d90e9c..081d3ff4 100644 --- a/src/server/UndoStack.hpp +++ b/src/server/UndoStack.hpp @@ -83,10 +83,7 @@ public: std::deque<LV2_Atom*> events; }; - UndoStack(URIs& uris, URIMap& map) noexcept - : _uris(uris), _map(map), _depth(0) - { - } + UndoStack(URIs& uris, URIMap& map) noexcept : _uris(uris), _map(map) {} int start_entry(); bool write(const LV2_Atom* msg, int32_t default_id=0) override; @@ -109,7 +106,7 @@ private: URIs& _uris; URIMap& _map; std::deque<Entry> _stack; - int _depth; + int _depth{0}; }; } // namespace server diff --git a/src/server/Worker.cpp b/src/server/Worker.cpp index 77d98612..bb282365 100644 --- a/src/server/Worker.cpp +++ b/src/server/Worker.cpp @@ -116,13 +116,11 @@ Worker::Schedule::feature(World&, Node* n) Worker::Worker(Log& log, uint32_t buffer_size, bool synchronous) : _schedule(new Schedule(synchronous)) , _log(log) - , _sem(0) , _requests(buffer_size) , _responses(buffer_size) , _buffer(static_cast<uint8_t*>(malloc(buffer_size))) , _buffer_size(buffer_size) , _thread(nullptr) - , _exit_flag(false) , _synchronous(synchronous) { if (!synchronous) { diff --git a/src/server/Worker.hpp b/src/server/Worker.hpp index ed9a2470..540347df 100644 --- a/src/server/Worker.hpp +++ b/src/server/Worker.hpp @@ -63,13 +63,13 @@ private: std::shared_ptr<Schedule> _schedule; Log& _log; - raul::Semaphore _sem; + raul::Semaphore _sem{0}; raul::RingBuffer _requests; raul::RingBuffer _responses; uint8_t* const _buffer; const uint32_t _buffer_size; std::unique_ptr<std::thread> _thread; - bool _exit_flag; + bool _exit_flag{false}; bool _synchronous; void run(); diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp index 234bc550..1fa02ae8 100644 --- a/src/server/events/Connect.cpp +++ b/src/server/events/Connect.cpp @@ -52,8 +52,6 @@ Connect::Connect(Engine& engine, const ingen::Connect& msg) : Event(engine, client, msg.seq, timestamp) , _msg(msg) - , _graph(nullptr) - , _head(nullptr) { } diff --git a/src/server/events/Connect.hpp b/src/server/events/Connect.hpp index 941c0a25..a735b68c 100644 --- a/src/server/events/Connect.hpp +++ b/src/server/events/Connect.hpp @@ -64,8 +64,8 @@ public: private: const ingen::Connect _msg; - GraphImpl* _graph; - InputPort* _head; + GraphImpl* _graph{nullptr}; + InputPort* _head{nullptr}; raul::managed_ptr<CompiledGraph> _compiled_graph; std::shared_ptr<ArcImpl> _arc; raul::managed_ptr<PortImpl::Voices> _voices; diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp index ebfea41d..7f92842e 100644 --- a/src/server/events/Copy.cpp +++ b/src/server/events/Copy.cpp @@ -52,9 +52,6 @@ Copy::Copy(Engine& engine, const ingen::Copy& msg) : Event(engine, client, msg.seq, timestamp) , _msg(msg) - , _old_block(nullptr) - , _parent(nullptr) - , _block(nullptr) {} Copy::~Copy() = default; diff --git a/src/server/events/Copy.hpp b/src/server/events/Copy.hpp index f9c507f0..8460140a 100644 --- a/src/server/events/Copy.hpp +++ b/src/server/events/Copy.hpp @@ -64,9 +64,9 @@ private: bool filesystem_to_engine(PreProcessContext& ctx); const ingen::Copy _msg; - std::shared_ptr<BlockImpl> _old_block; - GraphImpl* _parent; - BlockImpl* _block; + std::shared_ptr<BlockImpl> _old_block{nullptr}; + GraphImpl* _parent{nullptr}; + BlockImpl* _block{nullptr}; raul::managed_ptr<CompiledGraph> _compiled_graph; }; diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp index 742eabfe..6d0dbe3e 100644 --- a/src/server/events/CreateBlock.cpp +++ b/src/server/events/CreateBlock.cpp @@ -64,8 +64,6 @@ CreateBlock::CreateBlock(Engine& engine, : Event(engine, client, id, timestamp) , _path(std::move(path)) , _properties(properties) - , _graph(nullptr) - , _block(nullptr) {} CreateBlock::~CreateBlock() = default; diff --git a/src/server/events/CreateBlock.hpp b/src/server/events/CreateBlock.hpp index 97a54b3f..2a7a60ab 100644 --- a/src/server/events/CreateBlock.hpp +++ b/src/server/events/CreateBlock.hpp @@ -68,8 +68,8 @@ private: raul::Path _path; Properties& _properties; ClientUpdate _update; - GraphImpl* _graph; - BlockImpl* _block; + GraphImpl* _graph{nullptr}; + BlockImpl* _block{nullptr}; raul::managed_ptr<CompiledGraph> _compiled_graph; }; diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp index 895a84e7..367bedfe 100644 --- a/src/server/events/CreateGraph.cpp +++ b/src/server/events/CreateGraph.cpp @@ -58,8 +58,6 @@ CreateGraph::CreateGraph(Engine& engine, : Event(engine, client, id, timestamp) , _path(std::move(path)) , _properties(properties) - , _graph(nullptr) - , _parent(nullptr) { } diff --git a/src/server/events/CreateGraph.hpp b/src/server/events/CreateGraph.hpp index d9e994c0..46ca3266 100644 --- a/src/server/events/CreateGraph.hpp +++ b/src/server/events/CreateGraph.hpp @@ -72,8 +72,8 @@ private: const raul::Path _path; Properties _properties; ClientUpdate _update; - GraphImpl* _graph; - GraphImpl* _parent; + GraphImpl* _graph{nullptr}; + GraphImpl* _parent{nullptr}; raul::managed_ptr<CompiledGraph> _compiled_graph; std::list<std::unique_ptr<Event>> _child_events; }; diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp index ba2c9a9a..5ea9db33 100644 --- a/src/server/events/CreatePort.cpp +++ b/src/server/events/CreatePort.cpp @@ -58,10 +58,6 @@ CreatePort::CreatePort(Engine& engine, : Event(engine, client, id, timestamp) , _path(std::move(path)) , _port_type(PortType::UNKNOWN) - , _buf_type(0) - , _graph(nullptr) - , _graph_port(nullptr) - , _engine_port(nullptr) , _properties(properties) { const ingen::URIs& uris = _engine.world().uris(); diff --git a/src/server/events/CreatePort.hpp b/src/server/events/CreatePort.hpp index 73746434..3351adc9 100644 --- a/src/server/events/CreatePort.hpp +++ b/src/server/events/CreatePort.hpp @@ -74,11 +74,11 @@ private: raul::Path _path; PortType _port_type; - LV2_URID _buf_type; - GraphImpl* _graph; - DuplexPort* _graph_port; + LV2_URID _buf_type{0}; + GraphImpl* _graph{nullptr}; + DuplexPort* _graph_port{nullptr}; raul::managed_ptr<BlockImpl::Ports> _ports_array; ///< New external port array for Graph - EnginePort* _engine_port; ///< Driver port if on the root + EnginePort* _engine_port{nullptr}; ///< Driver port if on the root Properties _properties; Properties _update; boost::optional<Flow> _flow; diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp index bdd25f1b..aba49adb 100644 --- a/src/server/events/Delete.cpp +++ b/src/server/events/Delete.cpp @@ -62,8 +62,6 @@ Delete::Delete(Engine& engine, const ingen::Del& msg) : Event(engine, client, msg.seq, timestamp) , _msg(msg) - , _engine_port(nullptr) - , _disconnect_event(nullptr) { if (uri_is_path(msg.uri)) { _path = uri_to_path(msg.uri); diff --git a/src/server/events/Delete.hpp b/src/server/events/Delete.hpp index 50a925b5..7dfb5681 100644 --- a/src/server/events/Delete.hpp +++ b/src/server/events/Delete.hpp @@ -77,7 +77,7 @@ private: raul::Path _path; std::shared_ptr<BlockImpl> _block; ///< Non-null iff a block std::shared_ptr<DuplexPort> _port; ///< Non-null iff a port - EnginePort* _engine_port; + EnginePort* _engine_port{nullptr}; raul::managed_ptr<GraphImpl::Ports> _ports_array; ///< New (external) ports for Graph raul::managed_ptr<CompiledGraph> _compiled_graph; ///< Graph's new process order std::unique_ptr<DisconnectAll> _disconnect_event; diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp index 09d9c3b2..2c6a50c8 100644 --- a/src/server/events/Delta.cpp +++ b/src/server/events/Delta.cpp @@ -68,16 +68,10 @@ Delta::Delta(Engine& engine, SampleCount timestamp, const ingen::Put& msg) : Event(engine, client, msg.seq, timestamp) - , _create_event(nullptr) , _subject(msg.uri) , _properties(msg.properties) - , _object(nullptr) - , _graph(nullptr) - , _binding(nullptr) - , _state() , _context(msg.ctx) , _type(Type::PUT) - , _block(false) { init(); } @@ -91,13 +85,8 @@ Delta::Delta(Engine& engine, , _subject(msg.uri) , _properties(msg.add) , _remove(msg.remove) - , _object(nullptr) - , _graph(nullptr) - , _binding(nullptr) - , _state(nullptr) , _context(msg.ctx) , _type(Type::PATCH) - , _block(false) { init(); } @@ -109,13 +98,8 @@ Delta::Delta(Engine& engine, : Event(engine, client, msg.seq, timestamp) , _subject(msg.subject) , _properties{{msg.predicate, msg.value}} - , _object(nullptr) - , _graph(nullptr) - , _binding(nullptr) - , _state(nullptr) , _context(msg.ctx) , _type(Type::SET) - , _block(false) { init(); } diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp index 64ee67db..7f79ae94 100644 --- a/src/server/events/Delta.hpp +++ b/src/server/events/Delta.hpp @@ -116,10 +116,10 @@ private: Properties _properties; Properties _remove; ClientUpdate _update; - ingen::Resource* _object; - GraphImpl* _graph; + ingen::Resource* _object{nullptr}; + GraphImpl* _graph{nullptr}; raul::managed_ptr<CompiledGraph> _compiled_graph; - ControlBindings::Binding* _binding; + ControlBindings::Binding* _binding{nullptr}; StatePtr _state; Resource::Graph _context; Type _type; @@ -131,7 +131,7 @@ private: boost::optional<Resource> _preset; - bool _block; + bool _block{false}; }; } // namespace events diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp index ea6bb8f0..b600df4f 100644 --- a/src/server/events/Disconnect.cpp +++ b/src/server/events/Disconnect.cpp @@ -60,7 +60,6 @@ Disconnect::Disconnect(Engine& engine, const ingen::Disconnect& msg) : Event(engine, client, msg.seq, timestamp) , _msg(msg) - , _graph(nullptr) { } diff --git a/src/server/events/Disconnect.hpp b/src/server/events/Disconnect.hpp index a835ed27..c6db44be 100644 --- a/src/server/events/Disconnect.hpp +++ b/src/server/events/Disconnect.hpp @@ -80,7 +80,7 @@ public: private: const ingen::Disconnect _msg; - GraphImpl* _graph; + GraphImpl* _graph{nullptr}; std::unique_ptr<Impl> _impl; raul::managed_ptr<CompiledGraph> _compiled_graph; }; diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp index 219af6fe..ff801c06 100644 --- a/src/server/events/Get.cpp +++ b/src/server/events/Get.cpp @@ -47,8 +47,6 @@ Get::Get(Engine& engine, const ingen::Get& msg) : Event(engine, client, msg.seq, timestamp) , _msg(msg) - , _object(nullptr) - , _plugin(nullptr) {} bool diff --git a/src/server/events/Get.hpp b/src/server/events/Get.hpp index fd3f8569..1ec49bfa 100644 --- a/src/server/events/Get.hpp +++ b/src/server/events/Get.hpp @@ -58,8 +58,8 @@ public: private: const ingen::Get _msg; - const Node* _object; - PluginImpl* _plugin; + const Node* _object{nullptr}; + PluginImpl* _plugin{nullptr}; BlockFactory::Plugins _plugins; ClientUpdate _response; }; diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp index 90b9d944..6f538ddc 100644 --- a/src/server/ingen_lv2.cpp +++ b/src/server/ingen_lv2.cpp @@ -124,15 +124,9 @@ public: *this) , _from_ui(ui_ring_size(block_length)) , _to_ui(ui_ring_size(block_length)) - , _root_graph(nullptr) - , _notify_capacity(0) , _block_length(block_length) , _seq_size(seq_size) , _sample_rate(sample_rate) - , _frame_time(0) - , _to_ui_overflow_sem(0) - , _to_ui_overflow(false) - , _instantiated(false) {} bool dynamic_ports() const override { return !_instantiated; } @@ -413,15 +407,15 @@ private: AtomWriter _writer; raul::RingBuffer _from_ui; raul::RingBuffer _to_ui; - GraphImpl* _root_graph; - uint32_t _notify_capacity; + GraphImpl* _root_graph{nullptr}; + uint32_t _notify_capacity{0}; SampleCount _block_length; size_t _seq_size; SampleCount _sample_rate; - SampleCount _frame_time; - raul::Semaphore _to_ui_overflow_sem; - bool _to_ui_overflow; - bool _instantiated; + SampleCount _frame_time{0}; + raul::Semaphore _to_ui_overflow_sem{0}; + bool _to_ui_overflow{false}; + bool _instantiated{false}; }; struct IngenPlugin { diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp index d0d8cd39..d8445a8a 100644 --- a/src/server/internals/Controller.cpp +++ b/src/server/internals/Controller.cpp @@ -60,7 +60,6 @@ ControllerNode::ControllerNode(InternalPlugin* plugin, GraphImpl* parent, SampleRate srate) : InternalBlock(plugin, symbol, false, parent, srate) - , _learning(false) { const ingen::URIs& uris = bufs.uris(); _ports = bufs.maid().make_managed<Ports>(7); diff --git a/src/server/internals/Controller.hpp b/src/server/internals/Controller.hpp index b5cea110..2a0bc834 100644 --- a/src/server/internals/Controller.hpp +++ b/src/server/internals/Controller.hpp @@ -74,7 +74,7 @@ private: InputPort* _min_port; InputPort* _max_port; OutputPort* _audio_port; - bool _learning; + bool _learning{false}; }; } // namespace internals diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp index 4952310b..e67cd441 100644 --- a/src/server/internals/Note.cpp +++ b/src/server/internals/Note.cpp @@ -64,7 +64,6 @@ NoteNode::NoteNode(InternalPlugin* plugin, SampleRate srate) : InternalBlock(plugin, symbol, polyphonic, parent, srate) , _voices(bufs.maid().make_managed<Voices>(_polyphony)) - , _sustain(false) { const ingen::URIs& uris = bufs.uris(); _ports = bufs.maid().make_managed<Ports>(8); diff --git a/src/server/internals/Note.hpp b/src/server/internals/Note.hpp index 80816131..082a852c 100644 --- a/src/server/internals/Note.hpp +++ b/src/server/internals/Note.hpp @@ -105,7 +105,7 @@ private: raul::managed_ptr<Voices> _prepared_voices; Key _keys[128]; - bool _sustain; ///< Whether or not hold pedal is depressed + bool _sustain{false}; ///< Whether or not hold pedal is depressed InputPort* _midi_in_port; OutputPort* _freq_port; diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp index 645ffabb..19e320c9 100644 --- a/src/server/internals/Trigger.cpp +++ b/src/server/internals/Trigger.cpp @@ -60,7 +60,6 @@ TriggerNode::TriggerNode(InternalPlugin* plugin, GraphImpl* parent, SampleRate srate) : InternalBlock(plugin, symbol, false, parent, srate) - , _learning(false) { const ingen::URIs& uris = bufs.uris(); _ports = bufs.maid().make_managed<Ports>(6); diff --git a/src/server/internals/Trigger.hpp b/src/server/internals/Trigger.hpp index d9553c3e..74634202 100644 --- a/src/server/internals/Trigger.hpp +++ b/src/server/internals/Trigger.hpp @@ -71,7 +71,7 @@ public: static InternalPlugin* internal_plugin(URIs& uris); private: - bool _learning; + bool _learning{false}; InputPort* _midi_in_port; OutputPort* _midi_out_port; |