-/* Copyright (C) 1992-2019 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2021 Free Software Foundation, Inc.
This file is part of GDB.
#include "gdbthread.h"
#include "progspace.h"
#include "objfiles.h"
+#include "cli/cli-style.h"
static int ada_build_task_list ();
};
/* A short description corresponding to each possible task state. */
-static const char *task_states[] = {
+static const char * const task_states[] = {
N_("Unactivated"),
N_("Runnable"),
N_("Terminated"),
};
/* A longer description corresponding to each possible task state. */
-static const char *long_task_states[] = {
+static const char * const long_task_states[] = {
N_("Unactivated"),
N_("Runnable"),
N_("Terminated"),
/* The index of various fields in the ATCB record and sub-records. */
struct atcb_fieldnos atcb_fieldno {};
+
+ /* On some systems, gdbserver applies an offset to the CPU that is
+ reported. */
+ unsigned int cpu_id_offset = 0;
};
/* Key to our per-program-space data. */
the list of Ada tasks. The value of this field influences
the interpretation of the known_tasks_addr field below:
- ADA_TASKS_UNKNOWN: The value of known_tasks_addr hasn't
- been determined yet;
+ been determined yet;
- ADA_TASKS_NOT_FOUND: The program probably does not use tasking
- and the known_tasks_addr is irrelevant;
+ and the known_tasks_addr is irrelevant;
- ADA_TASKS_ARRAY: The known_tasks is an array;
- ADA_TASKS_LIST: The known_tasks is a list. */
enum ada_known_tasks_kind known_tasks_kind = ADA_TASKS_UNKNOWN;
static const struct inferior_key<ada_tasks_inferior_data>
ada_tasks_inferior_data_handle;
+/* Return a string with TASKNO followed by the task name if TASK_INFO
+ contains a name. */
+
+static std::string
+task_to_str (int taskno, const ada_task_info *task_info)
+{
+ if (task_info->name[0] == '\0')
+ return string_printf ("%d", taskno);
+ else
+ return string_printf ("%d \"%s\"", taskno, task_info->name);
+}
+
/* Return the ada-tasks module's data for the given program space (PSPACE).
If none is found, add a zero'ed one now.
for (int i = 0; i < data->task_list.size (); i++)
{
if (data->task_list[i].task_id == task_id)
- return i + 1;
+ return i + 1;
}
/* Task not found. Return 0. */
task state. */
static int
-ada_task_is_alive (struct ada_task_info *task_info)
+ada_task_is_alive (const struct ada_task_info *task_info)
{
return (task_info->state != Terminated);
}
terminated yet. */
void
-iterate_over_live_ada_tasks (ada_task_list_iterator_ftype *iterator)
+iterate_over_live_ada_tasks (ada_task_list_iterator_ftype iterator)
{
struct ada_tasks_inferior_data *data;
for (ada_task_info &task : data->task_list)
{
if (!ada_task_is_alive (&task))
- continue;
+ continue;
iterator (&task);
}
}
array_fieldno = ada_get_field_index (type, "P_ARRAY", 0);
bounds_fieldno = ada_get_field_index (type, "P_BOUNDS", 0);
- bounds_type = TYPE_FIELD_TYPE (type, bounds_fieldno);
- if (TYPE_CODE (bounds_type) == TYPE_CODE_PTR)
- bounds_type = TYPE_TARGET_TYPE (bounds_type);
- if (TYPE_CODE (bounds_type) != TYPE_CODE_STRUCT)
- error (_("Unknown task name format. Aborting"));
+ bounds_type = type->field (bounds_fieldno).type ();
+ if (bounds_type->code () == TYPE_CODE_PTR)
+ bounds_type = TYPE_TARGET_TYPE (bounds_type);
+ if (bounds_type->code () != TYPE_CODE_STRUCT)
+ error (_("Unknown task name format. Aborting"));
upper_bound_fieldno = ada_get_field_index (bounds_type, "UB0", 0);
initialize_fieldnos = 0;
if (atcb_sym == NULL || atcb_sym->type == NULL)
{
/* In Ravenscar run-time libs, the ATCB does not have a dynamic
- size, so the symbol name differs. */
+ size, so the symbol name differs. */
atcb_sym = lookup_symbol_in_language (atcb_name_fixed, NULL,
STRUCT_DOMAIN, language_c,
NULL).symbol;
if (atcb_sym == NULL || atcb_sym->type == NULL)
- return _("Cannot find Ada_Task_Control_Block type");
+ return _("Cannot find Ada_Task_Control_Block type");
type = atcb_sym->type;
}
else
{
/* Get a static representation of the type record
- Ada_Task_Control_Block. */
+ Ada_Task_Control_Block. */
type = atcb_sym->type;
type = ada_template_to_fixed_record_type_1 (type, NULL, 0, NULL, 0);
}
fieldnos.image = ada_get_field_index (common_type, "task_image", 1);
fieldnos.image_len = ada_get_field_index (common_type, "task_image_len", 1);
fieldnos.activation_link = ada_get_field_index (common_type,
- "activation_link", 1);
+ "activation_link", 1);
fieldnos.call = ada_get_field_index (common_type, "call", 1);
fieldnos.ll = ada_get_field_index (common_type, "ll", 0);
fieldnos.base_cpu = ada_get_field_index (common_type, "base_cpu", 0);
if (fieldnos.ll_lwp < 0)
fieldnos.ll_lwp = ada_get_field_index (ll_type, "thread_id", 1);
+ /* Check for the CPU offset. */
+ bound_minimal_symbol first_id_sym
+ = lookup_bound_minimal_symbol ("__gnat_gdb_cpu_first_id");
+ unsigned int first_id = 0;
+ if (first_id_sym.minsym != nullptr)
+ {
+ CORE_ADDR addr = BMSYMBOL_VALUE_ADDRESS (first_id_sym);
+ /* This symbol always has type uint32_t. */
+ struct type *u32type = builtin_type (target_gdbarch ())->builtin_uint32;
+ first_id = value_as_long (value_at (u32type, addr));
+ }
+
/* Set all the out parameters all at once, now that we are certain
that there are no potential error() anymore. */
pspace_data = get_ada_tasks_pspace_data (current_program_space);
pspace_data->atcb_ll_type = ll_type;
pspace_data->atcb_call_type = call_type;
pspace_data->atcb_fieldno = fieldnos;
+ pspace_data->cpu_id_offset = first_id;
return NULL;
}
}
/* Read the ATCB data of a given task given its TASK_ID (which is in practice
- the address of its assocated ATCB record), and store the result inside
+ the address of its associated ATCB record), and store the result inside
TASK_INFO. */
static void
if (pspace_data->atcb_fieldno.image_len == -1)
{
if (pspace_data->atcb_fieldno.image >= 0)
- read_fat_string_value (task_info->name,
- value_field (common_value,
+ read_fat_string_value (task_info->name,
+ value_field (common_value,
pspace_data->atcb_fieldno.image),
- sizeof (task_info->name) - 1);
+ sizeof (task_info->name) - 1);
else
{
struct bound_minimal_symbol msym;
msym = lookup_minimal_symbol_by_pc (task_id);
if (msym.minsym)
{
- const char *full_name = MSYMBOL_LINKAGE_NAME (msym.minsym);
+ const char *full_name = msym.minsym->linkage_name ();
const char *task_name = full_name;
const char *p;
task_name = p + 2;
/* Copy the task name. */
- strncpy (task_info->name, task_name, sizeof (task_info->name));
+ strncpy (task_info->name, task_name,
+ sizeof (task_info->name) - 1);
task_info->name[sizeof (task_info->name) - 1] = 0;
}
else
pspace_data->atcb_fieldno.image_len));
value_as_string (task_info->name,
- value_field (common_value,
+ value_field (common_value,
pspace_data->atcb_fieldno.image),
len);
}
&& pspace_data->atcb_fieldno.entry_calls > 0)
{
/* Let My_ATCB be the Ada task control block of a task calling the
- entry of another task; then the Task_Id of the called task is
- in My_ATCB.Entry_Calls (My_ATCB.ATC_Nesting_Level).Called_Task. */
+ entry of another task; then the Task_Id of the called task is
+ in My_ATCB.Entry_Calls (My_ATCB.ATC_Nesting_Level).Called_Task. */
atc_nesting_level_value =
- value_field (tcb_value, pspace_data->atcb_fieldno.atc_nesting_level);
+ value_field (tcb_value, pspace_data->atcb_fieldno.atc_nesting_level);
entry_calls_value =
- ada_coerce_to_simple_array_ptr
+ ada_coerce_to_simple_array_ptr
(value_field (tcb_value, pspace_data->atcb_fieldno.entry_calls));
entry_calls_value_element =
- value_subscript (entry_calls_value,
+ value_subscript (entry_calls_value,
value_as_long (atc_nesting_level_value));
called_task_fieldno =
- ada_get_field_index (value_type (entry_calls_value_element),
- "called_task", 0);
+ ada_get_field_index (value_type (entry_calls_value_element),
+ "called_task", 0);
task_info->called_task =
- value_as_address (value_field (entry_calls_value_element,
- called_task_fieldno));
+ value_as_address (value_field (entry_calls_value_element,
+ called_task_fieldno));
}
- /* If the ATCB cotnains some information about RV callers, then
+ /* If the ATCB contains some information about RV callers, then
compute the "caller_task". Otherwise, leave it as zero. */
if (pspace_data->atcb_fieldno.call >= 0)
{
/* Get the ID of the caller task from Common_ATCB.Call.all.Self.
- If Common_ATCB.Call is null, then there is no caller. */
+ If Common_ATCB.Call is null, then there is no caller. */
const CORE_ADDR call =
- value_as_address (value_field (common_value,
+ value_as_address (value_field (common_value,
pspace_data->atcb_fieldno.call));
struct value *call_val;
if (call != 0)
- {
- call_val =
- value_from_contents_and_address (pspace_data->atcb_call_type,
+ {
+ call_val =
+ value_from_contents_and_address (pspace_data->atcb_call_type,
NULL, call);
- task_info->caller_task =
- value_as_address
+ task_info->caller_task =
+ value_as_address
(value_field (call_val, pspace_data->atcb_fieldno.call_self));
- }
+ }
}
task_info->base_cpu
- = value_as_long (value_field (common_value,
- pspace_data->atcb_fieldno.base_cpu));
+ = (pspace_data->cpu_id_offset
+ + value_as_long (value_field (common_value,
+ pspace_data->atcb_fieldno.base_cpu)));
/* And finally, compute the task ptid. Note that there is not point
in computing it if the task is no longer alive, in which case
for (i = 0; i < data->known_tasks_length; i++)
{
CORE_ADDR task_id =
- extract_typed_address (known_tasks + i * target_ptr_byte,
+ extract_typed_address (known_tasks + i * target_ptr_byte,
data->known_tasks_element);
if (task_id != 0)
- add_ada_task (task_id, current_inferior ());
+ add_ada_task (task_id, current_inferior ());
}
return true;
common_value = value_field (tcb_value, pspace_data->atcb_fieldno.common);
task_id = value_as_address
(value_field (common_value,
- pspace_data->atcb_fieldno.activation_link));
+ pspace_data->atcb_fieldno.activation_link));
}
return true;
struct type *eltype = NULL;
struct type *idxtype = NULL;
- if (TYPE_CODE (type) == TYPE_CODE_ARRAY)
+ if (type->code () == TYPE_CODE_ARRAY)
eltype = check_typedef (TYPE_TARGET_TYPE (type));
if (eltype != NULL
- && TYPE_CODE (eltype) == TYPE_CODE_PTR)
- idxtype = check_typedef (TYPE_INDEX_TYPE (type));
+ && eltype->code () == TYPE_CODE_PTR)
+ idxtype = check_typedef (type->index_type ());
if (idxtype != NULL
- && !TYPE_LOW_BOUND_UNDEFINED (idxtype)
- && !TYPE_HIGH_BOUND_UNDEFINED (idxtype))
+ && idxtype->bounds ()->low.kind () != PROP_UNDEFINED
+ && idxtype->bounds ()->high.kind () != PROP_UNDEFINED)
{
data->known_tasks_element = eltype;
data->known_tasks_length =
- TYPE_HIGH_BOUND (idxtype) - TYPE_LOW_BOUND (idxtype) + 1;
+ (idxtype->bounds ()->high.const_val ()
+ - idxtype->bounds ()->low.const_val () + 1);
return;
}
}
/* Validate. */
struct type *type = check_typedef (SYMBOL_TYPE (sym));
- if (TYPE_CODE (type) == TYPE_CODE_PTR)
+ if (type->code () == TYPE_CODE_PTR)
{
data->known_tasks_element = type;
return;
{
struct ada_tasks_inferior_data *data;
- if (!target_has_stack)
+ if (!target_has_stack ())
error (_("Cannot inspect Ada tasks when program is not running"));
data = get_ada_tasks_inferior_data (current_inferior ());
ui_out_emit_table table_emitter (uiout, nb_columns, nb_tasks, "tasks");
uiout->table_header (1, ui_left, "current", "");
uiout->table_header (3, ui_right, "id", "ID");
- uiout->table_header (9, ui_right, "task-id", "TID");
+ {
+ size_t tid_width = 9;
+ /* Grown below in case the largest entry is bigger. */
+
+ if (!uiout->is_mi_like_p ())
+ {
+ for (taskno = 1; taskno <= data->task_list.size (); taskno++)
+ {
+ const struct ada_task_info *const task_info
+ = &data->task_list[taskno - 1];
+
+ gdb_assert (task_info != NULL);
+
+ tid_width = std::max (tid_width,
+ 1 + strlen (phex_nz (task_info->task_id,
+ sizeof (CORE_ADDR))));
+ }
+ }
+ uiout->table_header (tid_width, ui_right, "task-id", "TID");
+ }
/* The following column is provided in GDB/MI mode only because
it is only really useful in that mode, and also because it
allows us to keep the CLI output shorter and more compact. */
to one task only, and this is not the task, skip
to the next one. */
if (taskno_arg && taskno != taskno_arg)
- continue;
+ continue;
ui_out_emit_tuple tuple_emitter (uiout, NULL);
/* Print a star if this task is the current task (or the task
- currently selected). */
+ currently selected). */
if (task_info->ptid == inferior_ptid)
uiout->field_string ("current", "*");
else
uiout->field_skip ("current");
/* Print the task number. */
- uiout->field_int ("id", taskno);
+ uiout->field_signed ("id", taskno);
/* Print the Task ID. */
- uiout->field_fmt ("task-id", "%9lx", (long) task_info->task_id);
+ uiout->field_string ("task-id", phex_nz (task_info->task_id,
+ sizeof (CORE_ADDR)));
/* Print the associated Thread ID. */
if (uiout->is_mi_like_p ())
- {
- thread_info *thread = find_thread_ptid (task_info->ptid);
+ {
+ thread_info *thread = (ada_task_is_alive (task_info)
+ ? find_thread_ptid (inf, task_info->ptid)
+ : nullptr);
if (thread != NULL)
- uiout->field_int ("thread-id", thread->global_num);
+ uiout->field_signed ("thread-id", thread->global_num);
else
- /* This should never happen unless there is a bug somewhere,
- but be resilient when that happens. */
- uiout->field_skip ("thread-id");
+ {
+ /* This can happen if the thread is no longer alive. */
+ uiout->field_skip ("thread-id");
+ }
}
/* Print the ID of the parent task. */
parent_id = get_task_number_from_id (task_info->parent, inf);
if (parent_id)
- uiout->field_int ("parent-id", parent_id);
+ uiout->field_signed ("parent-id", parent_id);
else
- uiout->field_skip ("parent-id");
+ uiout->field_skip ("parent-id");
/* Print the base priority of the task. */
- uiout->field_int ("priority", task_info->priority);
+ uiout->field_signed ("priority", task_info->priority);
/* Print the task current state. */
if (task_info->caller_task)
else
uiout->field_string ("state", task_states[task_info->state]);
- /* Finally, print the task name. */
+ /* Finally, print the task name, without quotes around it, as mi like
+ is not expecting quotes, and in non mi-like no need for quotes
+ as there is a specific column for the name. */
uiout->field_fmt ("name",
+ (task_info->name[0] != '\0'
+ ? ui_file_style ()
+ : metadata_style.style ()),
"%s",
- task_info->name[0] != '\0' ? task_info->name
- : _("<no name>"));
+ (task_info->name[0] != '\0'
+ ? task_info->name
+ : _("<no name>")));
uiout->text ("\n");
}
if (taskno <= 0 || taskno > data->task_list.size ())
error (_("Task ID %d not known. Use the \"info tasks\" command to\n"
- "see the IDs of currently known tasks"), taskno);
+ "see the IDs of currently known tasks"), taskno);
task_info = &data->task_list[taskno - 1];
/* Print the Ada task ID. */
if (task_info->name[0] != '\0')
printf_filtered (_("Name: %s\n"), task_info->name);
else
- printf_filtered (_("<no name>\n"));
+ fprintf_styled (gdb_stdout, metadata_style.style (), _("<no name>\n"));
/* Print the TID and LWP. */
printf_filtered (_("Thread: %#lx\n"), task_info->ptid.tid ());
printf_filtered (_("Parent: %d"), parent_taskno);
if (parent->name[0] != '\0')
- printf_filtered (" (%s)", parent->name);
+ printf_filtered (" (%s)", parent->name);
printf_filtered ("\n");
}
else
if (task_info->caller_task)
{
- target_taskno = get_task_number_from_id (task_info->caller_task, inf);
- printf_filtered (_("State: Accepting rendezvous with %d"),
- target_taskno);
+ target_taskno = get_task_number_from_id (task_info->caller_task, inf);
+ printf_filtered (_("State: Accepting rendezvous with %d"),
+ target_taskno);
}
else if (task_info->called_task)
{
- target_taskno = get_task_number_from_id (task_info->called_task, inf);
- printf_filtered (_("State: Waiting on task %d's entry"),
- target_taskno);
+ target_taskno = get_task_number_from_id (task_info->called_task, inf);
+ printf_filtered (_("State: Waiting on task %d's entry"),
+ target_taskno);
}
else
printf_filtered (_("State: %s"), _(long_task_states[task_info->state]));
if (target_taskno)
{
- ada_task_info *target_task_info = &data->task_list[target_taskno - 1];
+ ada_task_info *target_task_info = &data->task_list[target_taskno - 1];
- if (target_task_info->name[0] != '\0')
- printf_filtered (" (%s)", target_task_info->name);
+ if (target_task_info->name[0] != '\0')
+ printf_filtered (" (%s)", target_task_info->name);
}
printf_filtered ("\n");
if (current_task == 0)
printf_filtered (_("[Current task is unknown]\n"));
else
- printf_filtered (_("[Current task is %d]\n"), current_task);
+ {
+ struct ada_tasks_inferior_data *data
+ = get_ada_tasks_inferior_data (current_inferior ());
+ struct ada_task_info *task_info = &data->task_list[current_task - 1];
+
+ printf_filtered (_("[Current task is %s]\n"),
+ task_to_str (current_task, task_info).c_str ());
+ }
}
/* Parse and evaluate TIDSTR into a task id, and try to switch to
if (taskno <= 0 || taskno > data->task_list.size ())
error (_("Task ID %d not known. Use the \"info tasks\" command to\n"
- "see the IDs of currently known tasks"), taskno);
+ "see the IDs of currently known tasks"), taskno);
task_info = &data->task_list[taskno - 1];
if (!ada_task_is_alive (task_info))
- error (_("Cannot switch to task %d: Task is no longer running"), taskno);
+ error (_("Cannot switch to task %s: Task is no longer running"),
+ task_to_str (taskno, task_info).c_str ());
/* On some platforms, the thread list is not updated until the user
performs a thread-related operation (by using the "info threads"
computed if target_get_ada_task_ptid has not been implemented for
our target (yet). Rather than cause an assertion error in that case,
it's nicer for the user to just refuse to perform the task switch. */
- thread_info *tp = find_thread_ptid (task_info->ptid);
+ thread_info *tp = find_thread_ptid (inf, task_info->ptid);
if (tp == NULL)
- error (_("Unable to compute thread ID for task %d.\n"
- "Cannot switch to this task."),
- taskno);
+ error (_("Unable to compute thread ID for task %s.\n"
+ "Cannot switch to this task."),
+ task_to_str (taskno, task_info).c_str ());
switch_to_thread (tp);
ada_find_printable_frame (get_selected_frame (NULL));
- printf_filtered (_("[Switching to task %d]\n"), taskno);
+ printf_filtered (_("[Switching to task %s]\n"),
+ task_to_str (taskno, task_info).c_str ());
print_stack_frame (get_selected_frame (NULL),
- frame_relative_level (get_selected_frame (NULL)),
+ frame_relative_level (get_selected_frame (NULL)),
SRC_AND_LOC, 1);
}
{
/* All objfiles are being cleared, so we should clear all
our caches for all program spaces. */
- struct program_space *pspace;
-
- for (pspace = program_spaces; pspace != NULL; pspace = pspace->next)
- ada_tasks_invalidate_pspace_data (pspace);
+ for (struct program_space *pspace : program_spaces)
+ ada_tasks_invalidate_pspace_data (pspace);
}
else
{
ada_tasks_invalidate_inferior_data (inf);
}
+void _initialize_tasks ();
void
-_initialize_tasks (void)
+_initialize_tasks ()
{
/* Attach various observers. */
- gdb::observers::normal_stop.attach (ada_tasks_normal_stop_observer);
- gdb::observers::new_objfile.attach (ada_tasks_new_objfile_observer);
+ gdb::observers::normal_stop.attach (ada_tasks_normal_stop_observer,
+ "ada-tasks");
+ gdb::observers::new_objfile.attach (ada_tasks_new_objfile_observer,
+ "ada-tasks");
/* Some new commands provided by this module. */
add_info ("tasks", info_tasks_command,
- _("Provide information about all known Ada tasks"));
+ _("Provide information about all known Ada tasks."));
add_cmd ("task", class_run, task_command,
- _("Use this command to switch between Ada tasks.\n\
-Without argument, this command simply prints the current task ID"),
- &cmdlist);
+ _("Use this command to switch between Ada tasks.\n\
+Without argument, this command simply prints the current task ID."),
+ &cmdlist);
}