diff options
| -rw-r--r-- | gdb/ChangeLog | 20 | ||||
| -rw-r--r-- | gdb/fork-child.c | 2 | ||||
| -rw-r--r-- | gdb/gdbthread.h | 6 | ||||
| -rw-r--r-- | gdb/infrun.c | 24 | ||||
| -rw-r--r-- | gdb/linux-nat.c | 8 | ||||
| -rw-r--r-- | gdb/record-btrace.c | 2 | ||||
| -rw-r--r-- | gdb/record-full.c | 4 | ||||
| -rw-r--r-- | gdb/remote.c | 4 | ||||
| -rw-r--r-- | gdb/target.c | 2 | ||||
| -rw-r--r-- | gdb/thread.c | 8 |
10 files changed, 50 insertions, 30 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f9ef0e1..504961b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,23 @@ +2020-02-03 Simon Marchi <simon.marchi@efficios.com> + + * fork-child.c (gdb_startup_inferior): Use bool instead of int. + * gdbthread.h (class thread_info) <resumed>: Likewise. + * infrun.c (resume_1): Likewise. + (proceed): Likewise. + (infrun_thread_stop_requested): Likewise. + (stop_all_threads): Likewise. + (handle_inferior_event): Likewise. + (restart_threads): Likewise. + (finish_step_over): Likewise. + (keep_going_stepped_thread): Likewise. + * linux-nat.c (attach_proc_task_lwp_callback): Likewise. + (linux_handle_extended_wait): Likewise. + * record-btrace.c (get_thread_current_frame_id): Likewise. + * record-full.c (record_full_wait_1): Likewise. + * remote.c (remote_target::process_initial_stop_replies): Likewise. + * target.c (target_resume): Likewise. + * thread.c (set_running_thread): Likewise. + 2020-02-03 Alok Kumar Sharma <AlokKumar.Sharma@amd.com> * f-valprint.c (f77_print_array_1): Changed datatype of index diff --git a/gdb/fork-child.c b/gdb/fork-child.c index 010414c..41d5e2a 100644 --- a/gdb/fork-child.c +++ b/gdb/fork-child.c @@ -134,7 +134,7 @@ gdb_startup_inferior (pid_t pid, int num_traps) ptid_t ptid = startup_inferior (proc_target, pid, num_traps, NULL, NULL); /* Mark all threads non-executing. */ - set_executing (proc_target, ptid, 0); + set_executing (proc_target, ptid, false); return ptid; } diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h index f205e29..717a2ad 100644 --- a/gdb/gdbthread.h +++ b/gdb/gdbthread.h @@ -301,20 +301,20 @@ public: if the thread does not have a user-given name. */ char *name = NULL; - /* Non-zero means the thread is executing. Note: this is different + /* True means the thread is executing. Note: this is different from saying that there is an active target and we are stopped at a breakpoint, for instance. This is a real indicator whether the thread is off and running. */ bool executing = false; - /* Non-zero if this thread is resumed from infrun's perspective. + /* True if this thread is resumed from infrun's perspective. Note that a thread can be marked both as not-executing and resumed at the same time. This happens if we try to resume a thread that has a wait status pending. We shouldn't let the thread really run until that wait status has been processed, but we should not process that wait status if we didn't try to let the thread run. */ - int resumed = 0; + bool resumed = false; /* Frontend view of the thread state. Note that the THREAD_RUNNING/ THREAD_STOPPED states are different from EXECUTING. When the diff --git a/gdb/infrun.c b/gdb/infrun.c index c8369cb..3e846f8 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -2282,7 +2282,7 @@ resume_1 (enum gdb_signal sig) } tp->inf->process_target ()->threads_executing = true; - tp->resumed = 1; + tp->resumed = true; /* FIXME: What should we do if we are supposed to resume this thread with a signal? Maybe we should maintain a queue of @@ -2410,7 +2410,7 @@ resume_1 (enum gdb_signal sig) resume_ptid = internal_resume_ptid (user_step); do_target_resume (resume_ptid, 0, GDB_SIGNAL_0); - tp->resumed = 1; + tp->resumed = true; return; } } @@ -2622,7 +2622,7 @@ resume_1 (enum gdb_signal sig) } do_target_resume (resume_ptid, step, sig); - tp->resumed = 1; + tp->resumed = true; } /* Resume the inferior. SIG is the signal to give the inferior @@ -3022,7 +3022,7 @@ proceed (CORE_ADDR addr, enum gdb_signal siggnal) inferior function, as in that case we pretend the inferior doesn't run at all. */ if (!cur_thr->control.in_infcall) - set_running (resume_target, resume_ptid, 1); + set_running (resume_target, resume_ptid, true); if (debug_infrun) fprintf_unfiltered (gdb_stdlog, @@ -3306,7 +3306,7 @@ infrun_thread_stop_requested (ptid_t ptid) /* Otherwise we can process the (new) pending event now. Set it so this pending event is considered by do_target_wait. */ - tp->resumed = 1; + tp->resumed = true; } } @@ -4749,7 +4749,7 @@ stop_all_threads (void) /* The thread may be not executing, but still be resumed with a pending status to process. */ - t->resumed = 0; + t->resumed = false; } } @@ -4788,7 +4788,7 @@ stop_all_threads (void) t->stop_requested = 0; t->executing = 0; - t->resumed = 0; + t->resumed = false; t->control.may_range_step = 0; /* This may be the first time we see the inferior report @@ -5126,10 +5126,10 @@ handle_inferior_event (struct execution_control_state *ecs) else mark_ptid = ecs->ptid; - set_executing (ecs->target, mark_ptid, 0); + set_executing (ecs->target, mark_ptid, false); /* Likewise the resumed flag. */ - set_resumed (ecs->target, mark_ptid, 0); + set_resumed (ecs->target, mark_ptid, false); } switch (ecs->ws.kind) @@ -5623,7 +5623,7 @@ restart_threads (struct thread_info *event_thread) "infrun: restart threads: " "[%s] has pending status\n", target_pid_to_str (tp->ptid).c_str ()); - tp->resumed = 1; + tp->resumed = true; continue; } @@ -5763,7 +5763,7 @@ finish_step_over (struct execution_control_state *ecs) /* This was cleared early, by handle_inferior_event. Set it so this pending event is considered by do_target_wait. */ - tp->resumed = 1; + tp->resumed = true; gdb_assert (!tp->executing); @@ -7424,7 +7424,7 @@ keep_going_stepped_thread (struct thread_info *tp) get_frame_address_space (frame), tp->suspend.stop_pc); - tp->resumed = 1; + tp->resumed = true; resume_ptid = internal_resume_ptid (tp->control.stepping_command); do_target_resume (resume_ptid, 0, GDB_SIGNAL_0); } diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index e7533a9..230ae36 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -1166,8 +1166,8 @@ attach_proc_task_lwp_callback (ptid_t ptid) matching libthread_db is not found (or the process uses raw clone). */ add_thread (linux_target, lp->ptid); - set_running (linux_target, lp->ptid, 1); - set_executing (linux_target, lp->ptid, 1); + set_running (linux_target, lp->ptid, true); + set_executing (linux_target, lp->ptid, true); } return 1; @@ -2038,8 +2038,8 @@ linux_handle_extended_wait (struct lwp_info *lp, int status) internal to this module, from the perspective of infrun and the user/frontend, this new thread is running until it next reports a stop. */ - set_running (linux_target, new_lp->ptid, 1); - set_executing (linux_target, new_lp->ptid, 1); + set_running (linux_target, new_lp->ptid, true); + set_executing (linux_target, new_lp->ptid, true); if (WSTOPSIG (status) != SIGSTOP) { diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index 619ecde..ef23a0b 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -1958,7 +1958,7 @@ static struct frame_id get_thread_current_frame_id (struct thread_info *tp) { struct frame_id id; - int executing; + bool executing; /* Set current thread, which is implicitly used by get_current_frame. */ diff --git a/gdb/record-full.c b/gdb/record-full.c index 1696622..51b7bea 100644 --- a/gdb/record-full.c +++ b/gdb/record-full.c @@ -1267,12 +1267,12 @@ record_full_wait_1 (struct target_ops *ops, /* Try to insert the software single step breakpoint. If insert success, set step to 0. */ - set_executing (proc_target, inferior_ptid, 0); + set_executing (proc_target, inferior_ptid, false); reinit_frame_cache (); step = !insert_single_step_breakpoints (gdbarch); - set_executing (proc_target, inferior_ptid, 1); + set_executing (proc_target, inferior_ptid, true); } if (record_debug) diff --git a/gdb/remote.c b/gdb/remote.c index be29877..dafdfa8 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -4449,8 +4449,8 @@ remote_target::process_initial_stop_replies (int from_tty) || ws.value.sig != GDB_SIGNAL_0) evthread->suspend.waitstatus_pending_p = 1; - set_executing (this, event_ptid, 0); - set_running (this, event_ptid, 0); + set_executing (this, event_ptid, false); + set_running (this, event_ptid, false); get_remote_thread_info (evthread)->vcont_resumed = 0; } diff --git a/gdb/target.c b/gdb/target.c index b24d3d8..470ef51 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -2127,7 +2127,7 @@ target_resume (ptid_t ptid, int step, enum gdb_signal signal) /* We only set the internal executing state here. The user/frontend running state is set at a higher level. This also clears the thread's stop_pc as side effect. */ - set_executing (curr_target, ptid, 1); + set_executing (curr_target, ptid, true); clear_inline_frame_state (curr_target, ptid); } diff --git a/gdb/thread.c b/gdb/thread.c index 302a49e..54b59e2 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -823,13 +823,13 @@ set_resumed (process_stratum_target *targ, ptid_t ptid, bool resumed) /* Helper for set_running, that marks one thread either running or stopped. */ -static int -set_running_thread (struct thread_info *tp, int running) +static bool +set_running_thread (struct thread_info *tp, bool running) { - int started = 0; + bool started = false; if (running && tp->state == THREAD_STOPPED) - started = 1; + started = true; tp->state = running ? THREAD_RUNNING : THREAD_STOPPED; if (!running) |