From 97ac31376e2f08dcd4da50659990c5a6f8fe9b52 Mon Sep 17 00:00:00 2001
From: "roberto@oneiric64" <roberto@oneiric64>
Date: Sat, 28 Jan 2012 17:04:37 +0100
Subject: [PATCH] added --never-swap

---
 utils.c |  7 +++++++
 uwsgi.c | 19 ++++++++++++-------
 uwsgi.h |  2 ++
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/utils.c b/utils.c
index 2822e09c..c87531c5 100644
--- a/utils.c
+++ b/utils.c
@@ -3605,6 +3605,13 @@ pid_t uwsgi_fork(char *name) {
 
 	pid_t pid = fork();
 	if (pid == 0) {
+
+		if (uwsgi.never_swap) {
+                	if (mlockall( MCL_CURRENT | MCL_FUTURE )) {
+                        	uwsgi_error("mlockall()");
+                	}
+        	}
+
 #if defined(__linux__) || defined(__sun__)
 		int i;
 		for(i=0;i<uwsgi.argc;i++) {
diff --git a/uwsgi.c b/uwsgi.c
index 6a49d926..145f7e08 100644
--- a/uwsgi.c
+++ b/uwsgi.c
@@ -204,6 +204,7 @@ static struct uwsgi_option uwsgi_base_options[] = {
 #endif
 #endif
 */
+	{"never-swap", no_argument, 0, "lock all memory pages avoiding swapping", uwsgi_opt_true, &uwsgi.never_swap, 0},
 	{"touch-reload", required_argument, 0, "reload uWSGI if the specified file is modified/touched", uwsgi_opt_add_string_list, &uwsgi.touch_reload, UWSGI_OPT_MASTER},
 	{"propagate-touch", no_argument, 0, "over-engineering option for system with flaky signal mamagement", uwsgi_opt_true, &uwsgi.propagate_touch, 0},
 /*
@@ -331,16 +332,14 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"env", required_argument, 0, LONG_ARGS_ENV,0},
 */
 	{"vacuum", no_argument, 0, "try to remove all of the generated file/sockets", uwsgi_opt_true, &uwsgi.vacuum,0},
-/*
 #ifdef __linux__
 	{"cgroup", required_argument, 0, "put the processes in the specified cgroup", uwsgi_opt_add_string_list, &uwsgi.cgroup,0},
-	{"cgroup-opt", required_argument, 0, LONG_ARGS_CGROUP_OPT,0},
-	{"namespace", required_argument, 0, LONG_ARGS_LINUX_NS,0},
-	{"ns", required_argument, 0, LONG_ARGS_LINUX_NS,0},
-	{"namespace-net", required_argument, 0, LONG_ARGS_LINUX_NS_NET,0},
-	{"ns-net", required_argument, 0, LONG_ARGS_LINUX_NS_NET,0},
+	{"cgroup-opt", required_argument, 0, "set value in specified cgroup option", uwsgi_opt_add_string_list, &uwsgi.cgroup_opt,0},
+	{"namespace", required_argument, 0, "run in a new namespace under the specified rootfs", uwsgi_opt_set_str, &uwsgi.ns,0},
+	{"ns", required_argument, 0, "run in a new namespace under the specified rootfs", uwsgi_opt_set_str, &uwsgi.ns,0},
+	{"namespace-net", required_argument, 0, "add network namespace", uwsgi_opt_set_str, &uwsgi.ns_net, 0},
+	{"ns-net", required_argument, 0, "add network namespace", uwsgi_opt_set_str, &uwsgi.ns_net, 0},
 #endif
-*/
 	{"reuse-port", no_argument, 0, "enable REUSE_PORT flag on socket (BSD only)", uwsgi_opt_true, &uwsgi.reuse_port, 0},
 /*
 	{"zerg", required_argument, 0, LONG_ARGS_ZERG,0},
@@ -1406,6 +1405,12 @@ int main(int argc, char *argv[], char *envp[]) {
 	// ok, the options dictionary is available, lets manage it
 	uwsgi_configure();
 
+	if (uwsgi.never_swap) {
+		if (mlockall( MCL_CURRENT | MCL_FUTURE )) {
+			uwsgi_error("mlockall()");
+		}
+	}
+
 	// setup master logging
 	if (uwsgi.log_master) {
 
diff --git a/uwsgi.h b/uwsgi.h
index 3bb32fbb..da371167 100644
--- a/uwsgi.h
+++ b/uwsgi.h
@@ -1474,6 +1474,8 @@ struct uwsgi_server {
 	int unsubscribe_on_graceful_reload;
 	struct uwsgi_string_list *subscriptions;
 
+	int never_swap;
+
 #ifdef __linux__
 #ifdef MADV_MERGEABLE
 	int linux_ksm;