Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

i#4719 qemu: Add -ignore_takeover_timeout #4725

Merged
merged 1 commit into from
Feb 9, 2021
Merged

i#4719 qemu: Add -ignore_takeover_timeout #4725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions core/optionsx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3200,6 +3200,8 @@ OPTION(bool, multi_thread_exit,
"do not guarantee that process exit event callback is invoked single-threaded")
OPTION(bool, skip_thread_exit_at_exit, "skip thread exit events at process exit")
#endif
OPTION(bool, ignore_takeover_timeout,
"ignore timeouts trying to take over one or more threads when initializing")

#ifdef EXPOSE_INTERNAL_OPTIONS
OPTION_NAME(bool, optimize, " synthethic", "set if ANY opts are on")
Expand Down
23 changes: 21 additions & 2 deletions core/unix/os.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10056,7 +10056,7 @@ os_take_over_all_unknown_threads(dcontext_t *dcontext)
uint i;
uint num_threads;
thread_id_t *tids;
uint threads_to_signal = 0;
uint threads_to_signal = 0, threads_timed_out = 0;

/* We do not want to re-takeover a thread that's in between notifying us on
* the last call to this routine and getting onto the all_threads list as
Expand Down Expand Up @@ -10155,6 +10155,8 @@ os_take_over_all_unknown_threads(dcontext_t *dcontext)
get_application_pid());
}
static const int wait_ms = 25;
static const int max_attempts = 16;
int attempts = 0;
while (!wait_for_event(records[i].event, wait_ms)) {
/* The thread may have exited (i#2601). We assume no tid re-use. */
char task[64];
Expand All @@ -10164,6 +10166,22 @@ os_take_over_all_unknown_threads(dcontext_t *dcontext)
SYSLOG_INTERNAL_WARNING_ONCE("thread exited while attaching");
break;
}
if (++attempts > max_attempts) {
if (DYNAMO_OPTION(ignore_takeover_timeout)) {
SYSLOG(SYSLOG_VERBOSE, THREAD_TAKEOVER_TIMED_OUT, 3,
get_application_name(), get_application_pid(),
"Continuing since -ignore_takeover_timeout is set.");
++threads_timed_out;
} else {
SYSLOG(SYSLOG_VERBOSE, THREAD_TAKEOVER_TIMED_OUT, 3,
get_application_name(), get_application_pid(),
"Aborting. Use -ignore_takeover_timeout to ignore.");
REPORT_FATAL_ERROR_AND_EXIT(FAILED_TO_TAKE_OVER_THREADS, 2,
get_application_name(),
get_application_pid());
}
break;
}
/* Else try again. */
}
}
Expand All @@ -10187,7 +10205,8 @@ os_take_over_all_unknown_threads(dcontext_t *dcontext)
d_r_mutex_unlock(&thread_initexit_lock);
HEAP_ARRAY_FREE(dcontext, tids, thread_id_t, num_threads, ACCT_THREAD_MGT, PROTECTED);

return threads_to_signal > 0;
ASSERT(threads_to_signal >= threads_timed_out);
return (threads_to_signal - threads_timed_out) > 0;
}

bool
Expand Down
8 changes: 8 additions & 0 deletions core/win32/events.mc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,14 @@ Language=English
Application %1!s! (%2!s!). Failed to take over all threads after multiple attempts.
.

MessageId =
Severity = Error
Facility = DRCore
SymbolicName = MSG_THREAD_TAKEOVER_TIMED_OUT
Language=English
Application %1!s! (%2!s!). Timed out attempting to take over one or more threads. %3!s!
.

;#ifdef UNIX
MessageId =
Severity = Error
Expand Down