ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

[Summary] Added correct memory alignment for Windows in ../pbd/malign.h

Browse Source 
[Reviewed by] YPozdnyakov
This commit is contained in:
Greg Zharun 2015-04-09 13:27:57 +03:00 committed by Paul Davis
parent 24c531a9a6
commit 92e4f227de
4 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/audio_buffer.cc
View File

@ -43,7 +43,7 @@ AudioBuffer::AudioBuffer(size_t capacity)
AudioBuffer::~AudioBuffer()
{
if (_owns_data)
free(_data);
cache_aligned_free(_data);
}
void
@ -60,7 +60,7 @@ AudioBuffer::resize (size_t size)
return;
}
free (_data);
cache_aligned_free (_data);
cache_aligned_malloc ((void**) &_data, sizeof (Sample) * size);

4
libs/ardour/midi_buffer.cc
View File

@ -44,7 +44,7 @@ MidiBuffer::MidiBuffer(size_t capacity)
MidiBuffer::~MidiBuffer()
{
free(_data);
cache_aligned_free(_data);
}
void
@ -60,7 +60,7 @@ MidiBuffer::resize(size_t size)
return;
}
free (_data);
cache_aligned_free (_data);
cache_aligned_malloc ((void**) &_data, size);

19
libs/pbd/malign.cc
View File

@ -38,6 +38,15 @@ static const int CPU_CACHE_ALIGN = 16; /* arguably 32 on most arches, but it mat
int cache_aligned_malloc (void** memptr, size_t size)
{
#ifndef HAVE_POSIX_MEMALIGN
#ifdef PLATFORM_WINDOWS
if (((*memptr) = _aligned_malloc (size, CPU_CACHE_ALIGN)) == 0) {
fatal << string_compose (_("Memory allocation error: malloc (%1 * %2) failed (%3)"),
CPU_CACHE_ALIGN, size, strerror (errno)) << endmsg;
return errno;
} else {
return 0;
}
#else
if (((*memptr) = malloc (size)) == 0) {
fatal << string_compose (_("Memory allocation error: malloc (%1 * %2) failed (%3)"),
CPU_CACHE_ALIGN, size, strerror (errno)) << endmsg;
@ -45,6 +54,7 @@ int cache_aligned_malloc (void** memptr, size_t size)
} else {
return 0;
}
#endif
#else
if (posix_memalign (memptr, CPU_CACHE_ALIGN, size)) {
fatal << string_compose (_("Memory allocation error: posix_memalign (%1 * %2) failed (%3)"),
@ -54,3 +64,12 @@ int cache_aligned_malloc (void** memptr, size_t size)
return 0;
#endif
}
void cache_aligned_free (void* memptr)
{
#ifdef PLATFORM_WINDOWS
_aligned_free (memptr);
#else
free (memptr);
#endif
}

3
libs/pbd/pbd/malign.h
View File

@ -24,6 +24,7 @@
#include "pbd/libpbd_visibility.h"
LIBPBD_API int cache_aligned_malloc (void** memptr, size_t size);
LIBPBD_API int cache_aligned_malloc (void** memptr, size_t size);
LIBPBD_API void cache_aligned_free (void* memptr);
#endif /* __pbd_malign_h__ */