added support for cache backing store

.hgtags

@@ -11,3 +11,4 @@ b8f67c6cd0d62f864db9b2b265b4e260ad7d873c 0.9.6-rc2
 ef31fc61ac48018c464f28ebfdf865b96bf83f18 0.9.6.2
 9e100c1f085034396cec586f0c76ad3f9800d1a5 0.9.7-beta1
 ff4111eb8f55b958ec91c70163e10f3372a9b94d 0.9.7-rc1
+eb8aff2926230bb114fb90f67203440a2c534bf1 0.9.7-rc2

ChangeLog

@@ -1,5 +1,12 @@
 *** march 2011 ***
 
+ * 0.9.7-rc2 [20010309]
+
+- added cron-like interface to signal framework
+- improved Linux namespaces support
+- fixed multithreading + --max-requests
+- added support for reference in configuration files
+
  * 0.9.7-rc1 [20110307]
 
 - export %v in emperor mode

buildconf/default.ini

@@ -13,7 +13,7 @@ sendfile = true
 minterpreters = true
 async = true
 evdis = false
-ldap = false
+ldap = auto
 pcre = auto
 debug = false
 unbit = false

cache.c

@@ -330,6 +330,27 @@ int uwsgi_cache_del(char *key, uint16_t keylen) {
 	return ret;
 }
 
+void uwsgi_cache_fix() {
+
+	uint64_t i;
+
+	for(i=0;i< uwsgi.cache_max_items;i++) {
+		// valid record ?
+		if (uwsgi.cache_items[i].keysize) {
+			if (!uwsgi.cache_items[i].prev) {
+				// put value in hash_table
+				uwsgi.cache_hashtable[ uwsgi.cache_items[i].djbhash % 0xffff] = i;
+			}
+		}
+		else {
+			// put this record in unused stack
+			uwsgi.shared->cache_first_available_item = i;
+			uwsgi.shared->cache_unused_stack_ptr++;
+			uwsgi.cache_unused_stack[uwsgi.shared->cache_unused_stack_ptr] = i;
+		}
+	}
+}
+
 int uwsgi_cache_set(char *key, uint16_t keylen, char *val, uint64_t vallen, uint64_t expires, uint16_t flags) {
 
 	uint64_t index = 0, last_index = 0 ;
@@ -476,7 +497,7 @@ void cache_command(char *key, uint16_t keylen, char *val, uint16_t vallen, void
 		if (!uwsgi_strncmp(key, keylen, "key", 3)) {
 			val = uwsgi_cache_get(val, vallen, &tmp_vallen);
                         if (val && tmp_vallen > 0) {
-                        	wsgi_req->response_size = write(wsgi_req->poll.fd, val, vallen);
+                        	wsgi_req->response_size = write(wsgi_req->poll.fd, val, tmp_vallen);
                         }
 
 		}		
@@ -528,6 +549,7 @@ int uwsgi_cache_request(struct wsgi_request *wsgi_req) {
 				uwsgi_cache_del(wsgi_req->buffer, wsgi_req->uh.pktsize);
 			}
 			break;
+		case 3:
 		case 4:
 			// dict
 			if (wsgi_req->uh.pktsize > 0) {

emperor.c

@@ -222,10 +222,7 @@ void emperor_loop() {
 
 		if (!i_am_alone) {
 			diedpid = waitpid(uwsgi.emperor_pid, &waitpid_status, WNOHANG);
-			if (diedpid < 0) {
-				uwsgi_error("waitpid()");
-			}
-			else if (diedpid > 0) {
+			if (diedpid < 0 || diedpid > 0) {
 				i_am_alone = 1;
 			}
 		}

ldap.c

@@ -37,71 +37,162 @@ int calc_ldap_name(char *name) {
 	return strlen(name) + counter;
 }
 
-void uwsgi_ldap_schema_dump_ldif() {
-	struct option *aopt, *lopt;
+struct uwsgi_ldap_entry {
+	int num;
+	char names[1024];
+	int has_arg;
+};
+
+
+void uwsgi_name_to_ldap(char *src, char *dst) {	
 
-	lopt = uwsgi.long_options;
 	int i;
-	int counter = 30000;
+	char *ptr = dst;
+
+	memset(dst, 0, 1024);
+
+	strcat(dst, " 'uWSGI");
+
+	ptr+= 7;
+
+	for(i=0;i< (int)strlen(src);i++) {
+        	if (src[i] == '-') {
+                	i++;
+                        *ptr++= toupper( (int) src[i]);
+                }
+                else {
+                	*ptr++= src[i];
+                }
+	}
+
+	strcat(dst, "'");
+
+}
+
+struct uwsgi_ldap_entry *get_ldap_by_num(struct uwsgi_ldap_entry *root, int num, int count) {
+
+	int i;
+	struct uwsgi_ldap_entry *ule;
+
+	for(i=0;i<count;i++) {
+		ule = &root[i];
+		if (ule->num == num) {
+			return ule;
+		}
+	}
+
+	return NULL;
+}
+
+struct uwsgi_ldap_entry *search_ldap_cache(struct uwsgi_ldap_entry *root, char *name, int count) {
+	int i;
+	struct uwsgi_ldap_entry *ule;
+
+	for(i=0;i<count;i++) {
+		ule = &root[i];
+		if (uwsgi_list_has_str(ule->names, name+1)) {
+			return ule;
+		}
+	}
+
+	return NULL;
+}
+
+struct uwsgi_ldap_entry *get_ldap_names(int *count) {
+
+	struct option *aopt, *lopt;
+	struct uwsgi_ldap_entry *ule, *entry;
+	char ldap_name[1024];
+	static int counter = 30000000;
+
+	*count = 0;
+	lopt = uwsgi.long_options;
+
+	ule = uwsgi_malloc(sizeof(struct uwsgi_ldap_entry)*count_options(lopt));
+
+	while( (aopt = lopt) ) {
+                if (!aopt->name)
+                        break;
+
+		uwsgi_name_to_ldap((char *)aopt->name, ldap_name);
+
+		entry = search_ldap_cache(ule, ldap_name, *count);
+
+		if (entry) goto next;
+
+		if (aopt->flag) {
+			entry = &ule[*count] ;
+			entry->num = counter;
+			strcpy(entry->names, ldap_name);
+			counter++;
+			*count = *count+1;
+		}
+		else {
+			entry = get_ldap_by_num(ule, aopt->val, *count);
+			if (entry) {
+				strcat(entry->names, ldap_name);
+			}
+			else {
+				entry = &ule[*count] ;
+				entry->num = aopt->val;
+				strcpy(entry->names, ldap_name);
+				*count = *count+1;
+			}
+		}
+
+		entry->has_arg = aopt->has_arg;
+		
+next:
+		lopt++;
+	}
+
+	return ule;
+}
+
+void uwsgi_ldap_schema_dump_ldif() {
+
+	int i;
+	int items;
 
 	uwsgi_log("\n");
 	uwsgi_log("dn: cn=uwsgi,cn=schema,cn=config\n");
 	uwsgi_log("objectClass: olcSchemaConfig\n");
 	uwsgi_log("cn: uwsgi\n");
 
-	while( (aopt = lopt) ) {
-		if (!aopt->name)
-			break;
+	struct uwsgi_ldap_entry *entry, *ule = get_ldap_names(&items);
 
-		if (aopt->flag) {
-			uwsgi_log("olcAttributeTypes: ( 1.3.6.1.4.1.35156.17.4.%d NAME 'uWSGI", counter);
-			counter++;
+	for(i=0;i<items;i++) {
+
+		entry = &ule[i];
+		uwsgi_log("olcAttributeTypes: ( 1.3.6.1.4.1.35156.17.4.%d NAME (%s", entry->num, entry->names);
+
+		if (entry->has_arg) {
+			uwsgi_log(" ) SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )\n");
 		}
 		else {
-			uwsgi_log("olcAttributeTypes: ( 1.3.6.1.4.1.35156.17.4.%d NAME 'uWSGI", aopt->val);
+			uwsgi_log(" ) SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )\n");
 		}
-		for(i=0;i< (int)strlen(aopt->name);i++) {
-			if (aopt->name[i] == '-') {
-				i++;
-				uwsgi_log("%c", toupper( (int) aopt->name[i]));
-			}
-			else {
-				uwsgi_log("%c", aopt->name[i]);
-			}
-		}
-
-		if (aopt->has_arg) {
-			uwsgi_log("' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )\n");
-		}
-		else {
-			uwsgi_log("' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )\n");
-		}
-		lopt++;
 	}
 
 	uwsgi_log("olcAttributeTypes: ( 1.3.6.1.4.1.35156.17.4.50000 NAME 'uWSGInull' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )\n");
 
-	lopt = uwsgi.long_options;
 
 	uwsgi_log("olcObjectClasses: ( 1.3.6.1.4.1.35156.17.3.1 NAME 'uWSGIConfig' SUP top AUXILIARY DESC 'uWSGI configuration' MAY ( ");
 
-	while( (aopt = lopt) ) {
-		if (!aopt->name)
-			break;
+	
+	for(i=0;i<items;i++) {
 
-		uwsgi_log("uWSGI");
+                entry = &ule[i];
+
+		char *list2 = uwsgi_concat2(entry->names+1, "");
+		char *p = strtok(list2, " ");
+        	while (p != NULL) {
+			uwsgi_log("%.*s $ ", strlen(p)-2, p+1);
+                	p = strtok(NULL, " ");
+        	}
+
+        	free(list2);
 
-		for(i=0;i< (int)strlen(aopt->name);i++) {
-			if (aopt->name[i] == '-') {
-				i++;
-				uwsgi_log("%c", toupper( (int) aopt->name[i]));
-			}
-			else {
-				uwsgi_log("%c", aopt->name[i]);
-			}
-		}
-		uwsgi_log(" $ ");
-		lopt++;
 	}
 
 	uwsgi_log("uWSGInull ))\n");
@@ -112,67 +203,47 @@ void uwsgi_ldap_schema_dump_ldif() {
 }
 
 void uwsgi_ldap_schema_dump() {
-	struct option *aopt, *lopt;
 
-	lopt = uwsgi.long_options;
 	int i;
-	int counter = 30000;
+	int items;
 
-	while( (aopt = lopt) ) {
-		if (!aopt->name)
-			break;
+	struct uwsgi_ldap_entry *entry, *ule = get_ldap_names(&items);
 
+        for(i=0;i<items;i++) {
 
-		if (aopt->flag) {
-			uwsgi_log("attributetype ( 1.3.6.1.4.1.35156.17.4.%d NAME 'uWSGI", counter);
-			counter++;
-		}
-		else {
-			uwsgi_log("attributetype ( 1.3.6.1.4.1.35156.17.4.%d NAME 'uWSGI", aopt->val);
-		}
-		for(i=0;i< (int)strlen(aopt->name);i++) {
-			if (aopt->name[i] == '-') {
-				i++;
-				uwsgi_log("%c", toupper( (int) aopt->name[i]));
-			}
-			else {
-				uwsgi_log("%c", aopt->name[i]);
-			}
-		}
+                entry = &ule[i];
+                uwsgi_log("attributetype ( 1.3.6.1.4.1.35156.17.4.%d NAME (%s", entry->num, entry->names);
+
+                if (entry->has_arg) {
+                        uwsgi_log(" ) SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )\n");
+                }
+                else {
+                        uwsgi_log(" ) SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )\n");
+                }
+        }
 
-		if (aopt->has_arg) {
-			uwsgi_log("' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )\n");
-		}
-		else {
-			uwsgi_log("' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )\n");
-		}
-		lopt++;
-	}
 
 	uwsgi_log("attributetype ( 1.3.6.1.4.1.35156.17.4.50000 NAME 'uWSGInull' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )\n");
 
-	lopt = uwsgi.long_options;
-
 	uwsgi_log("objectclass ( 1.3.6.1.4.1.35156.17.3.1 NAME 'uWSGIConfig' SUP top AUXILIARY DESC 'uWSGI configuration' MAY ( ");
 
-	while( (aopt = lopt) ) {
-		if (!aopt->name)
-			break;
+	for(i=0;i<items;i++) {
+
+                entry = &ule[i];
+
+                char *list2 = uwsgi_concat2(entry->names+1, "");
+                char *p = strtok(list2, " ");
+                while (p != NULL) {
+                        uwsgi_log("%.*s $ ", strlen(p)-2, p+1);
+                        p = strtok(NULL, " ");
+                }
+
+                free(list2);
+
+        }
+
 
-		uwsgi_log("uWSGI");
 
-		for(i=0;i< (int)strlen(aopt->name);i++) {
-			if (aopt->name[i] == '-') {
-				i++;
-				uwsgi_log("%c", toupper( (int) aopt->name[i]));
-			}
-			else {
-				uwsgi_log("%c", aopt->name[i]);
-			}
-		}
-		uwsgi_log(" $ ");
-		lopt++;
-	}
 
 	uwsgi_log("uWSGInull ))\n");
 
@@ -194,8 +265,6 @@ void uwsgi_ldap_config() {
 	int desired_version = LDAP_VERSION3;
 	int ret;
 
-	struct option *aopt, *lopt;
-
 	LDAPURLDesc *ldap_url;
 
 	if (uwsgi.ldap) {
@@ -211,6 +280,8 @@ void uwsgi_ldap_config() {
 		uwsgi_log("unable to parse LDAP url.\n");
 		exit(1);
 	}
+	
+	uwsgi_log("[uWSGI] getting LDAP configuration from %s\n", url);
 
 	url_slash = strchr(url, '/');
 	url_slash = strchr(url_slash + 1, '/');
@@ -255,9 +326,11 @@ void uwsgi_ldap_config() {
 
 	entry = ldap_first_entry(ldp, results);
 
+	int found = 0;
 	for( attr = ldap_first_attribute(ldp, entry, &ber); attr != NULL; attr = ldap_next_attribute(ldp, entry, ber)) {
 		if (!strncmp(attr,"uWSGI",5)) {
 
+			found = 1;
 			uwsgi_attr = malloc( calc_ldap_name(attr) + 1 );
 			if (!uwsgi_attr) {
 				uwsgi_error("malloc()");
@@ -271,7 +344,7 @@ void uwsgi_ldap_config() {
 #endif
 			bervalues = ldap_get_values_len(ldp, entry, attr);
 			if (bervalues) {
-				// do not free uwsgi_val;
+				// do not free uwsgi_attr/uwsgi_val;
 				char *uwsgi_val = malloc( bervalues[0]->bv_len + 1 );
 				if (!uwsgi_val) {
 					uwsgi_error("malloc()");
@@ -281,29 +354,21 @@ void uwsgi_ldap_config() {
 				memcpy(uwsgi_val, bervalues[0]->bv_val, bervalues[0]->bv_len);
 				uwsgi_val[bervalues[0]->bv_len] = 0;
 
-				lopt = uwsgi.long_options;
-				while ((aopt = lopt)) {
-					if (!aopt->name)
-						break;
-					if (!strcmp(uwsgi_attr, aopt->name)) {
-						if (aopt->flag) {
-							*aopt->flag = aopt->val;
-							add_exported_option(0, (char*) uwsgi_attr);
-						}
-						else {
-							manage_opt(aopt->val, uwsgi_val);
-						}
-					}
-					lopt++;
-				}
+				add_exported_option((char*) uwsgi_attr, uwsgi_val, 0);
+				free(bervalues);
+			}
+			else {
+				free(uwsgi_attr);
 			}
-
-			free(bervalues);
-			free(uwsgi_attr);
 		}
 		free(attr);
 	}
 
+	if (!found) {
+		uwsgi_log("no uWSGI LDAP entry found\n");
+		exit(1);
+	}
+
 	free(ber);
 	free(results);
 

master.c

@@ -146,8 +146,6 @@ void master_loop(char **argv, char **environ) {
 	uint8_t uwsgi_signal;
 
 #ifdef UWSGI_UDP
-	struct pollfd uwsgi_poll[2];
-	int uwsgi_poll_size = 0;
 	struct sockaddr_in udp_client;
 	socklen_t udp_len;
 	char udp_client_addr[16];
@@ -165,6 +163,10 @@ void master_loop(char **argv, char **environ) {
 #endif
 #endif
 
+#ifdef UWSGI_SNMP
+	int snmp_fd = -1;
+#endif
+
 	int i=0,j;
 	int rlen;
 
@@ -206,21 +208,16 @@ void master_loop(char **argv, char **environ) {
 #ifdef UWSGI_UDP
 	if (uwsgi.udp_socket) {
 		udp_fd = bind_to_udp(uwsgi.udp_socket, 0, 0);
-		uwsgi_poll[uwsgi_poll_size].fd = udp_fd;
-		if (uwsgi_poll[uwsgi_poll_size].fd < 0) {
+		if (udp_fd < 0) {
 			uwsgi_log( "unable to bind to udp socket. SNMP and cluster management services will be disabled.\n");
 		}
 		else {
 			uwsgi_log( "UDP server enabled.\n");
-			uwsgi_poll[uwsgi_poll_size].events = POLLIN;
-			uwsgi_poll_size++;
+			event_queue_add_fd_read(uwsgi.master_queue, udp_fd);
 		}
 	}
 #ifdef UWSGI_MULTICAST
 	if (uwsgi.cluster) {
-		uwsgi_poll[uwsgi_poll_size].fd = uwsgi.cluster_fd;
-		uwsgi_poll[uwsgi_poll_size].events = POLLIN;
-		uwsgi_poll_size++;
 
 		event_queue_add_fd_read(uwsgi.master_queue, uwsgi.cluster_fd);
 
@@ -288,12 +285,28 @@ void master_loop(char **argv, char **environ) {
 				memcpy(uwsgi.shared->snmp_community, uwsgi.snmp_community, strlen(uwsgi.snmp_community) + 1);
 			}
 		}
-		uwsgi_log( "filling SNMP table...");
 
 		uwsgi.shared->snmp_gvalue[0].type = SNMP_COUNTER64;
 		uwsgi.shared->snmp_gvalue[0].val = &uwsgi.workers[0].requests;
 
-		uwsgi_log( "done\n");
+		for(i=0;i<uwsgi.numproc;i++) {
+			uwsgi.shared->snmp_gvalue[30+i].type = SNMP_COUNTER64;
+			uwsgi.shared->snmp_gvalue[30+i].val = &uwsgi.workers[i+1].requests;
+		}
+
+		if (uwsgi.snmp_addr) {
+			snmp_fd = bind_to_udp(uwsgi.snmp_addr, 0, 0);
+                	if (snmp_fd < 0) {
+                        	uwsgi_log( "unable to bind to udp socket. SNMP service will be disabled.\n");
+                	}
+                	else {
+                        	uwsgi_log( "SNMP server enabled on %s\n", uwsgi.snmp_addr);
+                        	event_queue_add_fd_read(uwsgi.master_queue, snmp_fd);
+                	}
+		}
+		else {
+			uwsgi_log( "SNMP agent enabled.\n");
+		}
 
 	}
 #endif
@@ -317,6 +330,13 @@ void master_loop(char **argv, char **environ) {
 		uwsgi_subscribe(uwsgi.subscriptions[i]);
 	}
 
+	// sync the cache store if needed
+	if (uwsgi.cache_store && uwsgi.cache_filesize) {
+		if (msync(uwsgi.cache_items, uwsgi.cache_filesize, MS_ASYNC)) {
+			uwsgi_error("msync()");
+		}
+	}
+
 	for (;;) {
 		//uwsgi_log("ready_to_reload %d %d\n", ready_to_reload, uwsgi.numproc);
 
@@ -606,6 +626,20 @@ void master_loop(char **argv, char **environ) {
 							}
 						}
 					}
+#ifdef UWSGI_SNMP
+					if (uwsgi.snmp_addr && interesting_fd == snmp_fd) {
+						udp_len = sizeof(udp_client);
+						rlen = recvfrom(snmp_fd, uwsgi.wsgi_req->buffer, uwsgi.buffer_size, 0, (struct sockaddr *) &udp_client, &udp_len);
+
+						if (rlen < 0) {
+							uwsgi_error("recvfrom()");
+						}
+						else if (rlen > 0) {
+							manage_snmp(snmp_fd, (uint8_t *) uwsgi.wsgi_req->buffer, rlen, &udp_client);
+						}
+						continue;
+					}
+#endif
 
 #ifdef UWSGI_UDP
 					if (uwsgi.udp_socket && interesting_fd == udp_fd) {
@@ -709,7 +743,6 @@ void master_loop(char **argv, char **environ) {
 					uwsgi_lock(uwsgi.fmon_table_lock);
 					for(i=0;i<ushared->files_monitored_cnt;i++) {
 						if (ushared->files_monitored[i].registered) {
-							uwsgi_log("fmon check %d == %d\n", interesting_fd, ushared->files_monitored[i].fd) ;
 							if (interesting_fd == ushared->files_monitored[i].fd) {
 								struct uwsgi_fmon *uf = event_queue_ack_file_monitor(uwsgi.master_queue, interesting_fd);
 								// now call the file_monitor handler
@@ -911,6 +944,12 @@ void master_loop(char **argv, char **environ) {
 				}
 			}
 
+			if (uwsgi.cache_store && uwsgi.cache_filesize && uwsgi.cache_store_sync && ((master_cycles % uwsgi.cache_store_sync) == 0)) {
+				if (msync(uwsgi.cache_items, uwsgi.cache_filesize, MS_ASYNC)) {
+                        		uwsgi_error("msync()");
+                		}
+			}
+
 
 #endif
 

plugins/pyerl/pyerl.c

@@ -478,11 +478,13 @@ int py_to_erl(PyObject *pobj, ei_x_buff *x) {
                 ei_x_encode_long(x, PyInt_AsLong(pobj));
         }
         else if (PyList_Check(pobj)) {
-		ei_x_encode_list_header(x, PyList_Size(pobj));
-                for (i = 0; i < PyList_Size(pobj); i++) {
-                        pobj2 = PyList_GetItem(pobj, i);
-			if (py_to_erl(pobj2, x) < 0) return -1;
-                }
+		if (PyList_Size(pobj) > 0) {
+			ei_x_encode_list_header(x, PyList_Size(pobj));
+                	for (i = 0; i < PyList_Size(pobj); i++) {
+                        	pobj2 = PyList_GetItem(pobj, i);
+				if (py_to_erl(pobj2, x) < 0) return -1;
+                	}
+		}
 		ei_x_encode_empty_list(x);
         }
 	else if (PyTuple_Check(pobj)) {

plugins/python/wsgi_handlers.c

@@ -398,8 +398,8 @@ int uwsgi_request_wsgi(struct wsgi_request *wsgi_req) {
 		uwsgi_debug("%.*s: %.*s\n", wsgi_req->hvec[i].iov_len, wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i+1].iov_len, wsgi_req->hvec[i+1].iov_base);
 #endif
 #ifdef PYTHREE
-		pydictkey = PyUnicode_DecodeLatin1(wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i].iov_len, "ignore");
-		pydictvalue = PyUnicode_DecodeLatin1(wsgi_req->hvec[i + 1].iov_base, wsgi_req->hvec[i + 1].iov_len, "ignore");
+		pydictkey = PyUnicode_DecodeLatin1(wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i].iov_len, NULL);
+		pydictvalue = PyUnicode_DecodeLatin1(wsgi_req->hvec[i + 1].iov_base, wsgi_req->hvec[i + 1].iov_len, NULL);
 #else
 		pydictkey = PyString_FromStringAndSize(wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i].iov_len);
 		pydictvalue = PyString_FromStringAndSize(wsgi_req->hvec[i + 1].iov_base, wsgi_req->hvec[i + 1].iov_len);

utils.c

@@ -1612,3 +1612,53 @@ char *uwsgi_get_exported_opt(char *key) {
 
 	return NULL;
 }
+
+char *uwsgi_get_optname_by_index(int index) {
+
+        struct option *aopt;
+	struct option *lopt = uwsgi.long_options;
+
+        while ( (aopt = lopt) ) {
+                if (!aopt->name) break;
+		if (aopt->val == index) {
+			return (char *) aopt->name;
+		}
+                lopt++;
+        }
+
+        return NULL;
+}
+
+int uwsgi_list_has_num(char *list, int num) {
+	
+	char *list2 = uwsgi_concat2(list, "");
+
+	char *p = strtok(list2, ",");
+        while (p != NULL) {
+		if (atoi(p) == num) {
+			free(list2);
+			return 1;
+		}
+                p = strtok(NULL, ",");
+	}
+
+	free(list2);
+	return 0;
+}
+
+int uwsgi_list_has_str(char *list, char *str) {
+	
+	char *list2 = uwsgi_concat2(list+1, "");
+
+	char *p = strtok(list2, " ");
+        while (p != NULL) {
+		if (!strcasecmp(p, str)) {
+			free(list2);
+			return 1;
+		}
+                p = strtok(NULL, " ");
+	}
+
+	free(list2);
+	return 0;
+}

uwsgi.c

@@ -66,6 +66,8 @@ static struct option long_base_options[] = {
 	{"sharedarea", required_argument, 0, 'A'},
 	{"cache", required_argument, 0, LONG_ARGS_CACHE},
 	{"cache-blocksize", required_argument, 0, LONG_ARGS_CACHE_BLOCKSIZE},
+	{"cache-store", required_argument, 0, LONG_ARGS_CACHE_STORE},
+	{"cache-store-sync", required_argument, 0, LONG_ARGS_CACHE_STORE_SYNC},
 	{"queue", required_argument, 0, LONG_ARGS_QUEUE},
 	{"queue-blocksize", required_argument, 0, LONG_ARGS_QUEUE_BLOCKSIZE},
 #ifdef UWSGI_SPOOLER
@@ -95,6 +97,7 @@ static struct option long_base_options[] = {
 	{"limit-post", required_argument, 0, LONG_ARGS_LIMIT_POST},
 	{"no-orphans", no_argument, &uwsgi.no_orphans, 1},
 	{"prio", required_argument, 0, LONG_ARGS_PRIO},
+	{"cpu-affinity", required_argument, 0, LONG_ARGS_CPU_AFFINITY},
 	{"post-buffering", required_argument, 0, LONG_ARGS_POST_BUFFERING},
 	{"post-buffering-bufsize", required_argument, 0, LONG_ARGS_POST_BUFFERING_SIZE},
 	{"upload-progress", required_argument, 0, LONG_ARGS_UPLOAD_PROGRESS},
@@ -112,7 +115,7 @@ static struct option long_base_options[] = {
 	{"cluster-log", required_argument, 0, LONG_ARGS_CLUSTER_LOG},
 	{"subscribe-to", required_argument, 0, LONG_ARGS_SUBSCRIBE_TO},
 #ifdef UWSGI_SNMP
-	{"snmp", no_argument, 0, LONG_ARGS_SNMP},
+	{"snmp", optional_argument, 0, LONG_ARGS_SNMP},
 	{"snmp-community", required_argument, 0, LONG_ARGS_SNMP_COMMUNITY},
 #endif
 	{"check-interval", required_argument, 0, LONG_ARGS_CHECK_INTERVAL},
@@ -153,11 +156,14 @@ static struct option long_base_options[] = {
 	{"cgroup-opt", required_argument, 0, LONG_ARGS_CGROUP_OPT},
 	{"namespace", required_argument, 0, LONG_ARGS_LINUX_NS},
 	{"ns", required_argument, 0, LONG_ARGS_LINUX_NS},
+	{"namespace-net", required_argument, 0, LONG_ARGS_LINUX_NS_NET},
+	{"ns-net", required_argument, 0, LONG_ARGS_LINUX_NS_NET},
 #endif
 	{"loop", required_argument, 0, LONG_ARGS_LOOP},
 	{"worker-exec", required_argument, 0, LONG_ARGS_WORKER_EXEC},
 	{"attach-daemon", required_argument, 0, LONG_ARGS_ATTACH_DAEMON},
 	{"plugins", required_argument, 0, LONG_ARGS_PLUGINS},
+	{"allowed-modifiers", required_argument, 0, LONG_ARGS_ALLOWED_MODIFIERS},
 	{"remap-modifier", required_argument, 0, LONG_ARGS_REMAP_MODIFIER},
 	{"dump-options", no_argument, &uwsgi.dump_options, 1},
 	{"show-config", no_argument, &uwsgi.show_config, 1},
@@ -448,6 +454,7 @@ int main(int argc, char *argv[], char *envp[])
 
 	char *emperor_env;
 	char *magic_table[0xff];
+	char *optname;
 
 	
 	signal(SIGHUP, SIG_IGN);
@@ -583,17 +590,26 @@ int main(int argc, char *argv[], char *envp[])
 	}
 	build_options();
 
+	uwsgi.option_index = -1;
 	while ((i = getopt_long(argc, argv, short_options, uwsgi.long_options, &uwsgi.option_index)) != -1) {
-		if (i == 0) {
-			add_exported_option((char *)uwsgi.long_options[uwsgi.option_index].name, "1", 0);
+
+		if (uwsgi.option_index > -1) {
+			optname = (char *)uwsgi.long_options[uwsgi.option_index].name;
 		}
 		else {
-			add_exported_option((char *)uwsgi.long_options[uwsgi.option_index].name, optarg, 1);
+			optname = uwsgi_get_optname_by_index(i);
+		}
+		// is this a flagged option ?
+		if (i == 0) {
+			add_exported_option(optname, "1", 0);
+		}
+		else {
+			add_exported_option(optname, optarg, 1);
 			manage_opt(i, optarg);
 		}
+		uwsgi.option_index = -1;
 	}
 
-
 	   if (optind < argc) {
 	   	char *lazy = argv[optind];
 		if (lazy[0] != '[') {
@@ -924,7 +940,9 @@ options_parsed:
 			char stack[PTHREAD_STACK_MIN];
 			int waitpid_status;
 			uwsgi_log("*** jailing uWSGI in %s ***\n", uwsgi.ns);
-			pid_t pid = clone(uwsgi_start, stack+PTHREAD_STACK_MIN, SIGCHLD|CLONE_NEWUTS|CLONE_NEWPID|CLONE_NEWIPC|CLONE_NEWNS, (void *)argv);
+			int clone_flags = SIGCHLD|CLONE_NEWUTS|CLONE_NEWPID|CLONE_NEWIPC|CLONE_NEWNS;
+			//clone_flags |= CLONE_NEWNET;
+			pid_t pid = clone(uwsgi_start, stack+PTHREAD_STACK_MIN, clone_flags, (void *)argv);
 			if (pid == -1) {
 				uwsgi_error("clone()");
 				exit(1);
@@ -1329,26 +1347,65 @@ int uwsgi_start(void *v_argv) {
 
                 memset(uwsgi.cache_unused_stack, 0, sizeof(uint64_t) * uwsgi.cache_max_items);
 
-		uwsgi.cache_items = (struct uwsgi_cache_item *) mmap(NULL, sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
+		// the first cache item is always zero
+		uwsgi.shared->cache_first_available_item = 1;
+		uwsgi.shared->cache_unused_stack_ptr = 0;
+
+		//uwsgi.cache_items = (struct uwsgi_cache_item *) mmap(NULL, sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
+		if (uwsgi.cache_store) {
+			uwsgi.cache_filesize = (sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items) + (uwsgi.cache_blocksize * uwsgi.cache_max_items);
+			int cache_fd;
+			struct stat cst;
+
+			if (stat(uwsgi.cache_store, &cst)) {
+				uwsgi_log("creating a new cache store file: %s\n", uwsgi.cache_store);
+				cache_fd = open(uwsgi.cache_store, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR );
+				if (cache_fd >= 0) {
+					// fill the caching store
+					if (ftruncate(cache_fd, uwsgi.cache_filesize)) {
+						uwsgi_log("ftruncate()");
+						exit(1);
+					}
+				}
+			}
+			else {
+				if (cst.st_size != uwsgi.cache_filesize || !S_ISREG(cst.st_mode)) {
+					uwsgi_log("invalid cache store file. Please remove it or fix cache blocksize/items to match its size\n");
+					exit(1);
+				}
+				cache_fd = open(uwsgi.cache_store, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR );
+				uwsgi_log("recovered cache from backing store file: %s\n", uwsgi.cache_store);
+			}
+			
+			if (cache_fd < 0) {
+				uwsgi_error("open()");
+				exit(1);
+			}
+			uwsgi.cache_items = (struct uwsgi_cache_item *) mmap(NULL, uwsgi.cache_filesize, PROT_READ | PROT_WRITE, MAP_SHARED, cache_fd, 0);
+			uwsgi_cache_fix();
+			
+		}
+		else {
+			uwsgi.cache_items = (struct uwsgi_cache_item *) mmap(NULL, (sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items) + (uwsgi.cache_blocksize * uwsgi.cache_max_items), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
+			for(i=0;i< (int) uwsgi.cache_max_items;i++) {
+				memset(&uwsgi.cache_items[i], 0, sizeof(struct uwsgi_cache_item));
+			}
+		}
 		if (!uwsgi.cache_items) {
 			uwsgi_error("mmap()");
                         exit(1);
 		}
 
+		/*
 		uwsgi.cache = mmap(NULL, uwsgi.cache_blocksize * uwsgi.cache_max_items, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
 		if (!uwsgi.cache) {
 			uwsgi_error("mmap()");
                         exit(1);
 		}
+		*/
+
+		uwsgi.cache = ((void *) uwsgi.cache_items) + (sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items) ;
 		
-		for(i=0;i< (int) uwsgi.cache_max_items;i++) {
-			memset(&uwsgi.cache_items[i], 0, sizeof(struct uwsgi_cache_item));
-		}
-
-		// the first cache item is always zero
-		uwsgi.shared->cache_first_available_item = 1;
-		uwsgi.shared->cache_unused_stack_ptr = 0;
-
 		uwsgi.cache_lock = uwsgi_mmap_shared_rwlock();
         	uwsgi_rwlock_init(uwsgi.cache_lock);
 
@@ -1717,12 +1774,6 @@ uwsgi.shared->hooks[UWSGI_MODIFIER_PING] = uwsgi_request_ping;	//100
 
 	uwsgi_rawlog(" ***\n");
 
-#ifdef UWSGI_SNMP
-	if (uwsgi.snmp) {
-		//snmp_init();
-	}
-#endif
-
 	//init apps hook
 	for (i = 0; i < 0xFF; i++) {
 		if (uwsgi.p[i]->init_apps) {
@@ -1776,6 +1827,20 @@ uwsgi.shared->hooks[UWSGI_MODIFIER_PING] = uwsgi_request_ping;	//100
 			uwsgi_log("spawned uWSGI master process (pid: %d)\n", uwsgi.mypid);
 		}
 	}
+
+
+
+	// security in multiuser environment: allow only a subset of modifiers
+	if (uwsgi.allowed_modifiers) {
+		for (i = 0; i < 0xFF; i++) {
+			if (!uwsgi_list_has_num(uwsgi.allowed_modifiers, i)) {
+                        	uwsgi.p[i]->request = unconfigured_hook;
+                        	uwsgi.p[i]->after_request = unconfigured_after_hook;
+                	}
+        	}
+	}
+
+
 #ifdef UWSGI_SPOOLER
 	if (uwsgi.spool_dir != NULL && uwsgi.sockets_cnt > 0) {
 		uwsgi.shared->spooler_pid = spooler_start();
@@ -1836,6 +1901,29 @@ uwsgi.shared->hooks[UWSGI_MODIFIER_PING] = uwsgi_request_ping;	//100
 		//from now on the process is a real worker
 	}
 
+	if (uwsgi.cpu_affinity) {
+#ifdef __linux__
+		cpu_set_t cpuset;
+		CPU_ZERO(&cpuset);
+		int ncpu = sysconf(_SC_NPROCESSORS_ONLN);
+		int base_cpu = (uwsgi.mywid-1)*uwsgi.cpu_affinity;
+		if (base_cpu >= ncpu) {
+			base_cpu = base_cpu % ncpu;
+		}
+		uwsgi_log("set cpu affinity for worker %d to", uwsgi.mywid);
+		for(i=0;i<uwsgi.cpu_affinity;i++) {
+			if (base_cpu >= ncpu) base_cpu = 0 ;
+			CPU_SET(base_cpu, &cpuset);
+			uwsgi_log(" %d", base_cpu);
+			base_cpu++; 
+		}	
+		if (sched_setaffinity(0, sizeof(cpu_set_t), &cpuset)) {
+			uwsgi_error("sched_setaffinity()");
+		}
+		uwsgi_log("\n");
+#endif
+	}
+
 	if (uwsgi.worker_exec) {
 		char *w_argv[2];
 		w_argv[0] = uwsgi.worker_exec;
@@ -2038,6 +2126,9 @@ end:
 		case LONG_ARGS_REMAP_MODIFIER:
 			uwsgi.remap_modifier = optarg;
 			return 1;
+		case LONG_ARGS_ALLOWED_MODIFIERS:
+			uwsgi.allowed_modifiers = optarg;
+			return 1;
 		case LONG_ARGS_PLUGINS:
 			p = strtok(optarg, ",");
 			while (p != NULL) {
@@ -2110,6 +2201,10 @@ end:
 #ifdef UWSGI_SNMP
 		case LONG_ARGS_SNMP:
 			uwsgi.snmp = 1;
+			if (optarg) {
+				uwsgi.snmp_addr = optarg;
+				uwsgi.master_process = 1;
+			}
 			return 1;
 		case LONG_ARGS_SNMP_COMMUNITY:
 			uwsgi.snmp = 1;
@@ -2212,6 +2307,9 @@ end:
 		case LONG_ARGS_PRIO:
 			uwsgi.prio = (int) strtol(optarg, NULL, 10);
 			return 1;
+		case LONG_ARGS_CPU_AFFINITY:
+			uwsgi.cpu_affinity = (int) strtol(optarg, NULL, 10);
+			return 1;
 		case LONG_ARGS_POST_BUFFERING:
 			uwsgi.post_buffering = atoi(optarg);
 			return 1;
@@ -2237,6 +2335,13 @@ end:
 		case LONG_ARGS_CACHE:
 			uwsgi.cache_max_items = atoi(optarg);
 			return 1;
+		case LONG_ARGS_CACHE_STORE:
+			uwsgi.cache_store = optarg;
+			uwsgi.master_process = 1;
+			return 1;
+		case LONG_ARGS_CACHE_STORE_SYNC:
+			uwsgi.cache_store_sync = atoi(optarg);
+			return 1;
 		case LONG_ARGS_CACHE_BLOCKSIZE:
 			uwsgi.cache_blocksize = atoi(optarg);
 			return 1;

uwsgi.h

@@ -98,6 +98,8 @@
 
 
 #ifdef __linux
+#define __USE_GNU
+#include <sched.h>
 #include <sys/prctl.h>
 #include <linux/limits.h>
 #include <sys/mount.h>
@@ -357,7 +359,11 @@ struct uwsgi_opt {
 #define LONG_ARGS_SUBSCRIBE_TO		17078
 #define LONG_ARGS_CLUSTER_NODES		17079
 #define LONG_ARGS_RELOAD_MERCY		17080
-
+#define LONG_ARGS_ALLOWED_MODIFIERS	17081
+#define LONG_ARGS_LINUX_NS_NET		17082
+#define LONG_ARGS_CPU_AFFINITY		17083
+#define LONG_ARGS_CACHE_STORE		17084
+#define LONG_ARGS_CACHE_STORE_SYNC	17085
 
 
 #define UWSGI_OK	0
@@ -717,6 +723,8 @@ struct uwsgi_server {
 
 	time_t master_mercy;
 
+	int cpu_affinity;
+
 	int reload_mercy;
 	int option_index;
 	struct option *long_options;
@@ -794,13 +802,10 @@ struct uwsgi_server {
 	char           *spool_dir;
 #endif
 
-#ifdef UWSGI_NAGIOS
-	int             nagios;
-#endif
-
 #ifdef UWSGI_SNMP
 	int             snmp;
-	char           *snmp_community;
+	char		*snmp_addr;
+	char		*snmp_community;
 #endif
 
 
@@ -953,6 +958,8 @@ struct uwsgi_server {
 	struct uwsgi_plugin *p[0xFF];
 	struct uwsgi_plugin *gp[MAX_GENERIC_PLUGINS];
 	int gp_cnt;
+	
+	char *allowed_modifiers;
 
 	char *upload_progress;
 
@@ -967,6 +974,9 @@ struct uwsgi_server {
 	uint64_t	cache_blocksize;
 	struct uwsgi_cache_item	*cache_items;
 	void		*cache;
+	char 		*cache_store;
+	size_t 		cache_filesize;
+	int		cache_store_sync;
 
 	uint64_t	queue_size;
 	uint64_t	queue_blocksize;
@@ -1609,3 +1619,11 @@ void uwsgi_unix_signal(int, void (*)(int));
 char *uwsgi_get_exported_opt(char *);
 
 int uwsgi_signal_add_cron(uint8_t, int, int, int, int, int);
+
+char *uwsgi_get_optname_by_index(int);
+
+int uwsgi_list_has_num(char *, int);
+
+int uwsgi_list_has_str(char *, char *);
+
+void uwsgi_cache_fix(void);

uwsgiconfig.py

@@ -377,9 +377,15 @@ class uConf(object):
             self.gcc_list.append('yaml')
 
         if self.get('ldap'):
-            self.cflags.append("-DUWSGI_LDAP")
-            self.gcc_list.append('ldap')
-            self.libs.append('-lldap')
+            if self.get('ldap') == 'auto':
+                if os.path.exists('/usr/include/ldap.h'):
+                    self.cflags.append("-DUWSGI_LDAP")
+                    self.gcc_list.append('ldap')
+                    self.libs.append('-lldap')
+            else:
+                self.cflags.append("-DUWSGI_LDAP")
+                self.gcc_list.append('ldap')
+                self.libs.append('-lldap')
 
         if self.get('evdis'):
             self.cflags.append("-DUWSGI_EVDIS")