Changeset 4243:2ab21e14c42a in roaraudio

Timestamp:

08/25/10 15:36:19 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

replaced *ROAR_MLOCK() with modern roar_mm_m*lock*()

Files:

• include/libroar/memmgr.h (modified) (1 diff)
• include/roaraudio.h (modified) (1 diff)
• libroar/libroar.c (modified) (2 diffs)
• roard/output.c (modified) (1 diff)

include/libroar/memmgr.h

@@ -60 +60 @@
 #endif
 
+
+// memory locking:
+
+#if defined(ROAR_HAVE_MLOCK) && defined(__linux__)
+#define roar_mm_mlock(addr, len) mlock((addr), (len))
+#elif defined(ROAR_TARGET_MICROCONTROLLER)
+#define roar_mm_mlock(addr, len) 0
+#else
+int roar_mm_mlock(const void *addr, size_t len);
+#endif
+
+#if defined(ROAR_HAVE_MUNLOCK) && defined(__linux__)
+#define roar_mm_munlock(addr, len) munlock((addr), (len))
+#elif defined(ROAR_TARGET_MICROCONTROLLER)
+#define roar_mm_munlock(addr, len) 0
+#else
+int roar_mm_munlock(const void *addr, size_t len);
+#endif
+
+#if defined(ROAR_HAVE_MLOCKALL)
+#define roar_mm_mlockall(flags) mlockall((flags))
+#elif defined(ROAR_TARGET_MICROCONTROLLER)
+#define roar_mm_mlockall(flags) 0
+#else
+#define roar_mm_mlockall(flags) (-1)
+#endif
+
+#if defined(ROAR_HAVE_MUNLOCKALL)
+#define roar_mm_munlockall(flags) munlockall((flags))
+#elif defined(ROAR_TARGET_MICROCONTROLLER)
+#define roar_mm_munlockall(flags) 0
+#else
+#define roar_mm_munlockall(flags) (-1)
+#endif
+
+// for compatibility with old versions:
+#define ROAR_MLOCK _ROAR_MLOCK
+
 #endif
 

include/roaraudio.h

@@ -294 +294 @@
 #endif
 
-#ifdef ROAR_HAVE_MLOCK
-#ifdef __linux__
-#define ROAR_MLOCK(p,s) mlock((p), (s))
-#else
-int _ROAR_MLOCK(const void *addr, size_t len);
-#define ROAR_MLOCK _ROAR_MLOCK
-#endif
-#endif
-
 #ifdef ROAR_HAVE_STRCASESTR
 #define _roar_strcasestr(a,b) strcasestr((a), (b))

libroar/libroar.c

@@ -36 +36 @@
 #include "libroar.h"
 
-int _ROAR_MLOCK(const void *addr, size_t len) {
+#ifndef roar_mm_mlock
+int roar_mm_mlock(const void *addr, size_t len) {
 #if defined(ROAR_TARGET_WIN32)
  return GlobalLock(addr) == addr ? 0 : -1;
@@ -52 +53 @@
 #endif
 }
+#endif
+
+#ifndef roar_mm_munlock
+int roar_mm_munlock(const void *addr, size_t len) {
+#if defined(ROAR_TARGET_WIN32)
+ // TODO: find out what do do here. GlobalUnLock()? does such a function exist?
+// return GlobalLock(addr) == addr ? 0 : -1;
+ return -1;
+#elif defined(ROAR_TARGET_MICROCONTROLLER)
+ return 0;
+#else
+ long sz = sysconf(_SC_PAGESIZE);
+ unsigned long int pos = (unsigned long int) addr;
+
+ len += sz - (len % sz);
+
+ pos -= pos % sz;
+
+ return munlock((void*)pos, len);
+#endif
+}
+#endif
+
+// for compatibility with old versions:
+int _ROAR_MLOCK(const void *addr, size_t len) {
+ roar_debug_warn_obsolete("_ROAR_MLOCK", "roar_mm_mlock", NULL);
+ return roar_mm_mlock(addr, len);
+}
 
 //ll

roard/output.c

@@ -52 +52 @@
  ROAR_DBG("output_buffer_init(*): output buffer is at %p", buf);
 
+/* TODO: do this within the memlock part
 #ifdef ROAR_HAVE_MLOCK
  ROAR_MLOCK(buf, size);
 #endif
+*/
 
  output_buffer_reinit();