From: Dan Nicolaescu <dann@ics.uci.edu>
To: Romain Francoise <romain@orebokech.com>
Cc: trentbuck@gmail.com, 1058@emacsbugs.donarmstrong.com
Subject: bug#1058: 23.0.60; emacs --daemon should not return until socket is ready
Date: Mon, 6 Oct 2008 13:59:36 -0700 (PDT) [thread overview]
Message-ID: <200810062059.m96KxaXM004646@mothra.ics.uci.edu> (raw)
In-Reply-To: <87myhmdgr8.fsf@elegiac.orebokech.com> (Romain Francoise's message of "Thu, 02 Oct 2008 19:54:51 +0200")
Romain Francoise <romain@orebokech.com> writes:
> Here's version one of a patch for this, please let me know what you
> think.
Here's a version based on your code that also moves detaching from the
terminal later. emacs --daemon && emacsclient -c works.
Errors in ~/.emacs show up in the *Messages* buffer (as they do when
starting up normally).
Only lightly tested. Looking at the patch again, I there aren't any new
features here, so it can go in as a bug fix.
Index: lisp/startup.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/startup.el,v
retrieving revision 1.508
diff -u -3 -p -r1.508 startup.el
--- lisp/startup.el 6 Oct 2008 16:16:30 -0000 1.508
+++ lisp/startup.el 6 Oct 2008 20:18:41 -0000
@@ -1219,7 +1219,7 @@ opening the first frame (e.g. open a con
;; processing all command line arguments to allow e.g. `server-name'
;; to be changed before the server starts.
(when (daemonp)
- (server-start))
+ (daemon-detach-and-start-server))
;; Run emacs-session-restore (session management) if started by
;; the session manager and we have a session manager connection.
Index: src/emacs.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/emacs.c,v
retrieving revision 1.448
diff -u -3 -p -r1.448 emacs.c
--- src/emacs.c 6 Oct 2008 16:16:56 -0000 1.448
+++ src/emacs.c 6 Oct 2008 20:18:41 -0000
@@ -238,6 +238,10 @@ int noninteractive1;
/* Nonzero means Emacs was started as a daemon. */
int is_daemon = 0;
+/* Pipe used to send exit notification to the daemon parent at
+ startup. */
+static int daemon_pipe[2];
+
/* Save argv and argc. */
char **initial_argv;
int initial_argc;
@@ -1078,25 +1082,7 @@ main (int argc, char **argv)
if (argmatch (argv, argc, "-daemon", "--daemon", 5, NULL, &skip_args))
{
#ifndef DOS_NT
- pid_t f = fork ();
- int nfd;
- if (f > 0)
- exit (0);
- if (f < 0)
- {
- fprintf (stderr, "Cannot fork!\n");
- exit (1);
- }
-
- nfd = open ("/dev/null", O_RDWR);
- dup2 (nfd, 0);
- dup2 (nfd, 1);
- dup2 (nfd, 2);
- close (nfd);
is_daemon = 1;
-#ifdef HAVE_SETSID
- setsid();
-#endif
#else /* DOS_NT */
fprintf (stderr, "This platform does not support the -daemon flag.\n");
exit (1);
@@ -2393,6 +2379,87 @@ DEFUN ("daemonp", Fdaemonp, Sdaemonp, 0,
return is_daemon ? Qt : Qnil;
}
+
+DEFUN ("daemon-detach-and-start-server", Fdaemon_detach_and_start_server, Sdaemon_detach_and_start_server, 0, 0, 0,
+ doc: /* Detach from terminal and start the server */)
+ ()
+{
+ static char daemon_initialized = 0;
+ pid_t f;
+ int nfd;
+
+ if (!is_daemon)
+ error ("This function can only be called if emacs is run as a daemon");
+
+ if (daemon_initialized)
+ error ("The daemon has already been initialized");
+
+ if (NILP (Vafter_init_time))
+ error ("This function can only be called after loading the init files");
+
+ /* Start as a daemon: fork a new child process which will run the
+ rest of the initialization code, then exit.
+
+ We want to avoid exiting before the server socket is ready, so
+ use a pipe for synchronization. The parent waits for the child
+ to close its end of the pipe (using `daemon-initialized')
+ before exiting. */
+ if (pipe (daemon_pipe) == -1)
+ {
+ fprintf (stderr, "Cannot pipe!\n");
+ exit (1);
+ }
+
+ f = fork ();
+ if (f > 0)
+ {
+ int retval;
+ char buf[1];
+
+ /* Close unused writing end of the pipe. */
+ close (daemon_pipe[1]);
+
+ /* Just wait for the child to close its end of the pipe. */
+ do
+ {
+ retval = read (daemon_pipe[0], &buf, 1);
+ }
+ while (retval == -1 && errno == EINTR);
+
+ if (retval < 0)
+ {
+ fprintf (stderr, "Error reading status from child\n");
+ exit (1);
+ }
+
+ close (daemon_pipe[0]);
+ exit (0);
+ }
+ if (f < 0)
+ {
+ fprintf (stderr, "Cannot fork!\n");
+ exit (1);
+ }
+
+ /* Close unused reading end of the pipe. */
+ close (daemon_pipe[0]);
+
+ nfd = open ("/dev/null", O_RDWR);
+ dup2 (nfd, 0);
+ dup2 (nfd, 1);
+ dup2 (nfd, 2);
+ close (nfd);
+ is_daemon = 1;
+#ifdef HAVE_SETSID
+ setsid();
+#endif
+ call0 (intern ("server-start"));
+
+ /* Closing the pipe will notify the parent that it can exit. */
+ close (daemon_pipe[1]);
+ daemon_initialized = 1;
+}
+
void
syms_of_emacs ()
{
@@ -2412,6 +2479,7 @@ syms_of_emacs ()
defsubr (&Sinvocation_name);
defsubr (&Sinvocation_directory);
defsubr (&Sdaemonp);
+ defsubr (&Sdaemon_detach_and_start_server);
DEFVAR_LISP ("command-line-args", &Vcommand_line_args,
doc: /* Args passed by shell to Emacs, as a list of strings.
next prev parent reply other threads:[~2008-10-06 20:59 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-30 13:43 bug#1058: 23.0.60; emacs --daemon should not return until socket is ready SRS0+wOMF+22+gmail.com=trentbuck
2008-10-01 16:51 ` Dan Nicolaescu
2008-10-01 19:39 ` Romain Francoise
2008-10-01 20:19 ` Andreas Schwab
2008-10-02 6:05 ` Romain Francoise
2008-10-01 23:32 ` Dan Nicolaescu
2008-10-02 6:07 ` Romain Francoise
2008-10-02 8:14 ` Dan Nicolaescu
2008-10-02 12:38 ` Stefan Monnier
2008-10-02 17:26 ` Dan Nicolaescu
2008-10-02 21:32 ` Stefan Monnier
2008-10-02 22:34 ` Dan Nicolaescu
2008-10-02 22:46 ` Trent W. Buck
2008-10-03 1:12 ` Stefan Monnier
2008-10-03 4:52 ` Dan Nicolaescu
2008-10-03 13:00 ` Stefan Monnier
2008-10-03 17:44 ` Dan Nicolaescu
2008-10-13 2:03 ` Dan Nicolaescu
2008-10-13 15:16 ` Stefan Monnier
2008-10-13 17:01 ` Dan Nicolaescu
2008-10-13 19:07 ` Stefan Monnier
2008-10-14 7:26 ` Dan Nicolaescu
2008-10-27 7:04 ` Dan Nicolaescu
2008-10-02 22:42 ` Trent W. Buck
2008-10-02 17:54 ` Romain Francoise
2008-10-02 18:40 ` Dan Nicolaescu
2008-10-06 20:59 ` Dan Nicolaescu [this message]
2008-10-07 14:26 ` Stefan Monnier
2008-10-07 15:31 ` Dan Nicolaescu
2008-10-07 23:13 ` Trent W. Buck
2008-10-08 2:03 ` Stefan Monnier
2008-10-08 2:25 ` Stefan Monnier
2008-10-07 18:45 ` Romain Francoise
2008-10-07 19:01 ` Dan Nicolaescu
2008-10-26 19:24 ` Dan Nicolaescu
2008-10-02 0:50 ` Trent W. Buck
2008-10-02 0:43 ` Trent W. Buck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200810062059.m96KxaXM004646@mothra.ics.uci.edu \
--to=dann@ics.uci.edu \
--cc=1058@emacsbugs.donarmstrong.com \
--cc=romain@orebokech.com \
--cc=trentbuck@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.