From 9ef2fba7516bc56a94792dde43ff01dc6d477edd Mon Sep 17 00:00:00 2001
From: Jens Ahrensfeld <jens@jayfield.org>
Date: Mon, 5 Jan 2015 12:11:12 +0000
Subject: [PATCH] - Eigen malloc check

git-svn-id: http://moon:8086/svn/software/trunk/projects/mpsk_rx_gui@114 b431acfa-c32f-4a4a-93f1-934dc6c82436
---
 Builds/Linux/Makefile | 14 ++++++++++----
 M-PSK Receiver.jucer  |  4 +++-
 Source/Receiver.cpp   |  4 ++++
 Source/Receiver.h     |  1 +
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Builds/Linux/Makefile b/Builds/Linux/Makefile
index 52103de..bf8a51b 100644
--- a/Builds/Linux/Makefile
+++ b/Builds/Linux/Makefile
@@ -18,12 +18,12 @@ ifeq ($(CONFIG),Debug)
     TARGET_ARCH := -march=native
   endif
 
-  CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "radio_float_t=float" -D "fir_float_t=float" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I ../../../../libsrc -I ../../../../libsrc/cpp -I ../../Source -I /usr/local/include/eigen3
+  CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "radio_float_t=float" -D "fir_float_t=float" -D "EIGEN_RUNTIME_NO_MALLOC" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I ../../../../libsrc -I ../../../../libsrc/cpp -I ../../Source -I /usr/local/include/eigen3
   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11
   CXXFLAGS += $(CFLAGS)
   LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -L../../../../libsrc/build/linux -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -lradio -lfir -lcrc 
   LDDEPS :=
-  RESFLAGS :=  -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "radio_float_t=float" -D "fir_float_t=float" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I ../../../../libsrc -I ../../../../libsrc/cpp -I ../../Source -I /usr/local/include/eigen3
+  RESFLAGS :=  -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "radio_float_t=float" -D "fir_float_t=float" -D "EIGEN_RUNTIME_NO_MALLOC" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I ../../../../libsrc -I ../../../../libsrc/cpp -I ../../Source -I /usr/local/include/eigen3
   TARGET := M-PSK\ Receiver
   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
   CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
@@ -39,18 +39,19 @@ ifeq ($(CONFIG),Release)
     TARGET_ARCH := -march=native
   endif
 
-  CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "NDEBUG" -D "radio_float_t=float" -D "fir_float_t=float" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I ../../../../libsrc -I ../../../../libsrc/cpp -I ../../Source -I /usr/local/include/eigen3
+  CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "NDEBUG" -D "radio_float_t=float" -D "fir_float_t=float" -D "EIGEN_RUNTIME_NO_MALLOC" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I ../../../../libsrc -I ../../../../libsrc/cpp -I ../../Source -I /usr/local/include/eigen3
   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11
   CXXFLAGS += $(CFLAGS)
   LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -L../../../../libsrc/build/linux -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -lradio -lfir -lcrc 
   LDDEPS :=
-  RESFLAGS :=  -D "LINUX=1" -D "NDEBUG" -D "radio_float_t=float" -D "fir_float_t=float" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I ../../../../libsrc -I ../../../../libsrc/cpp -I ../../Source -I /usr/local/include/eigen3
+  RESFLAGS :=  -D "LINUX=1" -D "NDEBUG" -D "radio_float_t=float" -D "fir_float_t=float" -D "EIGEN_RUNTIME_NO_MALLOC" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I ../../../../libsrc -I ../../../../libsrc/cpp -I ../../Source -I /usr/local/include/eigen3
   TARGET := M-PSK\ Receiver
   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
   CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
 endif
 
 OBJECTS := \
+  $(OBJDIR)/Frame_c2c56272.o \
   $(OBJDIR)/GraphComponent_e41edf58.o \
   $(OBJDIR)/LogComponent_246d8222.o \
   $(OBJDIR)/Receiver_5b8294f8.o \
@@ -92,6 +93,11 @@ strip:
 	@echo Stripping M-QAM Transceiver
 	-@strip --strip-unneeded $(OUTDIR)/$(TARGET)
 
+$(OBJDIR)/Frame_c2c56272.o: ../../../../libsrc/cpp/radio/Frame.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling Frame.cpp"
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 $(OBJDIR)/GraphComponent_e41edf58.o: ../../Source/GraphComponent.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling GraphComponent.cpp"
diff --git a/M-PSK Receiver.jucer b/M-PSK Receiver.jucer
index f96bc2e..dd7218c 100644
--- a/M-PSK Receiver.jucer	
+++ b/M-PSK Receiver.jucer	
@@ -6,6 +6,8 @@
               companyEmail="jens@jayfield.org">
   <MAINGROUP id="qBtndB" name="M-QAM Transceiver">
     <GROUP id="{17E40C0A-AFC5-1BD1-AD90-8289DE60E569}" name="Source">
+      <FILE id="mkpzpv" name="Frame.cpp" compile="1" resource="0" file="../../libsrc/cpp/radio/Frame.cpp"/>
+      <FILE id="q7fjHc" name="Frame.hpp" compile="0" resource="0" file="../../libsrc/cpp/radio/Frame.hpp"/>
       <FILE id="uM1PwN" name="GraphComponent.cpp" compile="1" resource="0"
             file="Source/GraphComponent.cpp"/>
       <FILE id="HunI5I" name="GraphComponent.h" compile="0" resource="0"
@@ -35,7 +37,7 @@
   </MAINGROUP>
   <EXPORTFORMATS>
     <LINUX_MAKE targetFolder="Builds/Linux" externalLibraries="radio&#10;fir&#10;crc&#10;"
-                extraDefs="" extraCompilerFlags="-std=c++11&#10;&#10;">
+                extraDefs="EIGEN_RUNTIME_NO_MALLOC" extraCompilerFlags="-std=c++11&#10;&#10;">
       <CONFIGURATIONS>
         <CONFIGURATION name="Debug" libraryPath="/usr/X11R6/lib/&#10;../../../../libsrc/build/linux&#10;"
                        isDebug="1" optimisation="1" targetName="M-PSK Receiver" headerPath="../../../../libsrc&#10;../../../../libsrc/cpp&#10;../../Source&#10;/usr/local/include/eigen3"
diff --git a/Source/Receiver.cpp b/Source/Receiver.cpp
index e8870cc..9b04ed4 100644
--- a/Source/Receiver.cpp
+++ b/Source/Receiver.cpp
@@ -362,6 +362,7 @@ void Receiver::timerCallback()
 
 void Receiver::processPassband(RVec const &rf, uint32_t len)
 {
+	Eigen::internal::set_is_malloc_allowed(false);
 	const ScopedLock sl (m_lock);
 
 	uint32_t len_down;
@@ -397,6 +398,9 @@ void Receiver::processPassband(RVec const &rf, uint32_t len)
 	// Arm Filtering and downsampling
 	len_down = m_firArmDown.process(m_basebandBuffer, m_passbandBuffer, len);
 	processBaseband(m_basebandBuffer, len_down);
+
+	Eigen::internal::set_is_malloc_allowed(true);
+	
 }
 
 void Receiver::processBaseband(float *pI, float *pQ, uint32_t len)
diff --git a/Source/Receiver.h b/Source/Receiver.h
index fa7c2e8..97b2a47 100644
--- a/Source/Receiver.h
+++ b/Source/Receiver.h
@@ -12,6 +12,7 @@
 #include "JuceHeader.h"
 #include "LogComponent.h"
 
+#include <radio/Vector.hpp>
 #include <radio/FirComplex.hpp>
 #include <radio/Equalizer.hpp>
 #include <radio/Interpolation.hpp>