From 087e161b3cd9a8626dc05ce1bdb8dfaf353a71b1 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 18 Jun 2020 21:28:23 +0100 Subject: [PATCH] Don't write to inferior_ptid in tracefile-tfile.c gdb/ChangeLog: 2020-06-18 Pedro Alves * tracefile-tfile.c (tfile_target_open): Don't write to inferior_ptid directly, instead switch to added thread. (tfile_target::close): Use switch_to_no_thread instead of writing to inferior_ptid directly. --- gdb/ChangeLog | 7 +++++++ gdb/tracefile-tfile.c | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2a082f277b8..4454a58ca67 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2020-06-18 Pedro Alves + + * tracefile-tfile.c (tfile_target_open): Don't write to + inferior_ptid directly, instead switch to added thread. + (tfile_target::close): Use switch_to_no_thread instead of writing + to inferior_ptid directly. + 2020-06-18 Pedro Alves * procfs.c (procfs_target::attach): Don't write to inferior_ptid. diff --git a/gdb/tracefile-tfile.c b/gdb/tracefile-tfile.c index ea191774751..fd7bab822a1 100644 --- a/gdb/tracefile-tfile.c +++ b/gdb/tracefile-tfile.c @@ -556,8 +556,9 @@ tfile_target_open (const char *arg, int from_tty) } inferior_appeared (current_inferior (), TFILE_PID); - inferior_ptid = ptid_t (TFILE_PID); - add_thread_silent (&tfile_ops, inferior_ptid); + + thread_info *thr = add_thread_silent (&tfile_ops, ptid_t (TFILE_PID)); + switch_to_thread (thr); if (ts->traceframe_count <= 0) warning (_("No traceframes present in this file.")); @@ -618,7 +619,7 @@ tfile_target::close () { gdb_assert (trace_fd != -1); - inferior_ptid = null_ptid; /* Avoid confusion from thread stuff. */ + switch_to_no_thread (); /* Avoid confusion from thread stuff. */ exit_inferior_silent (current_inferior ()); ::close (trace_fd); -- 2.30.2