Changeset 4251:abe188f70256 in roaraudio

Timestamp:

08/25/10 16:18:35 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added more levels, added more segments

Location:

roard

Files:

• include/memlock.h (modified) (1 diff)
• memlock.c (modified) (3 diffs)

roard/include/memlock.h

@@ -32 +32 @@
 #define MEMLOCK_LOW          1
 #define MEMLOCK_MEDIUM       2
-#define MEMLOCK_ALL          127
+#define MEMLOCK_HIGH         3
+#define MEMLOCK_NEARLYALL    124
+#define MEMLOCK_NEARLYALLSYS 125 /* include stack and heap if possible */
+#define MEMLOCK_ALLCUR       126 /* specal as it uses roar_mm_mlockall() excluding future pages */
+#define MEMLOCK_ALL          127 /* specal as it uses roar_mm_mlockall() including future pages */
 
 #define MEMLOCK_DEFAULT      MEMLOCK_LOW

roard/memlock.c

@@ -47 +47 @@
 
  memlock_register(MEMLOCK_MEDIUM, memlock_table, sizeof(memlock_table));
+
+ memlock_register(MEMLOCK_MEDIUM, g_clients, sizeof(g_clients));
+ memlock_register(MEMLOCK_MEDIUM, g_streams, sizeof(g_streams));
+
+ memlock_register(MEMLOCK_HIGH, g_listen, sizeof(g_listen));
+ memlock_register(MEMLOCK_HIGH, &g_counters, sizeof(g_counters));
 }
 
@@ -85 +91 @@
  } else if ( !strcasecmp(str, "medium") ) {
   return MEMLOCK_MEDIUM;
+ } else if ( !strcasecmp(str, "high") ) {
+  return MEMLOCK_HIGH;
+ } else if ( !strcasecmp(str, "nearlyall") ) {
+  return MEMLOCK_NEARLYALL;
+ } else if ( !strcasecmp(str, "nearlyallsys") ) {
+  return MEMLOCK_NEARLYALLSYS;
+ } else if ( !strcasecmp(str, "allcur") ) {
+  return MEMLOCK_ALLCUR;
  } else if ( !strcasecmp(str, "all") ) {
   return MEMLOCK_ALL;
@@ -116 +130 @@
   // if we do not have ROAR_HAVE_MLOCKALL we do not have MCL_* flags.
   // we just try to lock all known segments as fallback.
+  old_level = MEMLOCK_ALL;
   return roar_mm_mlockall(MCL_CURRENT|MCL_FUTURE);
 #endif
- } else if ( old_level == MEMLOCK_ALL ) {
+ } else if ( level == MEMLOCK_ALLCUR ) {
+#ifdef ROAR_HAVE_MLOCKALL
+  old_level = MEMLOCK_ALLCUR;
+  return roar_mm_mlockall(MCL_CURRENT);
+#endif
+ } else if ( old_level == MEMLOCK_ALL || old_level == MEMLOCK_ALLCUR ) {
 #ifdef ROAR_HAVE_MUNLOCKALL
   ret = roar_mm_munlockall();