===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -c -r1.143 -r1.144
*** src/usr.bin/tmux/server.c	2015/10/23 16:07:29	1.143
--- src/usr.bin/tmux/server.c	2015/10/27 13:23:24	1.144
***************
*** 1,4 ****
! /* $OpenBSD: server.c,v 1.143 2015/10/23 16:07:29 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server.c,v 1.144 2015/10/27 13:23:24 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 43,48 ****
--- 43,49 ----
  
  struct clients	 clients;
  
+ struct tmuxproc	*server_proc;
  int		 server_fd;
  int		 server_exit;
  struct event	 server_ev_accept;
***************
*** 54,64 ****
  struct layout_cell	*marked_layout_cell;
  
  int	server_create_socket(void);
! void	server_loop(void);
  int	server_should_exit(void);
  void	server_send_exit(void);
! void	server_accept_callback(int, short, void *);
! void	server_signal_callback(int, short, void *);
  void	server_child_signal(void);
  void	server_child_exited(pid_t, int);
  void	server_child_stopped(pid_t, int);
--- 55,65 ----
  struct layout_cell	*marked_layout_cell;
  
  int	server_create_socket(void);
! int	server_loop(void);
  int	server_should_exit(void);
  void	server_send_exit(void);
! void	server_accept(int, short, void *);
! void	server_signal(int);
  void	server_child_signal(void);
  void	server_child_exited(pid_t, int);
  void	server_child_stopped(pid_t, int);
***************
*** 162,178 ****
  {
  	int	pair[2];
  
- 	/* The first client is special and gets a socketpair; create it. */
  	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pair) != 0)
  		fatal("socketpair failed");
- 	log_debug("starting server");
  
! 	switch (fork()) {
! 	case -1:
! 		fatal("fork failed");
! 	case 0:
! 		break;
! 	default:
  		close(pair[1]);
  		return (pair[0]);
  	}
--- 163,173 ----
  {
  	int	pair[2];
  
  	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pair) != 0)
  		fatal("socketpair failed");
  
! 	server_proc = proc_start("server", base, 1, server_signal);
! 	if (server_proc == NULL) {
  		close(pair[1]);
  		return (pair[0]);
  	}
***************
*** 182,202 ****
  	    "ps", NULL) != 0)
  		fatal("pledge failed");
  
- 	/*
- 	 * Must daemonise before loading configuration as the PID changes so
- 	 * $TMUX would be wrong for sessions created in the config file.
- 	 */
- 	if (daemon(1, 0) != 0)
- 		fatal("daemon failed");
- 
- 	/* event_init() was called in our parent, need to reinit. */
- 	clear_signals(0);
- 	if (event_reinit(base) != 0)
- 		fatal("event_reinit failed");
- 
- 	logfile("server");
- 	log_debug("server started, pid %ld", (long) getpid());
- 
  	RB_INIT(&windows);
  	RB_INIT(&all_window_panes);
  	TAILQ_INIT(&clients);
--- 177,182 ----
***************
*** 207,214 ****
  	utf8_build();
  
  	start_time = time(NULL);
- 	log_debug("socket path %s", socket_path);
- 	setproctitle("server (%s)", socket_path);
  
  	server_fd = server_create_socket();
  	if (server_fd == -1)
--- 187,192 ----
***************
*** 226,256 ****
  
  	server_add_accept(0);
  
! 	set_signals(server_signal_callback);
! 	server_loop();
  	status_prompt_save_history();
  	exit(0);
  }
  
! /* Main server loop. */
! void
  server_loop(void)
  {
- 	while (!server_should_exit()) {
- 		log_debug("event dispatch enter");
- 		event_loop(EVLOOP_ONCE);
- 		log_debug("event dispatch exit");
- 
- 		server_client_loop();
- 	}
- }
- 
- /* Check if the server should exit (no more clients or sessions). */
- int
- server_should_exit(void)
- {
  	struct client	*c;
  
  	if (!options_get_number(&global_options, "exit-unattached")) {
  		if (!RB_EMPTY(&sessions))
  			return (0);
--- 204,222 ----
  
  	server_add_accept(0);
  
! 	proc_loop(server_proc, server_loop);
  	status_prompt_save_history();
  	exit(0);
  }
  
! /* Server loop callback. */
! int
  server_loop(void)
  {
  	struct client	*c;
  
+ 	server_client_loop();
+ 
  	if (!options_get_number(&global_options, "exit-unattached")) {
  		if (!RB_EMPTY(&sessions))
  			return (0);
***************
*** 282,291 ****
  	cmd_wait_for_flush();
  
  	TAILQ_FOREACH_SAFE(c, &clients, entry, c1) {
! 		if (c->flags & (CLIENT_BAD|CLIENT_SUSPENDED))
  			server_client_lost(c);
  		else
! 			server_write_client(c, MSG_SHUTDOWN, NULL, 0);
  		c->session = NULL;
  	}
  
--- 248,257 ----
  	cmd_wait_for_flush();
  
  	TAILQ_FOREACH_SAFE(c, &clients, entry, c1) {
! 		if (c->flags & CLIENT_SUSPENDED)
  			server_client_lost(c);
  		else
! 			proc_send(c->peer, MSG_SHUTDOWN, -1, NULL, 0);
  		c->session = NULL;
  	}
  
***************
*** 331,337 ****
  
  /* Callback for server socket. */
  void
! server_accept_callback(int fd, short events, unused void *data)
  {
  	struct sockaddr_storage	sa;
  	socklen_t		slen = sizeof sa;
--- 297,303 ----
  
  /* Callback for server socket. */
  void
! server_accept(int fd, short events, unused void *data)
  {
  	struct sockaddr_storage	sa;
  	socklen_t		slen = sizeof sa;
***************
*** 372,390 ****
  		event_del(&server_ev_accept);
  
  	if (timeout == 0) {
! 		event_set(&server_ev_accept,
! 		    server_fd, EV_READ, server_accept_callback, NULL);
  		event_add(&server_ev_accept, NULL);
  	} else {
! 		event_set(&server_ev_accept,
! 		    server_fd, EV_TIMEOUT, server_accept_callback, NULL);
  		event_add(&server_ev_accept, &tv);
  	}
  }
  
  /* Signal handler. */
  void
! server_signal_callback(int sig, unused short events, unused void *data)
  {
  	int	fd;
  
--- 338,356 ----
  		event_del(&server_ev_accept);
  
  	if (timeout == 0) {
! 		event_set(&server_ev_accept, server_fd, EV_READ, server_accept,
! 		    NULL);
  		event_add(&server_ev_accept, NULL);
  	} else {
! 		event_set(&server_ev_accept, server_fd, EV_TIMEOUT,
! 		    server_accept, NULL);
  		event_add(&server_ev_accept, &tv);
  	}
  }
  
  /* Signal handler. */
  void
! server_signal(int sig)
  {
  	int	fd;