Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
2a08909
Move aligned malloc to MemoryManager.h, port to stl allocator
lukas-w Nov 30, 2017
3c73270
Rename MemoryManager.h to Memory.h
lukas-w Nov 30, 2017
1340c27
Memory.h fixes
lukas-w Apr 15, 2018
1cd8e15
Replace LocklessAllocator with new MemoryPool class
lukas-w Apr 15, 2018
3e1a966
Replace NotePlayHandleManager implementation with MemoryPool
lukas-w Apr 17, 2018
178888a
BufferManager: Use MemoryPool, rename to BufferPool
lukas-w Apr 17, 2018
2cb4455
Replace AllignedAllocator implementation with rpmalloc calls
lukas-w Apr 18, 2018
ef7b8c6
Add naive benchmarks
lukas-w Apr 18, 2018
8b122d5
Fix libcds on MinGW
lukas-w Apr 29, 2018
2f8e231
Fix macOS linking problem
lukas-w Jun 19, 2018
119efee
Fix tests crash due to incomplete cleanup
lukas-w Jun 21, 2018
71e9b45
Memory: Fix wrong rebind
lukas-w Jul 8, 2018
5349be6
NiftyCounter: Fix decrement
lukas-w Aug 3, 2018
d35df8e
Move BufferPool::clear to MixHelpers and rewrite
lukas-w Aug 25, 2019
bd1ee29
Silence int conversion warning
lukas-w Aug 25, 2019
e21c00e
Apply suggestions by @PhysSong
lukas-w May 4, 2020
68d7157
Merge branch 'master' into refac/memory
lukas-w May 4, 2020
62606b6
Try to fix CircleCI linux build
lukas-w May 6, 2020
1cd8b7a
Fix libcds nifty counter typo
lukas-w May 11, 2020
29df871
Add nifty counter instance to MmAllocaator
lukas-w May 6, 2020
78c92e8
Tests: Allow specifying test suit name
lukas-w May 6, 2020
5ae42ca
Try to fix libcds counters issues
lukas-w May 11, 2020
a64f83e
Fix libcds MSVC compilation
lukas-w May 11, 2020
74ee635
Merge remote-tracking branch 'origin/master' into refac/memory
lukas-w May 12, 2020
ac0081d
Fix crash on exit with MSVC
lukas-w May 14, 2020
846ca17
CMake: Build lmms shared library instead of object library
lukas-w May 22, 2020
9df27e9
Merge branch 'master' into refac/memory
lukas-w Dec 11, 2020
ac5b3f0
Revert irrelevant changes
PhysSong Sep 21, 2024
47e6a30
Merge branch 'master' into refac/memory
PhysSong Oct 3, 2024
7ce62fe
Always build libcds as a static library
PhysSong Oct 3, 2024
7782954
Fix namespace
PhysSong Oct 3, 2024
f54ac45
Remove leftover of mingw-std-threads
PhysSong Oct 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Try to fix CircleCI linux build
  • Loading branch information
lukas-w committed May 6, 2020
commit 62606b64fecf31e308922da41e18b51b6ec8caaa
3 changes: 0 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,6 @@ ENDIF()
# Resolve Qt5::qmake to full path for use in packaging scripts
GET_TARGET_PROPERTY(QT_QMAKE_EXECUTABLE "${Qt5Core_QMAKE_EXECUTABLE}" IMPORTED_LOCATION)

FIND_PACKAGE(Qt5Test)
SET(QT_QTTEST_LIBRARY Qt5::Test)

# check for libsndfile
FIND_PACKAGE(SndFile REQUIRED)
IF(NOT SNDFILE_FOUND)
Expand Down
4 changes: 3 additions & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}/src")

SET(CMAKE_CXX_STANDARD 11)

FIND_PACKAGE(Qt5Test)

SET(CMAKE_AUTOMOC ON)

ADD_EXECUTABLE(tests
Expand All @@ -24,5 +26,5 @@ ADD_EXECUTABLE(tests
TARGET_COMPILE_DEFINITIONS(tests
PRIVATE $<TARGET_PROPERTY:lmmsobjs,INTERFACE_COMPILE_DEFINITIONS>
)
TARGET_LINK_LIBRARIES(tests ${QT_LIBRARIES} ${QT_QTTEST_LIBRARY})
TARGET_LINK_LIBRARIES(tests ${QT_LIBRARIES} Qt5::Test)
TARGET_LINK_LIBRARIES(tests ${LMMS_REQUIRED_LIBS})
2 changes: 1 addition & 1 deletion tests/src/core/MemoryPoolTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ private slots:
ptrs.push(pool.allocate_bounded());
QVERIFY(ptrs.top());
}
QCOMPARE(pool.allocate_bounded(), nullptr);
QCOMPARE(pool.allocate_bounded(), static_cast<T*>(nullptr));
ptrs.push(pool.allocate());
QVERIFY(ptrs.top());

Expand Down