From 31bd3fa6c451e54129a4fc5247a937979a016156 Mon Sep 17 00:00:00 2001
From: "roberto@sirius" <roberto@sirius>
Date: Fri, 17 Dec 2010 17:13:45 +0100
Subject: [PATCH] use uwsgi_signal framework for better/portable --no-orphans

---
 master.c   |   1 +
 protocol.c |  12 +-----
 utils.c    | 109 +++++++++++++++++------------------------------
 uwsgi.c    | 122 +++++++++++++----------------------------------------
 uwsgi.h    |   5 ++-
 5 files changed, 75 insertions(+), 174 deletions(-)

diff --git a/master.c b/master.c
index f943d167..52c63d1e 100644
--- a/master.c
+++ b/master.c
@@ -440,6 +440,7 @@ void master_loop(char **argv, char **environ) {
 							}
 							else {
 								uwsgi_log_verbose("lost connection with worker %d\n", i+1);
+								close(uwsgi_signal_poll[i].fd);
 							}
 						}
 					}
diff --git a/protocol.c b/protocol.c
index 6c42a51b..2d4bda67 100644
--- a/protocol.c
+++ b/protocol.c
@@ -597,11 +597,7 @@ int uwsgi_get_dgram(int fd, struct wsgi_request *wsgi_req) {
 	socklen_t sin_len = sizeof(struct sockaddr_in);
 
 	if (!buffer) {
-		buffer = malloc(uwsgi.buffer_size + 4);
-		if (!buffer) {
-			uwsgi_error("malloc()");
-			exit(1);
-		}
+		buffer = uwsgi_malloc(uwsgi.buffer_size + 4);
 	}
 		
 
@@ -747,11 +743,7 @@ int uwsgi_string_sendto(int fd, uint8_t modifier1, uint8_t modifier2, struct soc
 
 	ssize_t rlen ;
 	struct uwsgi_header *uh;
-	char *upkt = malloc(len + 4);
-	if (!upkt) {
-		uwsgi_error("malloc()");
-		exit(1);
-	}
+	char *upkt = uwsgi_malloc(len + 4);
 
 	uh = (struct uwsgi_header *) upkt;
 
diff --git a/utils.c b/utils.c
index 6f76e7e3..067e424d 100644
--- a/utils.c
+++ b/utils.c
@@ -185,21 +185,13 @@ char *uwsgi_get_cwd() {
 	int newsize = 256;
 	char *cwd;
 
-	cwd = malloc(newsize);
-	if (cwd == NULL) {
-		uwsgi_error("malloc()");
-		exit(1);
-	}
+	cwd = uwsgi_malloc(newsize);
 
 	if (getcwd(cwd, newsize) == NULL) {
 		newsize = errno;
 		uwsgi_log("need a bigger buffer (%d bytes) for getcwd(). doing reallocation.\n", newsize);
 		free(cwd);
-		cwd = malloc(newsize);
-		if (cwd == NULL) {
-			uwsgi_error("malloc()");
-			exit(1);
-		}
+		cwd = uwsgi_malloc(newsize);
 		if (getcwd(cwd, newsize) == NULL) {
 			uwsgi_error("getcwd()");
 			exit(1);
@@ -465,16 +457,27 @@ int wsgi_req_accept(struct wsgi_request *wsgi_req) {
 
 	int i;
 	int ret;
+	char uwsgi_signal;
+
 
 	if (wsgi_req->leave_open) return 0;
 
-	ret = poll(uwsgi.sockets_poll, uwsgi.sockets_cnt, -1);
+	ret = poll(uwsgi.sockets_poll, uwsgi.sockets_cnt+uwsgi.no_orphans, -1);
 
 	if (ret < 0) {
 		uwsgi_error("poll()");
 		return -1;
 	}
 
+	if (uwsgi.sockets_poll[uwsgi.sockets_cnt].revents) {
+		if (read(uwsgi.sockets_poll[uwsgi.sockets_cnt].fd, &uwsgi_signal, 1) <= 0 && uwsgi.no_orphans) {
+			uwsgi_log_verbose("UAAAAAAH my master died, i will follow him...\n");
+                	end_me();
+		}
+                else {
+                	uwsgi_log_verbose("master sent signal %b to worker %d\n", uwsgi_signal, uwsgi.mywid);
+		}
+	}
 
 	for(i=0;i<uwsgi.sockets_cnt;i++) {
 
@@ -567,11 +570,7 @@ void parse_sys_envs(char **envs) {
 
 	while(*uenvs) {
 		if (!strncmp(*uenvs, "UWSGI_", 6)) {
-			earg = malloc(strlen(*uenvs+6)+1);
-			if (!earg) {
-				uwsgi_error("malloc()");
-				exit(1);
-			}
+			earg = uwsgi_malloc(strlen(*uenvs+6)+1);
 			env_to_arg(*uenvs+6, earg);
 			eq_pos = strchr(earg, '=');
 			if (!eq_pos) {
@@ -695,11 +694,7 @@ char *uwsgi_concatn(int c, ...) {
 	va_end( s );
 
 
-	buf = malloc(len);
-	if (buf == NULL) {
-		uwsgi_error("malloc()");
-		exit(1);
-	}
+	buf = uwsgi_malloc(len);
 	memset( buf, 0, len);
 
 	j = c;
@@ -730,11 +725,7 @@ char *uwsgi_concat2(char *one, char *two) {
 	size_t len = strlen(one) + strlen(two) + 1;
 
 
-	buf = malloc(len);
-	if (buf == NULL) {
-		uwsgi_error("malloc()");
-		exit(1);
-	}
+	buf = uwsgi_malloc(len);
 	buf[len-1] = 0;
 
 	memcpy( buf, one, strlen(one));
@@ -750,11 +741,7 @@ char *uwsgi_concat4(char *one, char *two, char *three, char *four) {
 	size_t len = strlen(one) + strlen(two) + strlen(three) + strlen(four) + 1;
 
 
-	buf = malloc(len);
-	if (buf == NULL) {
-		uwsgi_error("malloc()");
-		exit(1);
-	}
+	buf = uwsgi_malloc(len);
 	buf[len-1] = 0;
 
 	memcpy( buf, one, strlen(one));
@@ -773,11 +760,7 @@ char *uwsgi_concat3(char *one, char *two, char *three) {
 	size_t len = strlen(one) + strlen(two) + strlen(three) + 1;
 
 
-	buf = malloc(len);
-	if (buf == NULL) {
-		uwsgi_error("malloc()");
-		exit(1);
-	}
+	buf = uwsgi_malloc(len);
 	buf[len-1] = 0;
 
 	memcpy( buf, one, strlen(one));
@@ -794,11 +777,7 @@ char *uwsgi_concat2n(char *one, int s1, char *two, int s2) {
 	size_t len = s1 + s2 + 1;
 
 
-	buf = malloc(len);
-	if (buf == NULL) {
-		uwsgi_error("malloc()");
-		exit(1);
-	}
+	buf = uwsgi_malloc(len);
 	buf[len-1] = 0;
 
 	memcpy( buf, one, s1);
@@ -814,11 +793,7 @@ char *uwsgi_concat3n(char *one, int s1, char *two, int s2, char *three, int s3)
 	size_t len = s1 + s2 + s3 + 1;
 
 
-	buf = malloc(len);
-	if (buf == NULL) {
-		uwsgi_error("malloc()");
-		exit(1);
-	}
+	buf = uwsgi_malloc(len);
 	buf[len-1] = 0;
 
 	memcpy( buf, one, s1);
@@ -835,11 +810,7 @@ char *uwsgi_concat4n(char *one, int s1, char *two, int s2, char *three, int s3,
 	size_t len = s1 + s2 + s3 + s4 + 1;
 
 
-	buf = malloc(len);
-	if (buf == NULL) {
-		uwsgi_error("malloc()");
-		exit(1);
-	}
+	buf = uwsgi_malloc(len);
 	buf[len-1] = 0;
 
 	memcpy( buf, one, s1);
@@ -873,11 +844,7 @@ char *uwsgi_concat(int c, ... ) {
 	va_end( s );
 
 
-	buf = malloc(len);
-	if (buf == NULL) {
-		uwsgi_error("malloc()");
-		exit(1);
-	}
+	buf = uwsgi_malloc(len);
 	memset( buf, 0, len);
 
 	j = c;
@@ -905,11 +872,7 @@ char *uwsgi_strncopy(char *s, int len) {
 
 	char *buf;
 
-	buf = malloc(len + 1);
-	if (buf == NULL) {
-		uwsgi_error("malloc()");
-		exit(1);
-	}
+	buf = uwsgi_malloc(len + 1);
 	buf[len] = 0;
 
 	memcpy(buf, s, len);
@@ -1128,11 +1091,7 @@ void add_exported_option(int i, char *value) {
 
 
 	if (!uwsgi.exported_opts) {
-		uwsgi.exported_opts = malloc(sizeof(struct uwsgi_opt*));
-		if (!uwsgi.exported_opts) {
-			uwsgi_error("malloc()");
-			exit(1);
-		}
+		uwsgi.exported_opts = uwsgi_malloc(sizeof(struct uwsgi_opt*));
 	}
 	else {
 		uwsgi.exported_opts = realloc(uwsgi.exported_opts, sizeof(struct uwsgi_opt*) * (uwsgi.exported_opts_cnt+1));
@@ -1143,11 +1102,7 @@ void add_exported_option(int i, char *value) {
 	}
 
 
-	uwsgi.exported_opts[uwsgi.exported_opts_cnt] = malloc(sizeof(struct uwsgi_opt));
-	if (!uwsgi.exported_opts[uwsgi.exported_opts_cnt]) {
-		uwsgi_error("malloc()");
-		exit(1);
-	}
+	uwsgi.exported_opts[uwsgi.exported_opts_cnt] = uwsgi_malloc(sizeof(struct uwsgi_opt));
 	uwsgi.exported_opts[uwsgi.exported_opts_cnt]->key = key;
 	uwsgi.exported_opts[uwsgi.exported_opts_cnt]->value = value;
 	uwsgi.exported_opts_cnt++;
@@ -1193,3 +1148,15 @@ int uwsgi_waitfd(int fd, int timeout) {
 
 	return ret;
 }
+
+
+inline void *uwsgi_malloc(size_t size) {
+
+	char *ptr = malloc(size);
+	if (ptr == NULL) {
+		uwsgi_error("malloc()");
+		exit(1);
+	}	
+
+	return ptr;
+}
diff --git a/uwsgi.c b/uwsgi.c
index c53a82c1..99ca6950 100644
--- a/uwsgi.c
+++ b/uwsgi.c
@@ -626,11 +626,7 @@ options_parsed:
 	//call after_opt hooks
 
 	if (uwsgi.binary_path == argv[0]) {
-		uwsgi.binary_path = malloc(strlen(argv[0]) + 1);
-		if (uwsgi.binary_path == NULL) {
-			uwsgi_error("malloc()");
-			exit(1);
-		}
+		uwsgi.binary_path = uwsgi_malloc(strlen(argv[0]) + 1);
 		memcpy(uwsgi.binary_path, argv[0], strlen(argv[0]) + 1);
 	}
 
@@ -733,11 +729,7 @@ options_parsed:
 		}
 		if (!uwsgi.sockets[0].name) {
 
-			uwsgi.sockets[0].name = malloc(64);
-			if (!uwsgi.sockets[0].name) {
-				uwsgi_error("malloc()");
-				exit(1);
-			}
+			uwsgi.sockets[0].name = uwsgi_malloc(64);
 			uwsgi.sockets_cnt++;
 			snprintf(uwsgi.sockets[0].name, 64, "%d_%d.sock", (int) time(NULL), (int) getpid());
 			uwsgi_log("using %s as uwsgi protocol socket\n", uwsgi.sockets[0].name);
@@ -797,47 +789,25 @@ options_parsed:
 		}
 	}
 
-	uwsgi.wsgi_requests = malloc(sizeof(struct wsgi_request *) * uwsgi.cores);
-	if (uwsgi.wsgi_requests == NULL) {
-		uwsgi_log("unable to allocate memory for requests.\n");
-		exit(1);
-	}
+	uwsgi.wsgi_requests = uwsgi_malloc(sizeof(struct wsgi_request *) * uwsgi.cores);
+
 	for (i = 0; i < uwsgi.cores; i++) {
-		uwsgi.wsgi_requests[i] = malloc(sizeof(struct wsgi_request));
-		if (uwsgi.wsgi_requests[i] == NULL) {
-			uwsgi_log("unable to allocate memory for requests.\n");
-			exit(1);
-		}
+		uwsgi.wsgi_requests[i] = uwsgi_malloc(sizeof(struct wsgi_request));
 		memset(uwsgi.wsgi_requests[i], 0, sizeof(struct wsgi_request));
 	}
 
-	uwsgi.async_buf = malloc(sizeof(char *) * uwsgi.cores);
-	if (!uwsgi.async_buf) {
-		uwsgi_error("malloc()");
-		exit(1);
-	}
+	uwsgi.async_buf = uwsgi_malloc(sizeof(char *) * uwsgi.cores);
+
 	if (uwsgi.post_buffering > 0) {
-		uwsgi.async_post_buf = malloc(sizeof(char *) * uwsgi.cores);
-		if (!uwsgi.async_post_buf) {
-			uwsgi_error("malloc()");
-			exit(1);
-		}
+		uwsgi.async_post_buf = uwsgi_malloc(sizeof(char *) * uwsgi.cores);
 		if (!uwsgi.post_buffering_bufsize) {
 			uwsgi.post_buffering_bufsize = 8192;
 		}
 	}
 	for (i = 0; i < uwsgi.cores; i++) {
-		uwsgi.async_buf[i] = malloc(uwsgi.buffer_size);
-		if (!uwsgi.async_buf[i]) {
-			uwsgi_error("malloc()");
-			exit(1);
-		}
+		uwsgi.async_buf[i] = uwsgi_malloc(uwsgi.buffer_size);
 		if (uwsgi.post_buffering > 0) {
-			uwsgi.async_post_buf[i] = malloc(uwsgi.post_buffering_bufsize);
-			if (!uwsgi.async_post_buf[i]) {
-				uwsgi_error("malloc()");
-				exit(1);
-			}
+			uwsgi.async_post_buf[i] = uwsgi_malloc(uwsgi.post_buffering_bufsize);
 		}
 	}
 
@@ -1091,6 +1061,7 @@ options_parsed:
 			}
 
 		}
+	
 #ifdef UWSGI_PROXY
 		if (uwsgi.proxy_socket_name) {
 			uwsgi.shared->proxy_pid = proxy_start(uwsgi.master_process);
@@ -1131,16 +1102,12 @@ options_parsed:
 #ifdef UWSGI_ASYNC
 	if (uwsgi.async > 1) {
 #ifdef __linux__
-		uwsgi.async_events = malloc(sizeof(struct epoll_event) * uwsgi.async);
+		uwsgi.async_events = uwsgi_malloc(sizeof(struct epoll_event) * uwsgi.async);
 #elif defined(__sun__)
-		uwsgi.async_events = malloc(sizeof(struct pollfd) * uwsgi.async);
+		uwsgi.async_events = uwsgi_malloc(sizeof(struct pollfd) * uwsgi.async);
 #else
-		uwsgi.async_events = malloc(sizeof(struct kevent) * uwsgi.async);
+		uwsgi.async_events = uwsgi_malloc(sizeof(struct kevent) * uwsgi.async);
 #endif
-		if (!uwsgi.async_events) {
-			uwsgi_error("malloc()");
-			exit(1);
-		}
 	}
 #endif
 
@@ -1367,13 +1334,9 @@ uwsgi.shared->hooks[UWSGI_MODIFIER_PING] = uwsgi_request_ping;	//100
 
 
 
-	uwsgi.async_hvec = malloc(sizeof(struct iovec *) * uwsgi.cores);
-	if (uwsgi.async_hvec == NULL) {
-		uwsgi_log("unable to allocate memory for iovec.\n");
-		exit(1);
-	}
+	uwsgi.async_hvec = uwsgi_malloc(sizeof(struct iovec *) * uwsgi.cores);
 	for (i = 0; i < uwsgi.cores; i++) {
-		uwsgi.async_hvec[i] = malloc(sizeof(struct iovec) * uwsgi.vec_size);
+		uwsgi.async_hvec[i] = uwsgi_malloc(sizeof(struct iovec) * uwsgi.vec_size);
 	}
 
 	if (uwsgi.shared->options[UWSGI_OPTION_HARAKIRI] > 0 && !uwsgi.master_process) {
@@ -1399,14 +1362,6 @@ uwsgi.shared->hooks[UWSGI_MODIFIER_PING] = uwsgi_request_ping;	//100
 			exit(1);
 		}
 	}
-#ifdef __linux__
-	if (uwsgi.master_process && uwsgi.no_orphans) {
-		if (prctl(PR_SET_PDEATHSIG, SIGINT)) {
-			uwsgi_error("prctl()");
-		}
-	}
-#endif
-
 
 #ifdef UWSGI_ERLANG
 	if (uwsgi.erlang_nodes > 0) {
@@ -1449,6 +1404,13 @@ uwsgi.shared->hooks[UWSGI_MODIFIER_PING] = uwsgi_request_ping;	//100
                 }
 	}
 
+
+	if (uwsgi.no_orphans) {
+        	uwsgi.sockets_poll[uwsgi.sockets_cnt].fd = uwsgi.workers[uwsgi.mywid].pipe[1];
+                uwsgi.sockets_poll[uwsgi.sockets_cnt].events = POLLIN;
+	}
+
+
 	if (uwsgi.loop) {
 		void (*u_loop) (void) = uwsgi_get_loop(uwsgi.loop);
 		uwsgi_log("running %s loop %p\n", uwsgi.loop, u_loop);
@@ -1477,7 +1439,7 @@ uwsgi.shared->hooks[UWSGI_MODIFIER_PING] = uwsgi_request_ping;	//100
 			}
 			for (i = 1; i < uwsgi.threads; i++) {
 				long j = i;
-				a_thread = malloc(sizeof(pthread_t));
+				a_thread = uwsgi_malloc(sizeof(pthread_t));
 				pthread_create(a_thread, &pa, simple_loop, (void *) j);
 			}
 		}
@@ -1769,22 +1731,14 @@ end:
 		case LONG_ARGS_INI_PASTE:
 			uwsgi.ini = optarg;
 			if (uwsgi.ini[0] != '/') {
-				uwsgi.paste = malloc(7 + strlen(uwsgi.cwd) + 1 + strlen(uwsgi.ini) + 1);
-				if (uwsgi.paste == NULL) {
-					uwsgi_error("malloc()");
-					exit(1);
-				}
+				uwsgi.paste = uwsgi_malloc(7 + strlen(uwsgi.cwd) + 1 + strlen(uwsgi.ini) + 1);
 				memset(uwsgi.paste, 0, 7 + strlen(uwsgi.cwd) + strlen(uwsgi.ini) + 1);
 				memcpy(uwsgi.paste, "config:", 7);
 				memcpy(uwsgi.paste + 7, uwsgi.cwd, strlen(uwsgi.cwd));
 				uwsgi.paste[7 + strlen(uwsgi.cwd)] = '/';
 				memcpy(uwsgi.paste + 7 + strlen(uwsgi.cwd) + 1, uwsgi.ini, strlen(uwsgi.ini));
 			} else {
-				uwsgi.paste = malloc(7 + strlen(uwsgi.ini) + 1);
-				if (uwsgi.paste == NULL) {
-					uwsgi_error("malloc()");
-					exit(1);
-				}
+				uwsgi.paste = uwsgi_malloc(7 + strlen(uwsgi.ini) + 1);
 				memset(uwsgi.paste, 0, 7 + strlen(uwsgi.ini) + 1);
 				memcpy(uwsgi.paste, "config:", 7);
 				memcpy(uwsgi.paste + 7, uwsgi.ini, strlen(uwsgi.ini));
@@ -1837,11 +1791,7 @@ end:
 			return 1;
 #ifdef UWSGI_SPOOLER
 		case 'Q':
-			uwsgi.spool_dir = malloc(PATH_MAX);
-			if (!uwsgi.spool_dir) {
-				uwsgi_error("malloc()");
-				exit(1);
-			}
+			uwsgi.spool_dir = uwsgi_malloc(PATH_MAX);
 			if (access(optarg, R_OK | W_OK | X_OK)) {
 				uwsgi_error("[spooler directory] access()");
 				exit(1);
@@ -2160,11 +2110,7 @@ void build_options() {
 		if (short_options) {
 			free(short_options);
 		}
-		short_options = malloc(short_opt_size + 1);
-		if (!short_options) {
-			uwsgi_error("malloc()");
-			exit(1);
-		}
+		short_options = uwsgi_malloc(short_opt_size + 1);
 		memcpy(short_options, base_short_options, strlen(base_short_options));
 		so_ptr = short_options + strlen(base_short_options);
 
@@ -2199,11 +2145,7 @@ void build_options() {
 		if (uwsgi.long_options) {
 			free(uwsgi.long_options);
 		}
-		uwsgi.long_options = malloc(sizeof(struct option) * (opt_count + 1));
-		if (!uwsgi.long_options) {
-			uwsgi_error("malloc()");
-			exit(1);
-		}
+		uwsgi.long_options = uwsgi_malloc(sizeof(struct option) * (opt_count + 1));
 		opt_count = 0;
 		lopt = long_base_options;
 		while ((aopt = lopt)) {
@@ -2298,11 +2240,7 @@ int uwsgi_cluster_add_me() {
 	snprintf(numproc, 6, "%d", uwsgi.numproc);
 
 	size_t len = 2 + strlen(key1) + 2 + strlen(uwsgi.hostname) + 2 + strlen(key2) + 2 + strlen(uwsgi.sockets[0].name) + 2 + strlen(key3) + 2 + strlen(numproc);
-	char *buf = malloc( len );
-	if (!buf) {
-		uwsgi_error("malloc()");
-		exit(1);
-	}
+	char *buf = uwsgi_malloc( len );
 
 	ptrbuf = buf;
 
diff --git a/uwsgi.h b/uwsgi.h
index daf3002b..7d201720 100644
--- a/uwsgi.h
+++ b/uwsgi.h
@@ -801,7 +801,8 @@ struct uwsgi_server {
 
 	int             sockets_cnt;
 	struct uwsgi_socket sockets[8];
-	struct pollfd   sockets_poll[8];
+	// leave a slot for no-orphan mode
+	struct pollfd   sockets_poll[9];
 
 	time_t          respawn_delta;
 
@@ -1255,3 +1256,5 @@ uint32_t uwsgi_cache_exists(char *, uint16_t);
 void uwsgi_lock_init(void *);
 void uwsgi_lock(void *);
 void uwsgi_unlock(void *);
+
+inline void *uwsgi_malloc(size_t);