Changeset 693

Timestamp:

02/11/08 04:38:23 (10 months ago)

Author:

dormando

Message:

Seems like -k never worked: it requires privileges to lock the memory,
but they were dropped before the call, and return value was never tested
to see if the call succedded.

Also update -k documentation.
By Tomash Brechko (minor edit by me)

Files:

• trunk/server/memcached.c (modified) (3 diffs)

trunk/server/memcached.c

@@ -2554 +2554 @@
-           "-M            return error on memory exhausted (rather than removing items)\n"
-           "-c <num>      max simultaneous connections, default is 1024\n"
-
+
+
+
+
+
+
-           "-v            verbose (print errors/warnings while in event loop)\n"
-           "-vv           very verbose (also print client commands/reponses)\n"
@@ -2861 +2866 @@
-    }
-
+    /* lock paged memory if needed */
+    if (lock_memory) {
+#ifdef HAVE_MLOCKALL
+        int res = mlockall(MCL_CURRENT | MCL_FUTURE);
+        if (res != 0) {
+            fprintf(stderr, "warning: -k invalid, mlockall() failed: %s\n",
+                    strerror(errno));
+        }
+#else
+        fprintf(stderr, "warning: -k invalid, mlockall() not supported on this platform.  proceeding without.\n");
+#endif
+    }
+
-    /* lose root privileges if we have them */
-    if (getuid() == 0 || geteuid() == 0) {
@@ -2918 +2936 @@
-        }
-        memset(buckets, 0, sizeof(int) * MAX_BUCKETS);
-    }
-
-    /* lock paged memory if needed */
-    if (lock_memory) {
-#ifdef HAVE_MLOCKALL
-        mlockall(MCL_CURRENT | MCL_FUTURE);
-#else
-        fprintf(stderr, "warning: mlockall() not supported on this platform.  proceeding without.\n");
-#endif
-    }
-