public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jon Turney <jturney@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin/main] Cygwin: Add a timeout to ensure we don't wait forever for dumper
Date: Thu, 25 Jan 2024 14:33:04 +0000 (GMT)	[thread overview]
Message-ID: <20240125143304.E303C3858D28@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=1c13ca67b506df56c512d1a706eb6f45d9b4da38

commit 1c13ca67b506df56c512d1a706eb6f45d9b4da38
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Tue Jan 23 16:07:34 2024 +0000

    Cygwin: Add a timeout to ensure we don't wait forever for dumper

Diff:
---
 winsup/cygwin/exceptions.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 0e1a804ca..a2a6f9d4c 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -540,6 +540,9 @@ int exec_prepared_command (PWCHAR command)
     }
   FreeEnvironmentStringsW (rawenv);
 
+  /* timeout from waiting for debugger to attach after 10 seconds */
+  ULONGLONG timeout = GetTickCount64() + 10*1000;
+
   console_printf ("*** starting '%W' for pid %u, tid %u\r\n",
 		  command,
 		  cygwin_pid (GetCurrentProcessId ()), GetCurrentThreadId ());
@@ -562,7 +565,8 @@ int exec_prepared_command (PWCHAR command)
      we continue or not.
 
      Note that this is still racy: if the error_start process does it's work too
-     fast, we don't notice that it attached and get stuck here.
+     fast, we don't notice that it attached and get stuck here.  So we also
+     apply a timeout to ensure we exit eventually.
   */
 
   *dbg_end = L'\0';
@@ -570,7 +574,7 @@ int exec_prepared_command (PWCHAR command)
     system_printf ("Failed to start, %E");
   else
     {
-      while (!being_debugged ())
+      while (!being_debugged () && GetTickCount64() < timeout)
 	Sleep (0);
       Sleep (2000);
     }

                 reply	other threads:[~2024-01-25 14:33 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20240125143304.E303C3858D28@sourceware.org \
    --to=jturney@sourceware.org \
    --cc=cygwin-cvs@sourceware.org \
    /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.
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).