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: Thu, 2 Oct 2008 11:40:24 -0700 (PDT) [thread overview]
Message-ID: <200810021840.m92IeOTT017793@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.
Looks good to me (assuming it works), I found some nits:
> @@ -1224,7 +1224,8 @@ opening the first frame (e.g. open a connection to an X server).")
> ;; processing all command line arguments to allow e.g. `server-name'
> ;; to be changed before the server starts.
> (when (daemonp)
> - (server-start))
> + (server-start)
> + (daemon-initialized))
Maybe "notify-daemon-initialized"?
> ;; Run emacs-session-restore (session management) if started by
> ;; the session manager and we have a session manager connection.
> diff --git a/src/emacs.c b/src/emacs.c
> index f94d2d3..d4d16b7 100644
> --- a/src/emacs.c
> +++ b/src/emacs.c
> @@ -235,6 +235,13 @@ int noninteractive1;
> /* Nonzero means Emacs was started as a daemon. */
> int is_daemon = 0;
>
> +/* Set nonzero after the daemon has finished initializing. */
> +int daemon_initialized = 0;
Make it a static inside the only user?
> +/* Pipe used to send exit notification to the daemon parent at
> + startup. */
> +int daemon_pipe[2];
> +
> /* Save argv and argc. */
> char **initial_argv;
> int initial_argc;
> @@ -1074,16 +1081,56 @@ main (int argc, char **argv)
> if (argmatch (argv, argc, "-daemon", "--daemon", 5, NULL, &skip_args))
> {
> #ifndef DOS_NT
> - pid_t f = fork ();
> + pid_t f;
> int nfd;
> +
> + /* Start as a daemon: fork a new child process which will run the
> + rest of the initialization code, then exit.
The child runs everything, not only the initialization.
Maybe say "exit in order to detach from the terminal" or some such?
> +DEFUN ("daemon-initialized", Fdaemon_initialized, Sdaemon_initialized, 0, 0, 0,
> + doc: /* Mark the Emacs daemon as being initialized. */)
> + ()
> +{
> + if (is_daemon)
> + {
> + if (! daemon_initialized)
> + {
> + /* Closing the pipe will notify the parent that it can exit. */
> + close (daemon_pipe[1]);
> + daemon_initialized = 1;
> + }
else error ("Can only do this once");
BTW, ideally the parent would exit when it detects that the server is
started, but that's much more complicated to implement...
next prev parent reply other threads:[~2008-10-02 18:40 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 [this message]
2008-10-06 20:59 ` Dan Nicolaescu
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200810021840.m92IeOTT017793@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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).