Check if memory locking should be done before locking unconditionally

Project-OSRM · Oct 19, 2015 · 78283a0 · 78283a0
1 parent 993321e
commit 78283a0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/routed.cpp b/routed.cpp
@@ -93,15 +93,15 @@ int main(int argc, const char *argv[]) try
     {
         explicit MemoryLocker(bool shouldLock_) : shouldLock(shouldLock_)
         {
-            if (-1 == mlockall(MCL_CURRENT | MCL_FUTURE))
+            if (shouldLock && -1 == mlockall(MCL_CURRENT | MCL_FUTURE))
             {
                 couldLock = false;
                 SimpleLogger().Write(logWARNING) << "memory could not be locked to RAM";
             }
         }
         ~MemoryLocker()
         {
-            if (couldLock)
+            if (shouldLock && couldLock)
                 (void)munlockall();
         }
         bool shouldLock = false, couldLock = true;