enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

[ardour.git] / libs / pbd / malign.cc

diff --git a/libs/pbd/malign.cc b/libs/pbd/malign.cc
index 978ca0045118cf73a572a1a9f2200c19438f7774..59c6c4469ef3f5b61260e7c8e475948b7c392319 100644 (file)
--- a/libs/pbd/malign.cc
+++ b/libs/pbd/malign.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Paul Davis 
+    Copyright (C) 2012 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,11 +25,11 @@
 #include "pbd/malign.h"
 #include "pbd/error.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 
-#ifdef __x86_64__
+#if ( defined(__x86_64__) || defined(_M_X64) )
 static const int CPU_CACHE_ALIGN = 64;
 #else
 static const int CPU_CACHE_ALIGN = 16; /* arguably 32 on most arches, but it matters less */
@@ -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)"),
@@ -52,5 +62,53 @@ int cache_aligned_malloc (void** memptr, size_t size)
        }
 
        return 0;
-#endif 
+#endif
+}
+
+void cache_aligned_free (void* memptr)
+{
+#ifdef PLATFORM_WINDOWS
+       _aligned_free (memptr);
+#else
+       free (memptr);
+#endif
+}
+
+int  aligned_malloc (void** memptr, size_t size, size_t alignment)
+{
+#ifndef HAVE_POSIX_MEMALIGN
+#ifdef PLATFORM_WINDOWS
+       if (((*memptr) = _aligned_malloc (size, alignment)) == 0) {
+               fatal << string_compose (_("Memory allocation error: malloc (%1 * %2) failed (%3)"),
+                                        alignment, 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)"),
+                                        alignment, size, strerror (errno)) << endmsg;
+               return errno;
+       } else {
+               return 0;
+       }
+#endif
+#else
+        if (posix_memalign (memptr, alignment, size)) {
+               fatal << string_compose (_("Memory allocation error: posix_memalign (%1 * %2) failed (%3)"),
+                                        alignment, size, strerror (errno)) << endmsg;
+       }
+
+       return 0;
+#endif
+}
+
+void aligned_free (void* memptr)
+{
+#ifdef PLATFORM_WINDOWS
+       _aligned_free (memptr);
+#else
+       free (memptr);
+#endif
 }