Remove MemoryManager (#7128)

Removes `MemoryManager` and the use of rpmalloc in favor of the `new` and `delete` operators found in C++.

---------

Co-authored-by: Veratil <veratil@gmail.com>

include/AudioPort.h

@@ -29,7 +29,6 @@
 #include <QString>
 #include <QMutex>
 
-#include "MemoryManager.h"
 #include "PlayHandle.h"
 
 namespace lmms
@@ -41,7 +40,6 @@ class BoolModel;
 
 class AudioPort : public ThreadableJob
 {
-	MM_OPERATORS
 public:
 	AudioPort( const QString & _name, bool _has_effect_chain = true,
 		FloatModel * volumeModel = nullptr, FloatModel * panningModel = nullptr,

include/AutomatableModel.h

@@ -33,7 +33,6 @@
 #include "Model.h"
 #include "TimePos.h"
 #include "ValueBuffer.h"
-#include "MemoryManager.h"
 #include "ModelVisitor.h"
 
 
@@ -77,7 +76,6 @@ class ControllerConnection;
 class LMMS_EXPORT AutomatableModel : public Model, public JournallingObject
 {
 	Q_OBJECT
-	MM_OPERATORS
 public:
 	using AutoModelVector = std::vector<AutomatableModel*>;
 

include/BasicFilters.h

@@ -40,7 +40,6 @@
 #include "lmms_basics.h"
 #include "lmms_constants.h"
 #include "interpolation.h"
-#include "MemoryManager.h"
 
 namespace lmms
 {
@@ -50,7 +49,6 @@ template<ch_cnt_t CHANNELS=DEFAULT_CHANNELS> class BasicFilters;
 template<ch_cnt_t CHANNELS>
 class LinkwitzRiley
 {
-	MM_OPERATORS
 public:
 	LinkwitzRiley( float sampleRate )
 	{
@@ -145,7 +143,6 @@ using StereoLinkwitzRiley = LinkwitzRiley<2>;
 template<ch_cnt_t CHANNELS>
 class BiQuad
 {
-	MM_OPERATORS
 public:
 	BiQuad() 
 	{
@@ -188,7 +185,6 @@ using StereoBiQuad = BiQuad<2>;
 template<ch_cnt_t CHANNELS>
 class OnePole
 {
-	MM_OPERATORS
 public:
 	OnePole()
 	{
@@ -222,7 +218,6 @@ using StereoOnePole = OnePole<2>;
 template<ch_cnt_t CHANNELS>
 class BasicFilters
 {
-	MM_OPERATORS
 public:
 	enum class FilterType
 	{

include/Clip.h

@@ -50,7 +50,6 @@ class TrackView;
 class LMMS_EXPORT Clip : public Model, public JournallingObject
 {
 	Q_OBJECT
-	MM_OPERATORS
 	mapPropertyFromModel(bool,isMuted,setMuted,m_mutedModel);
 	mapPropertyFromModel(bool,isSolo,setSolo,m_soloModel);
 public:

include/DataFile.h

@@ -28,9 +28,9 @@
 
 #include <map>
 #include <QDomDocument>
+#include <vector>
 
 #include "lmms_export.h"
-#include "MemoryManager.h"
 
 class QTextStream;
 
@@ -42,7 +42,6 @@ class ProjectVersion;
 
 class LMMS_EXPORT DataFile : public QDomDocument
 {
-	MM_OPERATORS
 
 	using UpgradeMethod = void(DataFile::*)();
 
@@ -149,7 +148,6 @@ private:
 	QDomElement m_head;
 	Type m_type;
 	unsigned int m_fileVersion;
-
 } ;
 
 

include/Delay.h

@@ -29,7 +29,6 @@
 #include "lmms_basics.h"
 #include "lmms_math.h"
 #include "interpolation.h"
-#include "MemoryManager.h"
 
 namespace lmms
 {
@@ -74,20 +73,20 @@ public:
 		m_delay( 0 ),
 		m_fraction( 0.0 )
 	{
-		m_buffer = MM_ALLOC<frame>(maxDelay );
+		m_buffer = new frame[maxDelay];
 		memset( m_buffer, 0, sizeof( frame ) * maxDelay );
 	}
 	virtual ~CombFeedback()
 	{
-		MM_FREE( m_buffer );
+		delete[] m_buffer;
 	}
 	
 	inline void setMaxDelay( int maxDelay )
 	{
 		if( maxDelay > m_size )
 		{
-			MM_FREE( m_buffer );
-			m_buffer = MM_ALLOC<frame>( maxDelay );
+			delete[] m_buffer;
+			m_buffer = new frame[maxDelay];
 			memset( m_buffer, 0, sizeof( frame ) * maxDelay );
 		}
 		m_size = maxDelay;
@@ -145,20 +144,20 @@ class CombFeedfwd
 		m_delay( 0 ),
 		m_fraction( 0.0 )
 	{
-		m_buffer = MM_ALLOC<frame>( maxDelay );
+		m_buffer = new frame[maxDelay];
 		memset( m_buffer, 0, sizeof( frame ) * maxDelay );
 	}
 	virtual ~CombFeedfwd()
 	{
-		MM_FREE( m_buffer );
+		delete[] m_buffer;
 	}
 	
 	inline void setMaxDelay( int maxDelay )
 	{
 		if( maxDelay > m_size )
 		{
-			MM_FREE( m_buffer );
-			m_buffer = MM_ALLOC<frame>( maxDelay );
+			delete[] m_buffer;
+			m_buffer = new frame[maxDelay];
 			memset( m_buffer, 0, sizeof( frame ) * maxDelay );
 		}
 		m_size = maxDelay;
@@ -216,20 +215,20 @@ class CombFeedbackDualtap
 		m_delay( 0 ),
 		m_fraction( 0.0 )
 	{
-		m_buffer = MM_ALLOC<frame>( maxDelay );
+		m_buffer = new frame[maxDelay];
 		memset( m_buffer, 0, sizeof( frame ) * maxDelay );
 	}
 	virtual ~CombFeedbackDualtap()
 	{
-		MM_FREE( m_buffer );
+		delete[] m_buffer;
 	}
 	
 	inline void setMaxDelay( int maxDelay )
 	{
 		if( maxDelay > m_size )
 		{
-			MM_FREE( m_buffer );
-			m_buffer = MM_ALLOC<frame>( maxDelay );
+			delete[] m_buffer;
+			m_buffer = new frame[maxDelay];
 			memset( m_buffer, 0, sizeof( frame ) * maxDelay );
 		}
 		m_size = maxDelay;
@@ -297,20 +296,20 @@ public:
 		m_delay( 0 ),
 		m_fraction( 0.0 )
 	{
-		m_buffer = MM_ALLOC<frame>( maxDelay );
+		m_buffer = new frame[maxDelay];
 		memset( m_buffer, 0, sizeof( frame ) * maxDelay );
 	}
 	virtual ~AllpassDelay()
 	{
-		MM_FREE( m_buffer );
+		delete[] m_buffer;
 	}
 	
 	inline void setMaxDelay( int maxDelay )
 	{
 		if( maxDelay > m_size )
 		{
-			MM_FREE( m_buffer );
-			m_buffer = MM_ALLOC<frame>( maxDelay );
+			delete[] m_buffer;
+			m_buffer = new frame[maxDelay];
 			memset( m_buffer, 0, sizeof( frame ) * maxDelay );
 		}
 		m_size = maxDelay;

include/DetuningHelper.h

@@ -27,7 +27,6 @@
 #define LMMS_DETUNING_HELPER_H
 
 #include "InlineAutomation.h"
-#include "MemoryManager.h"
 
 namespace lmms
 {
@@ -35,7 +34,6 @@ namespace lmms
 class DetuningHelper : public InlineAutomation
 {
 	Q_OBJECT
-	MM_OPERATORS
 public:
 	DetuningHelper() :
 		InlineAutomation()

include/Effect.h

@@ -31,7 +31,6 @@
 #include "AudioEngine.h"
 #include "AutomatableModel.h"
 #include "TempoSyncKnobModel.h"
-#include "MemoryManager.h"
 
 namespace lmms
 {
@@ -49,7 +48,6 @@ class EffectView;
 
 class LMMS_EXPORT Effect : public Plugin
 {
-	MM_OPERATORS
 	Q_OBJECT
 public:
 	Effect( const Plugin::Descriptor * _desc,

include/Instrument.h

@@ -31,7 +31,6 @@
 #include "Flags.h"
 #include "lmms_export.h"
 #include "lmms_basics.h"
-#include "MemoryManager.h"
 #include "Plugin.h"
 #include "TimePos.h"
 
@@ -47,7 +46,6 @@ class Track;
 
 class LMMS_EXPORT Instrument : public Plugin
 {
-	MM_OPERATORS
 public:
 	enum class Flag
 	{

include/InstrumentTrack.h

@@ -60,7 +60,6 @@ class MidiCCRackView;
 class LMMS_EXPORT InstrumentTrack : public Track, public MidiEventProcessor
 {
 	Q_OBJECT
-	MM_OPERATORS
 	mapPropertyFromModel(int,getVolume,setVolume,m_volumeModel);
 public:
 	InstrumentTrack( TrackContainer* tc );

include/MemoryManager.h

@@ -1,111 +0,0 @@
-/*
- * MemoryManager.h
- *
- * Copyright (c) 2017 Lukas W <lukaswhl/at/gmail.com>
- * Copyright (c) 2014 Vesa Kivimäki
- * Copyright (c) 2007-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- *
- * This file is part of LMMS - https://lmms.io
- *
- * This program 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 2 of the License, or (at your option) any later version.
- *
- * This program 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 program (see COPYING); if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA.
- *
- */
-
-#ifndef LMMS_MEMORY_MANAGER_H
-#define LMMS_MEMORY_MANAGER_H
-
-#include <cstddef>
-#include <vector>
-
-#include "lmms_export.h"
-
-namespace lmms
-{
-
-
-class LMMS_EXPORT MemoryManager
-{
-public:
-	struct ThreadGuard
-	{
-		ThreadGuard();
-		~ThreadGuard();
-	};
-
-	static void * alloc( size_t size );
-	static void free( void * ptr );
-};
-
-template<typename T>
-struct MmAllocator
-{
-	using value_type = T;
-	template<class U>  struct rebind {
-		using other = MmAllocator<U>;
-	};
-
-	T* allocate( std::size_t n )
-	{
-		return reinterpret_cast<T*>( MemoryManager::alloc( sizeof(T) * n ) );
-	}
-
-	void deallocate( T* p, std::size_t )
-	{
-		MemoryManager::free( p );
-	}
-
-	using vector = std::vector<T, MmAllocator<T>>;
-};
-
-
-#define MM_OPERATORS								\
-public: 											\
-static void * operator new ( size_t size )		\
-{													\
-	return MemoryManager::alloc( size );			\
-}													\
-static void * operator new[] ( size_t size )		\
-{													\
-	return MemoryManager::alloc( size );			\
-}													\
-static void operator delete ( void * ptr )		\
-{													\
-	MemoryManager::free( ptr );					\
-}													\
-static void operator delete[] ( void * ptr )	\
-{													\
-	MemoryManager::free( ptr );					\
-}
-
-// for use in cases where overriding new/delete isn't a possibility
-template<typename T>
-T* MM_ALLOC(size_t count)
-{
-	return reinterpret_cast<T*>(
-		MemoryManager::alloc(sizeof(T) * count));
-}
-
-// and just for symmetry...
-template<typename T>
-void MM_FREE(T* ptr)
-{
-	MemoryManager::free(ptr);
-}
-
-
-} // namespace lmms
-
-#endif // LMMS_MEMORY_MANAGER_H

include/MidiEventProcessor.h

@@ -26,7 +26,6 @@
 #define LMMS_MIDI_EVENT_PROCESSOR_H
 
 #include "MidiEvent.h"
-#include "MemoryManager.h"
 #include "TimePos.h"
 
 namespace lmms
@@ -35,7 +34,6 @@ namespace lmms
 // all classes being able to process MIDI-events should inherit from this
 class MidiEventProcessor
 {
-	MM_OPERATORS
 public:
 	MidiEventProcessor() = default;
 

include/NotePlayHandle.h

@@ -32,7 +32,6 @@
 #include "Note.h"
 #include "PlayHandle.h"
 #include "Track.h"
-#include "MemoryManager.h"
 
 class QReadWriteLock;
 
@@ -47,7 +46,6 @@ using ConstNotePlayHandleList = QList<const NotePlayHandle*>;
 
 class LMMS_EXPORT NotePlayHandle : public PlayHandle, public Note
 {
-	MM_OPERATORS
 public:
 	void * m_pluginData;
 	std::unique_ptr<BasicFilters<>> m_filter;
@@ -273,7 +271,6 @@ public:
 private:
 	class BaseDetuning
 	{
-		MM_OPERATORS
 	public:
 		BaseDetuning( DetuningHelper* detuning );
 
@@ -341,7 +338,6 @@ const int NPH_CACHE_INCREMENT = 16;
 
 class NotePlayHandleManager
 {
-	MM_OPERATORS
 public:
 	static void init();
 	static NotePlayHandle * acquire( InstrumentTrack* instrumentTrack,

include/Plugin.h

@@ -30,7 +30,6 @@
 
 #include "JournallingObject.h"
 #include "Model.h"
-#include "MemoryManager.h"
 
 
 class QWidget;
@@ -71,7 +70,6 @@ class PluginView;
 */
 class LMMS_EXPORT Plugin : public Model, public JournallingObject
 {
-	MM_OPERATORS
 	Q_OBJECT
 public:
 	enum class Type

include/RingBuffer.h

@@ -29,7 +29,7 @@
 #include <cmath>
 #include <QObject>
 #include "lmms_basics.h"
-#include "MemoryManager.h"
+#include "lmms_export.h"
 
 
 namespace lmms
@@ -41,7 +41,6 @@ namespace lmms
 class LMMS_EXPORT RingBuffer : public QObject
 {
 	Q_OBJECT
-	MM_OPERATORS
 public:
 /** \brief Constructs a ringbuffer of specified size, will not care about samplerate changes
  * 	\param size The size of the buffer in frames. The actual size will be size + period size

include/Track.h

@@ -67,7 +67,6 @@ char const *const FILENAME_FILTER = "[\\0000-\x1f\"*/:<>?\\\\|\x7f]";
 class LMMS_EXPORT Track : public Model, public JournallingObject
 {
 	Q_OBJECT
-	MM_OPERATORS
 	mapPropertyFromModel(bool,isMuted,setMuted,m_mutedModel);
 	mapPropertyFromModel(bool,isSolo,setSolo,m_soloModel);
 public:

include/ValueBuffer.h

@@ -28,7 +28,6 @@
 
 #include <vector>
 
-#include "MemoryManager.h"
 #include "lmms_export.h"
 
 namespace lmms
@@ -37,7 +36,6 @@ namespace lmms
 
 class LMMS_EXPORT ValueBuffer : public std::vector<float>
 {
-	MM_OPERATORS
 public:
 	ValueBuffer() = default;
 	ValueBuffer(int length);