jens/mpsk_rx_gui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Eigen malloc check

Browse Source 
git-svn-id: http://moon:8086/svn/software/trunk/projects/mpsk_rx_gui@114 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2015-01-05 12:11:12 +00:00
parent b10343e9ad
commit 9ef2fba751
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Builds/Linux/Makefile
+10 -4
View File
@@ -18,12 +18,12 @@ ifeq ($(CONFIG),Debug)
TARGET_ARCH := -march=native TARGET_ARCH := -march=native
endif 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 CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11
CXXFLAGS += $(CFLAGS) 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 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 := 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 TARGET := M-PSK\ Receiver
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR) CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
@@ -39,18 +39,19 @@ ifeq ($(CONFIG),Release)
TARGET_ARCH := -march=native TARGET_ARCH := -march=native
endif 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 CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11
CXXFLAGS += $(CFLAGS) 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 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 := 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 TARGET := M-PSK\ Receiver
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR) CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
endif endif
OBJECTS := \ OBJECTS := \
$(OBJDIR)/Frame_c2c56272.o \
$(OBJDIR)/GraphComponent_e41edf58.o \ $(OBJDIR)/GraphComponent_e41edf58.o \
$(OBJDIR)/LogComponent_246d8222.o \ $(OBJDIR)/LogComponent_246d8222.o \
$(OBJDIR)/Receiver_5b8294f8.o \ $(OBJDIR)/Receiver_5b8294f8.o \
@@ -92,6 +93,11 @@ strip:
@echo Stripping M-QAM Transceiver @echo Stripping M-QAM Transceiver
-@strip --strip-unneeded $(OUTDIR)/$(TARGET) -@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 $(OBJDIR)/GraphComponent_e41edf58.o: ../../Source/GraphComponent.cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@echo "Compiling GraphComponent.cpp" @echo "Compiling GraphComponent.cpp"
M-PSK Receiver.jucer
+3 -1
View File
@@ -6,6 +6,8 @@
companyEmail="jens@jayfield.org"> companyEmail="jens@jayfield.org">
<MAINGROUP id="qBtndB" name="M-QAM Transceiver"> <MAINGROUP id="qBtndB" name="M-QAM Transceiver">
<GROUP id="{17E40C0A-AFC5-1BD1-AD90-8289DE60E569}" name="Source"> <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 id="uM1PwN" name="GraphComponent.cpp" compile="1" resource="0"
file="Source/GraphComponent.cpp"/> file="Source/GraphComponent.cpp"/>
<FILE id="HunI5I" name="GraphComponent.h" compile="0" resource="0" <FILE id="HunI5I" name="GraphComponent.h" compile="0" resource="0"
@@ -35,7 +37,7 @@
</MAINGROUP> </MAINGROUP>
<EXPORTFORMATS> <EXPORTFORMATS>
<LINUX_MAKE targetFolder="Builds/Linux" externalLibraries="radio&#10;fir&#10;crc&#10;" <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> <CONFIGURATIONS>
<CONFIGURATION name="Debug" libraryPath="/usr/X11R6/lib/&#10;../../../../libsrc/build/linux&#10;" <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" isDebug="1" optimisation="1" targetName="M-PSK Receiver" headerPath="../../../../libsrc&#10;../../../../libsrc/cpp&#10;../../Source&#10;/usr/local/include/eigen3"
Source/Receiver.cpp
+4
View File
@@ -362,6 +362,7 @@ void Receiver::timerCallback()
void Receiver::processPassband(RVec const &rf, uint32_t len) void Receiver::processPassband(RVec const &rf, uint32_t len)
{ {
Eigen::internal::set_is_malloc_allowed(false);
const ScopedLock sl (m_lock); const ScopedLock sl (m_lock);
uint32_t len_down; uint32_t len_down;
@@ -397,6 +398,9 @@ void Receiver::processPassband(RVec const &rf, uint32_t len)
// Arm Filtering and downsampling // Arm Filtering and downsampling
len_down = m_firArmDown.process(m_basebandBuffer, m_passbandBuffer, len); len_down = m_firArmDown.process(m_basebandBuffer, m_passbandBuffer, len);
processBaseband(m_basebandBuffer, len_down); processBaseband(m_basebandBuffer, len_down);
Eigen::internal::set_is_malloc_allowed(true);
} }
void Receiver::processBaseband(float *pI, float *pQ, uint32_t len) void Receiver::processBaseband(float *pI, float *pQ, uint32_t len)
Source/Receiver.h
+1
View File
@@ -12,6 +12,7 @@
#include "JuceHeader.h" #include "JuceHeader.h"
#include "LogComponent.h" #include "LogComponent.h"
#include <radio/Vector.hpp>
#include <radio/FirComplex.hpp> #include <radio/FirComplex.hpp>
#include <radio/Equalizer.hpp> #include <radio/Equalizer.hpp>
#include <radio/Interpolation.hpp> #include <radio/Interpolation.hpp>