From: Robert Pluim <rpluim@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: larsi@gnus.org, 50849@debbugs.gnu.org, stefankangas@gmail.com,
bugs@gnu.support, visuweshm@gmail.com
Subject: bug#50849: 28.0.50; Proposal for Emacs daemon to signal when being busy
Date: Fri, 09 Sep 2022 10:47:23 +0200 [thread overview]
Message-ID: <87czc57x44.fsf@gmail.com> (raw)
In-Reply-To: <83mtb9etw5.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 08 Sep 2022 19:02:50 +0300")
>>>>> On Thu, 08 Sep 2022 19:02:50 +0300, Eli Zaretskii <eliz@gnu.org> said:
>> So if we set DEFAULT_TIMEOUT to 0, people who do nothing get no
>> messages, and people who do --timeout get messages. I think that
>> satisfies Eliʼs concern about compatibility
Eli> Yes, I think so.
>> (Iʼd even go so far as not setting the timeout at all if itʼs not
>> requested. Why yes, I am paranoid about changing old code).
Eli> I agree.
So this simplifies the code considerably, and in fact removes the
whole retry thing completely.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 49d90a989f..b9ade602e4 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -66,8 +66,6 @@ Copyright (C) 1986-2022 Free Software Foundation, Inc.
#endif /* !WINDOWSNT */
-#define DEFAULT_TIMEOUT (30)
-
#include <ctype.h>
#include <errno.h>
#include <getopt.h>
@@ -2137,35 +2135,24 @@ main (int argc, char **argv)
}
fflush (stdout);
- set_socket_timeout (emacs_socket, timeout > 0 ? timeout : DEFAULT_TIMEOUT);
+ if (timeout > 0)
+ set_socket_timeout (emacs_socket, timeout);
bool saw_response = false;
+
/* Now, wait for an answer and print any messages. */
while (exit_status == EXIT_SUCCESS)
{
- bool retry = true;
- bool msg_showed = quiet;
do
{
act_on_signals (emacs_socket);
rl = recv (emacs_socket, string, BUFSIZ, 0);
- retry = check_socket_timeout (rl);
- if (retry && !saw_response)
- {
- if (timeout > 0)
- {
- /* Don't retry if we were given a --timeout flag. */
- fprintf (stderr, "\nServer not responding; timed out after %lu seconds",
- timeout);
- retry = false;
- }
- else if (!msg_showed)
- {
- msg_showed = true;
- fprintf (stderr, "\nServer not responding; use Ctrl+C to break");
- }
- }
+ if (timeout > 0
+ && check_socket_timeout (rl)
+ && !saw_response)
+ fprintf (stderr, "\nServer not responding; timed out after %lu seconds",
+ timeout);
}
- while ((rl < 0 && errno == EINTR) || retry);
+ while (rl < 0 && errno == EINTR);
if (rl <= 0)
break;
Robert
--
next prev parent reply other threads:[~2022-09-09 8:47 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-27 14:23 bug#50849: 28.0.50; Proposal for Emacs daemon to signal when being busy Jean Louis
2021-09-27 15:27 ` Eli Zaretskii
2021-09-28 5:56 ` Lars Ingebrigtsen
2021-09-28 7:08 ` Eli Zaretskii
2022-09-02 11:09 ` Lars Ingebrigtsen
2022-09-02 11:21 ` Eli Zaretskii
2022-09-02 12:28 ` Lars Ingebrigtsen
2022-09-02 12:39 ` Eli Zaretskii
2022-09-02 12:44 ` Robert Pluim
2022-09-02 13:02 ` Lars Ingebrigtsen
2022-09-02 13:54 ` Visuwesh
2022-09-02 14:02 ` Eli Zaretskii
2022-09-03 9:48 ` Lars Ingebrigtsen
2022-09-03 15:40 ` Stefan Kangas
2022-09-03 15:57 ` Eli Zaretskii
2022-09-04 10:59 ` Lars Ingebrigtsen
2022-09-05 13:56 ` Stefan Kangas
2022-09-05 19:07 ` Lars Ingebrigtsen
2022-09-06 0:19 ` Stefan Kangas
2022-09-06 2:31 ` Eli Zaretskii
2022-09-06 3:33 ` Visuwesh
2022-09-06 12:22 ` Eli Zaretskii
2022-09-06 14:02 ` Robert Pluim
2022-09-06 14:12 ` Eli Zaretskii
2022-09-06 14:20 ` Robert Pluim
2022-09-07 1:05 ` Stefan Kangas
2022-09-07 2:39 ` Eli Zaretskii
2022-09-07 8:18 ` Stefan Kangas
2022-09-07 10:34 ` Robert Pluim
2022-09-07 11:19 ` Eli Zaretskii
2022-09-08 1:47 ` Stefan Kangas
2022-09-08 5:59 ` Eli Zaretskii
2022-09-08 12:07 ` Lars Ingebrigtsen
2022-09-08 13:42 ` Eli Zaretskii
2022-09-08 13:46 ` Lars Ingebrigtsen
2022-09-08 14:05 ` Eli Zaretskii
2022-09-08 14:11 ` Lars Ingebrigtsen
2022-09-08 14:15 ` Eli Zaretskii
2022-09-08 14:19 ` Robert Pluim
2022-09-08 16:02 ` Eli Zaretskii
2022-09-09 8:47 ` Robert Pluim [this message]
2022-09-09 9:29 ` Stefan Kangas
2022-09-09 9:35 ` Robert Pluim
2022-09-09 9:38 ` Stefan Kangas
2022-09-09 11:31 ` Eli Zaretskii
2022-09-06 8:20 ` Robert Pluim
2022-09-06 8:52 ` Lars Ingebrigtsen
2022-09-03 1:07 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-09-03 9:49 ` Lars Ingebrigtsen
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=87czc57x44.fsf@gmail.com \
--to=rpluim@gmail.com \
--cc=50849@debbugs.gnu.org \
--cc=bugs@gnu.support \
--cc=eliz@gnu.org \
--cc=larsi@gnus.org \
--cc=stefankangas@gmail.com \
--cc=visuweshm@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).