From 3d4a82a4b3e840ae0c507f293e06177ba3a78eda Mon Sep 17 00:00:00 2001 From: Larry Cai Date: Mon, 4 Nov 2019 13:43:11 +0100 Subject: [PATCH 1/8] Create .travis.yml --- .travis.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..f793e5e6 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,16 @@ +dist: bionic +addons: + apt: + packages: + - g++ + - make + - libboost-all-dev + - libomp-dev +script: + - cd src + - make install -f Makefiles/Makefile_linux_shared + - cd ../example + - export LD_LIBRARY_PATH=$PWD + - cp Makefiles/Makefile_linux Makefile + - make + - ./AnalysePlayBin From 65a88e7e4744c19e2c9ee562551c3a84cceddcd6 Mon Sep 17 00:00:00 2001 From: Larry Cai Date: Mon, 4 Nov 2019 13:43:52 +0100 Subject: [PATCH 2/8] Update Makefile_linux_shared --- src/Makefiles/Makefile_linux_shared | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefiles/Makefile_linux_shared b/src/Makefiles/Makefile_linux_shared index ec4a2c8a..1db293ee 100644 --- a/src/Makefiles/Makefile_linux_shared +++ b/src/Makefiles/Makefile_linux_shared @@ -119,8 +119,8 @@ clean: install: test -d ../test || mkdir ../test test -d ../examples || mkdir ../examples - cp $(STATIC_LIB) ../test - cp $(STATIC_LIB) ../examples + cp $(SHARED_LIB) ../test + cp $(SHARED_LIB) ../examples include $(INCL_DEPENDS) From cb5d49c1f2c983c75255ceb72509239b2df66775 Mon Sep 17 00:00:00 2001 From: Larry Cai Date: Mon, 4 Nov 2019 14:25:03 +0100 Subject: [PATCH 3/8] Update .travis.yml --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index f793e5e6..567f8299 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +lang: c++ dist: bionic addons: apt: @@ -8,6 +9,8 @@ addons: - libomp-dev script: - cd src + - pwd + - ls - make install -f Makefiles/Makefile_linux_shared - cd ../example - export LD_LIBRARY_PATH=$PWD From 4c243c269d7f9f7d3cadd424d90e6c3f8c72ed48 Mon Sep 17 00:00:00 2001 From: Larry Cai Date: Mon, 4 Nov 2019 14:44:47 +0100 Subject: [PATCH 4/8] Update .travis.yml --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 567f8299..5cf1a744 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,7 @@ addons: - libomp-dev script: - cd src - - pwd - - ls + - make Makefiles/Makefile_linux_shared - make install -f Makefiles/Makefile_linux_shared - cd ../example - export LD_LIBRARY_PATH=$PWD From 0c1b98c9cc21a7ec97fd0c58b39a49987bba9fe7 Mon Sep 17 00:00:00 2001 From: Larry Cai Date: Mon, 4 Nov 2019 14:51:30 +0100 Subject: [PATCH 5/8] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5cf1a744..3c0713d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -lang: c++ +language: cpp dist: bionic addons: apt: From 618d5e8526e97c372eea53de2e3aede651012689 Mon Sep 17 00:00:00 2001 From: Larry Cai Date: Mon, 4 Nov 2019 14:54:32 +0100 Subject: [PATCH 6/8] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3c0713d4..c98c5a8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ addons: - libomp-dev script: - cd src - - make Makefiles/Makefile_linux_shared + - make -f Makefiles/Makefile_linux_shared - make install -f Makefiles/Makefile_linux_shared - cd ../example - export LD_LIBRARY_PATH=$PWD From 2e93f29155356375e54182865c77436b85fd3776 Mon Sep 17 00:00:00 2001 From: Larry Cai Date: Mon, 4 Nov 2019 14:58:15 +0100 Subject: [PATCH 7/8] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c98c5a8a..febc2015 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ script: - cd src - make -f Makefiles/Makefile_linux_shared - make install -f Makefiles/Makefile_linux_shared - - cd ../example + - cd ../examples - export LD_LIBRARY_PATH=$PWD - cp Makefiles/Makefile_linux Makefile - make From e8b1cfe54926603fee86db8c75ca06d015c6ee4d Mon Sep 17 00:00:00 2001 From: Larry Cai Date: Sat, 9 Nov 2019 20:11:51 +0100 Subject: [PATCH 8/8] Add Patch from redeal * patch from https://github.com/anntzer/redeal/commit/4a1b95f7870cc7 Signed-off-by: Larry Cai --- src/System.cpp | 3 ++- src/dds.cpp | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/System.cpp b/src/System.cpp index 3deb5180..a3c237d9 100644 --- a/src/System.cpp +++ b/src/System.cpp @@ -225,7 +225,8 @@ void System::GetHardware( #ifdef __linux__ // The code for linux was suggested by Antony Lee. FILE * fifo = popen( - "free -k | tail -n+3 | head -n1 | awk '{print $NF}'", "r"); + "grep -Po 'MemAvailable:\\s*\\K[0-9]*' /proc/meminfo || " + "grep -Po 'MemFree:\\s*\\K[0-9]*' /proc/meminfo", "r"); int ignore = fscanf(fifo, "%llu", &kilobytesFree); fclose(fifo); diff --git a/src/dds.cpp b/src/dds.cpp index fad30225..20afa4a2 100644 --- a/src/dds.cpp +++ b/src/dds.cpp @@ -34,7 +34,6 @@ extern "C" BOOL APIENTRY DllMain( else if (ul_reason_for_call == DLL_PROCESS_DETACH) { CloseDebugFiles(); - FreeMemory(); #ifdef DDS_MEMORY_LEAKS_WIN32 _CrtDumpMemoryLeaks(); #endif @@ -59,7 +58,6 @@ void DDSInitialize(void) void DDSFinalize(void) { CloseDebugFiles(); - FreeMemory(); } #elif defined(USES_CONSTRUCTOR) @@ -73,7 +71,6 @@ static void __attribute__ ((constructor)) libInit(void) static void __attribute__ ((destructor)) libEnd(void) { CloseDebugFiles(); - FreeMemory(); } #endif