X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=d98e9603ced15a27ea1780ffb7ef850e5138c55e;hp=dada53e57746f6f77a13eebb9b14ec97f07f7d55;hb=9be19e7946fd413df61eca5e9a934834c5757494;hpb=471684761a2039bbc89aa1e3c33c62de6bef86cf

diff --git a/server.c b/server.c
index dada53e5..d98e9603 100644
--- a/server.c
+++ b/server.c
@@ -15,10 +15,13 @@
  *
  */
 
+#include <sys/types.h>
+#include <dirent.h>
 
-
+#include "para.h"
 #include "server.cmdline.h"
-#include "afs.h"
+#include "afs_common.h"
+#include "afh.h"
 #include "server.h"
 #include "vss.h"
 #include "config.h"
@@ -30,8 +33,11 @@
 #include "string.h"
 #include "ipc.h"
 #include "fd.h"
+#include "list.h"
+#include "sched.h"
 #include "signal.h"
 #include "user_list.h"
+#include "afs.h"
 
 /** define the array of error lists needed by para_server */
 INIT_SERVER_ERRLISTS;
@@ -232,7 +238,13 @@ static void parse_config(int override)
 	}
 	if (!ret) {
 		int tmp = conf.daemon_given;
-		server_cmdline_parser_configfile(cf, &conf, override, 0, 0);
+		struct server_cmdline_parser_params params = {
+			.override = override,
+			.initialize = 0,
+			.check_required = 0,
+			.check_ambiguity = 0
+		};
+		server_cmdline_parser_config_file(cf, &conf, &params);
 		conf.daemon_given = tmp;
 	}
 	/* logfile */
@@ -338,6 +350,36 @@ out:
 	exit(EXIT_FAILURE);
 }
 
+uint32_t afs_socket_cookie;
+static int afs_socket;
+pid_t afs_pid;
+
+static void init_afs(void)
+{
+	int ret, afs_server_socket[2];
+
+	ret = socketpair(PF_UNIX, SOCK_DGRAM, 0, afs_server_socket);
+	if (ret < 0)
+		exit(EXIT_FAILURE);
+	afs_socket_cookie = para_random((uint32_t)-1);
+	afs_pid = fork();
+	if (afs_pid < 0)
+		exit(EXIT_FAILURE);
+	if (!afs_pid) { /* child (afs) */
+		close(afs_server_socket[0]);
+		afs_init(afs_socket_cookie, afs_server_socket[1]);
+	}
+	close(afs_server_socket[1]);
+	afs_socket = afs_server_socket[0];
+	ret = mark_fd_nonblock(afs_socket);
+	if (ret < 0)
+		exit(EXIT_FAILURE);
+	add_close_on_fork_list(afs_socket);
+	PARA_INFO_LOG("afs_socket: %d, afs_socket_cookie: %u\n", afs_socket,
+		(unsigned) afs_socket_cookie);
+}
+
+
 static unsigned do_inits(int argc, char **argv)
 {
 	/* connector's address information */
@@ -363,6 +405,7 @@ static unsigned do_inits(int argc, char **argv)
 	vss_init();
 	mmd->server_pid = getpid();
 	setup_signal_handling();
+	init_afs();
 	mmd_lock();
 	/* init network socket */
 	PARA_NOTICE_LOG("%s", "initializing tcp command socket\n");
@@ -486,23 +529,34 @@ repeat:
 	status_refresh();
 	if (FD_ISSET(signal_pipe, &rfds)) {
 		int sig;
+		pid_t pid;
 		sig = para_next_signal();
 		switch (sig) {
 		case SIGHUP:
 			handle_sighup();
 			break;
 		case SIGCHLD:
-			para_reap_children();
+			for (;;) {
+				pid = para_reap_child();
+				if (pid <= 0)
+					break;
+				if (pid != afs_pid)
+					continue;
+				PARA_EMERG_LOG("fatal: afs died\n");
+				goto genocide;
+			}
 			break;
 		/* die on sigint/sigterm. Kill all children too. */
 		case SIGINT:
 		case SIGTERM:
 			PARA_EMERG_LOG("terminating on signal %d\n", sig);
+genocide:
 			kill(0, SIGTERM);
 			selectors[mmd->selector_num].shutdown();
 			mutex_destroy(mmd_mutex);
 			shm_detach(mmd);
 			shm_destroy(mmd_shm_id);
+
 			exit(EXIT_FAILURE);
 		}
 	}