/* Copyright (C) 1992, 1993, 1994, 1997, 1998, 1999, 2000, 2003, 2004, 2005,
- 2007, 2008, 2009 Free Software Foundation, Inc.
+ 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GDB.
#include "gdbcore.h"
#include "inferior.h"
#include "gdbthread.h"
+#include "progspace.h"
+#include "objfiles.h"
/* The name of the array in the GNAT runtime where the Ada Task Control
Block of each task is stored. */
#define KNOWN_TASKS_NAME "system__tasking__debug__known_tasks"
-/* The maximum number of tasks known to the Ada runtime */
+/* The maximum number of tasks known to the Ada runtime. */
static const int MAX_NUMBER_OF_KNOWN_TASKS = 1000;
+/* The name of the variable in the GNAT runtime where the head of a task
+ chain is saved. This is an alternate mechanism to find the list of known
+ tasks. */
+#define KNOWN_TASKS_LIST "system__tasking__debug__first_task"
+
enum task_states
{
Unactivated,
/* The index of certain important fields in the Ada Task Control Block
record and sub-records. */
-struct tcb_fieldnos
+struct atcb_fieldnos
{
/* Fields in record Ada_Task_Control_Block. */
int common;
int priority;
int image;
int image_len; /* This field may be missing. */
+ int activation_link;
int call;
int ll;
int call_self;
};
-/* The type description for the ATCB record and subrecords, and
- the associated tcb_fieldnos. For efficiency reasons, these are made
- static globals so that we can compute them only once the first time
- and reuse them later. Set to NULL if the types haven't been computed
- yet, or if they may be obsolete (for instance after having loaded
- a new binary). */
+/* This module's per-program-space data. */
-static struct type *atcb_type = NULL;
-static struct type *atcb_common_type = NULL;
-static struct type *atcb_ll_type = NULL;
-static struct type *atcb_call_type = NULL;
-static struct tcb_fieldnos fieldno;
+struct ada_tasks_pspace_data
+{
+ /* Nonzero if the data has been initialized. If set to zero,
+ it means that the data has either not been initialized, or
+ has potentially become stale. */
+ int initialized_p;
-/* Set to 1 when the cached address of System.Tasking.Debug.Known_Tasks
- might be stale and so needs to be recomputed. */
-static int ada_tasks_check_symbol_table = 1;
+ /* The ATCB record type. */
+ struct type *atcb_type;
+
+ /* The ATCB "Common" component type. */
+ struct type *atcb_common_type;
+
+ /* The type of the "ll" field, from the atcb_common_type. */
+ struct type *atcb_ll_type;
+
+ /* The type of the "call" field, from the atcb_common_type. */
+ struct type *atcb_call_type;
+
+ /* The index of various fields in the ATCB record and sub-records. */
+ struct atcb_fieldnos atcb_fieldno;
+};
+
+/* Key to our per-program-space data. */
+static const struct program_space_data *ada_tasks_pspace_data_handle;
-/* The list of Ada tasks.
-
- Note: To each task we associate a number that the user can use to
- reference it - this number is printed beside each task in the tasks
- info listing displayed by "info tasks". This number is equal to
- its index in the vector + 1. Reciprocally, to compute the index
- of a task in the vector, we need to substract 1 from its number. */
typedef struct ada_task_info ada_task_info_s;
DEF_VEC_O(ada_task_info_s);
-static VEC(ada_task_info_s) *task_list = NULL;
-/* When non-zero, this flag indicates that the current task_list
- is obsolete, and should be recomputed before it is accessed. */
-static int stale_task_list_p = 1;
+/* The kind of data structure used by the runtime to store the list
+ of Ada tasks. */
+
+enum ada_known_tasks_kind
+{
+ /* Use this value when we haven't determined which kind of structure
+ is being used, or when we need to recompute it.
+
+ We set the value of this enumerate to zero on purpose: This allows
+ us to use this enumerate in a structure where setting all fields
+ to zero will result in this kind being set to unknown. */
+ ADA_TASKS_UNKNOWN = 0,
+
+ /* This value means that we did not find any task list. Unless
+ there is a bug somewhere, this means that the inferior does not
+ use tasking. */
+ ADA_TASKS_NOT_FOUND,
+
+ /* This value means that the task list is stored as an array.
+ This is the usual method, as it causes very little overhead.
+ But this method is not always used, as it does use a certain
+ amount of memory, which might be scarse in certain environments. */
+ ADA_TASKS_ARRAY,
+
+ /* This value means that the task list is stored as a linked list.
+ This has more runtime overhead than the array approach, but
+ also require less memory when the number of tasks is small. */
+ ADA_TASKS_LIST,
+};
+
+/* This module's per-inferior data. */
+
+struct ada_tasks_inferior_data
+{
+ /* The type of data structure used by the runtime to store
+ 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;
+ - ADA_TASKS_NOT_FOUND: The program probably does not use tasking
+ 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;
+
+ /* The address of the known_tasks structure. This is where
+ the runtime stores the information for all Ada tasks.
+ The interpretation of this field depends on KNOWN_TASKS_KIND
+ above. */
+ CORE_ADDR known_tasks_addr;
+
+ /* When nonzero, this flag indicates that the task_list field
+ below is up to date. When set to zero, the list has either
+ not been initialized, or has potentially become stale. */
+ int task_list_valid_p;
+
+ /* The list of Ada tasks.
+
+ Note: To each task we associate a number that the user can use to
+ reference it - this number is printed beside each task in the tasks
+ info listing displayed by "info tasks". This number is equal to
+ its index in the vector + 1. Reciprocally, to compute the index
+ of a task in the vector, we need to substract 1 from its number. */
+ VEC(ada_task_info_s) *task_list;
+};
+
+/* Key to our per-inferior data. */
+static const struct inferior_data *ada_tasks_inferior_data_handle;
+
+/* Return the ada-tasks module's data for the given program space (PSPACE).
+ If none is found, add a zero'ed one now.
+
+ This function always returns a valid object. */
+
+static struct ada_tasks_pspace_data *
+get_ada_tasks_pspace_data (struct program_space *pspace)
+{
+ struct ada_tasks_pspace_data *data;
+
+ data = program_space_data (pspace, ada_tasks_pspace_data_handle);
+ if (data == NULL)
+ {
+ data = XZALLOC (struct ada_tasks_pspace_data);
+ set_program_space_data (pspace, ada_tasks_pspace_data_handle, data);
+ }
+
+ return data;
+}
+
+/* Return the ada-tasks module's data for the given inferior (INF).
+ If none is found, add a zero'ed one now.
+
+ This function always returns a valid object.
+
+ Note that we could use an observer of the inferior-created event
+ to make sure that the ada-tasks per-inferior data always exists.
+ But we prefered this approach, as it avoids this entirely as long
+ as the user does not use any of the tasking features. This is
+ quite possible, particularly in the case where the inferior does
+ not use tasking. */
+
+static struct ada_tasks_inferior_data *
+get_ada_tasks_inferior_data (struct inferior *inf)
+{
+ struct ada_tasks_inferior_data *data;
+
+ data = inferior_data (inf, ada_tasks_inferior_data_handle);
+ if (data == NULL)
+ {
+ data = XZALLOC (struct ada_tasks_inferior_data);
+ set_inferior_data (inf, ada_tasks_inferior_data_handle, data);
+ }
+
+ return data;
+}
/* Return the task number of the task whose ptid is PTID, or zero
if the task could not be found. */
ada_get_task_number (ptid_t ptid)
{
int i;
+ struct inferior *inf = find_inferior_pid (ptid_get_pid (ptid));
+ struct ada_tasks_inferior_data *data;
- for (i=0; i < VEC_length (ada_task_info_s, task_list); i++)
- if (ptid_equal (VEC_index (ada_task_info_s, task_list, i)->ptid, ptid))
+ gdb_assert (inf != NULL);
+ data = get_ada_tasks_inferior_data (inf);
+
+ for (i = 0; i < VEC_length (ada_task_info_s, data->task_list); i++)
+ if (ptid_equal (VEC_index (ada_task_info_s, data->task_list, i)->ptid,
+ ptid))
return i + 1;
return 0; /* No matching task found. */
}
-/* Return the task number of the task that matches TASK_ID, or zero
- if the task could not be found. */
+/* Return the task number of the task running in inferior INF which
+ matches TASK_ID , or zero if the task could not be found. */
static int
-get_task_number_from_id (CORE_ADDR task_id)
+get_task_number_from_id (CORE_ADDR task_id, struct inferior *inf)
{
+ struct ada_tasks_inferior_data *data = get_ada_tasks_inferior_data (inf);
int i;
- for (i = 0; i < VEC_length (ada_task_info_s, task_list); i++)
+ for (i = 0; i < VEC_length (ada_task_info_s, data->task_list); i++)
{
struct ada_task_info *task_info =
- VEC_index (ada_task_info_s, task_list, i);
+ VEC_index (ada_task_info_s, data->task_list, i);
if (task_info->task_id == task_id)
return i + 1;
int
valid_task_id (int task_num)
{
+ struct ada_tasks_inferior_data *data;
+
+ ada_build_task_list ();
+ data = get_ada_tasks_inferior_data (current_inferior ());
return (task_num > 0
- && task_num <= VEC_length (ada_task_info_s, task_list));
+ && task_num <= VEC_length (ada_task_info_s, data->task_list));
}
/* Return non-zero iff the task STATE corresponds to a non-terminated
return (task_info->state != Terminated);
}
+/* Call the ITERATOR function once for each Ada task that hasn't been
+ terminated yet. */
+
+void
+iterate_over_live_ada_tasks (ada_task_list_iterator_ftype *iterator)
+{
+ int i, nb_tasks;
+ struct ada_task_info *task;
+ struct ada_tasks_inferior_data *data;
+
+ ada_build_task_list ();
+ data = get_ada_tasks_inferior_data (current_inferior ());
+ nb_tasks = VEC_length (ada_task_info_s, data->task_list);
+
+ for (i = 0; i < nb_tasks; i++)
+ {
+ task = VEC_index (ada_task_info_s, data->task_list, i);
+ if (!ada_task_is_alive (task))
+ continue;
+ iterator (task);
+ }
+}
+
/* Extract the contents of the value as a string whose length is LENGTH,
and store the result in DEST. */
dest[len] = '\0';
}
-/* Return the address of the Known_Tasks array maintained in
- the Ada Runtime. Return NULL if the array could not be found,
- meaning that the inferior program probably does not use tasking.
-
- In order to provide a fast response time, this function caches
- the Known_Tasks array address after the lookup during the first
- call. Subsequent calls will simply return this cached address. */
-
-static CORE_ADDR
-get_known_tasks_addr (void)
-{
- static CORE_ADDR known_tasks_addr = 0;
-
- if (ada_tasks_check_symbol_table)
- {
- struct symbol *sym;
- struct minimal_symbol *msym;
-
- msym = lookup_minimal_symbol (KNOWN_TASKS_NAME, NULL, NULL);
- if (msym != NULL)
- known_tasks_addr = SYMBOL_VALUE_ADDRESS (msym);
- else
- {
- if (target_lookup_symbol (KNOWN_TASKS_NAME, &known_tasks_addr) != 0)
- return 0;
- }
-
- /* FIXME: brobecker 2003-03-05: Here would be a much better place
- to attach the ada-tasks observers, instead of doing this
- unconditionaly in _initialize_tasks. This would avoid an
- unecessary notification when the inferior does not use tasking
- or as long as the user does not use the ada-tasks commands.
- Unfortunately, this is not possible for the moment: the current
- code resets ada__tasks_check_symbol_table back to 1 whenever
- symbols for a new program are being loaded. If we place the
- observers intialization here, we will end up adding new observers
- everytime we do the check for Ada tasking-related symbols
- above. This would currently have benign effects, but is still
- undesirable. The cleanest approach is probably to create a new
- observer to notify us when the user is debugging a new program.
- We would then reset ada__tasks_check_symbol_table back to 1
- during the notification, but also detach all observers.
- BTW: observers are probably not reentrant, so detaching during
- a notification may not be the safest thing to do... Sigh...
- But creating the new observer would be a good idea in any case,
- since this allow us to make ada__tasks_check_symbol_table
- static, which is a good bonus. */
- ada_tasks_check_symbol_table = 0;
- }
-
- return known_tasks_addr;
-}
-
/* Get from the debugging information the type description of all types
related to the Ada Task Control Block that will be needed in order to
read the list of known tasks in the Ada runtime. Also return the
return values will be set. */
static void
-get_tcb_types_info (struct type **atcb_type,
- struct type **atcb_common_type,
- struct type **atcb_ll_type,
- struct type **atcb_call_type,
- struct tcb_fieldnos *atcb_fieldnos)
+get_tcb_types_info (void)
{
struct type *type;
struct type *common_type;
struct type *ll_type;
struct type *call_type;
- struct tcb_fieldnos fieldnos;
+ struct atcb_fieldnos fieldnos;
+ struct ada_tasks_pspace_data *pspace_data;
const char *atcb_name = "system__tasking__ada_task_control_block___XVE";
const char *atcb_name_fixed = "system__tasking__ada_task_control_block";
const char *private_data_name = "system__task_primitives__private_data";
const char *entry_call_record_name = "system__tasking__entry_call_record";
+ /* ATCB symbols may be found in several compilation units. As we
+ are only interested in one instance, use standard (literal,
+ C-like) lookups to get the first match. */
+
struct symbol *atcb_sym =
- lookup_symbol (atcb_name, NULL, VAR_DOMAIN, NULL);
+ lookup_symbol_in_language (atcb_name, NULL, VAR_DOMAIN,
+ language_c, NULL);
const struct symbol *common_atcb_sym =
- lookup_symbol (common_atcb_name, NULL, VAR_DOMAIN, NULL);
+ lookup_symbol_in_language (common_atcb_name, NULL, VAR_DOMAIN,
+ language_c, NULL);
const struct symbol *private_data_sym =
- lookup_symbol (private_data_name, NULL, VAR_DOMAIN, NULL);
+ lookup_symbol_in_language (private_data_name, NULL, VAR_DOMAIN,
+ language_c, NULL);
const struct symbol *entry_call_record_sym =
- lookup_symbol (entry_call_record_name, NULL, VAR_DOMAIN, NULL);
+ lookup_symbol_in_language (entry_call_record_name, NULL, VAR_DOMAIN,
+ language_c, NULL);
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. */
- atcb_sym = lookup_symbol (atcb_name_fixed, NULL, VAR_DOMAIN, NULL);
+ atcb_sym = lookup_symbol_in_language (atcb_name_fixed, NULL, VAR_DOMAIN,
+ language_c, NULL);
if (atcb_sym == NULL || atcb_sym->type == NULL)
error (_("Cannot find Ada_Task_Control_Block type. Aborting"));
fieldnos.priority = ada_get_field_index (common_type, "base_priority", 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);
fieldnos.call = ada_get_field_index (common_type, "call", 1);
fieldnos.ll = ada_get_field_index (common_type, "ll", 0);
fieldnos.ll_thread = ada_get_field_index (ll_type, "thread", 0);
/* Set all the out parameters all at once, now that we are certain
that there are no potential error() anymore. */
- *atcb_type = type;
- *atcb_common_type = common_type;
- *atcb_ll_type = ll_type;
- *atcb_call_type = call_type;
- *atcb_fieldnos = fieldnos;
+ pspace_data = get_ada_tasks_pspace_data (current_program_space);
+ pspace_data->initialized_p = 1;
+ pspace_data->atcb_type = type;
+ pspace_data->atcb_common_type = common_type;
+ pspace_data->atcb_ll_type = ll_type;
+ pspace_data->atcb_call_type = call_type;
+ pspace_data->atcb_fieldno = fieldnos;
}
/* Build the PTID of the task from its COMMON_VALUE, which is the "Common"
CORE_ADDR lwp = 0;
struct value *ll_value;
ptid_t ptid;
+ const struct ada_tasks_pspace_data *pspace_data
+ = get_ada_tasks_pspace_data (current_program_space);
- ll_value = value_field (common_value, fieldno.ll);
+ ll_value = value_field (common_value, pspace_data->atcb_fieldno.ll);
- if (fieldno.ll_lwp >= 0)
- lwp = value_as_address (value_field (ll_value, fieldno.ll_lwp));
- thread = value_as_long (value_field (ll_value, fieldno.ll_thread));
+ if (pspace_data->atcb_fieldno.ll_lwp >= 0)
+ lwp = value_as_address (value_field (ll_value,
+ pspace_data->atcb_fieldno.ll_lwp));
+ thread = value_as_long (value_field (ll_value,
+ pspace_data->atcb_fieldno.ll_thread));
ptid = target_get_ada_task_ptid (lwp, thread);
struct value *entry_calls_value_element;
int called_task_fieldno = -1;
const char ravenscar_task_name[] = "Ravenscar task";
+ const struct ada_tasks_pspace_data *pspace_data
+ = get_ada_tasks_pspace_data (current_program_space);
- if (atcb_type == NULL)
- get_tcb_types_info (&atcb_type, &atcb_common_type, &atcb_ll_type,
- &atcb_call_type, &fieldno);
+ if (!pspace_data->initialized_p)
+ get_tcb_types_info ();
- tcb_value = value_from_contents_and_address (atcb_type, NULL, task_id);
- common_value = value_field (tcb_value, fieldno.common);
+ tcb_value = value_from_contents_and_address (pspace_data->atcb_type,
+ NULL, task_id);
+ common_value = value_field (tcb_value, pspace_data->atcb_fieldno.common);
/* Fill in the task_id. */
Depending on the GNAT version used, the task image is either a fat
string, or a thin array of characters. Older versions of GNAT used
to use fat strings, and therefore did not need an extra field in
- the ATCB to store the string length. For efficiency reasons, newer
+ the ATCB to store the string length. For efficiency reasons, newer
versions of GNAT replaced the fat string by a static buffer, but this
also required the addition of a new field named "Image_Len" containing
- the length of the task name. The method used to extract the task name
+ the length of the task name. The method used to extract the task name
is selected depending on the existence of this field.
In some run-time libs (e.g. Ravenscar), the name is not in the ATCB;
- we may want to get it from the first user frame of the stack. For now,
+ we may want to get it from the first user frame of the stack. For now,
we just give a dummy name. */
- if (fieldno.image_len == -1)
+ if (pspace_data->atcb_fieldno.image_len == -1)
{
- if (fieldno.image >= 0)
+ if (pspace_data->atcb_fieldno.image >= 0)
read_fat_string_value (task_info->name,
- value_field (common_value, fieldno.image),
+ value_field (common_value,
+ pspace_data->atcb_fieldno.image),
sizeof (task_info->name) - 1);
else
strcpy (task_info->name, ravenscar_task_name);
}
else
{
- int len = value_as_long (value_field (common_value, fieldno.image_len));
+ int len = value_as_long
+ (value_field (common_value,
+ pspace_data->atcb_fieldno.image_len));
value_as_string (task_info->name,
- value_field (common_value, fieldno.image), len);
+ value_field (common_value,
+ pspace_data->atcb_fieldno.image),
+ len);
}
/* Compute the task state and priority. */
- task_info->state = value_as_long (value_field (common_value, fieldno.state));
+ task_info->state =
+ value_as_long (value_field (common_value,
+ pspace_data->atcb_fieldno.state));
task_info->priority =
- value_as_long (value_field (common_value, fieldno.priority));
+ value_as_long (value_field (common_value,
+ pspace_data->atcb_fieldno.priority));
/* If the ATCB contains some information about the parent task,
then compute it as well. Otherwise, zero. */
- if (fieldno.parent >= 0)
+ if (pspace_data->atcb_fieldno.parent >= 0)
task_info->parent =
- value_as_address (value_field (common_value, fieldno.parent));
+ value_as_address (value_field (common_value,
+ pspace_data->atcb_fieldno.parent));
else
task_info->parent = 0;
/* If the ATCB contains some information about entry calls, then
compute the "called_task" as well. Otherwise, zero. */
- if (fieldno.atc_nesting_level > 0 && fieldno.entry_calls > 0)
+ if (pspace_data->atcb_fieldno.atc_nesting_level > 0
+ && 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. */
- atc_nesting_level_value = value_field (tcb_value,
- fieldno.atc_nesting_level);
+ atc_nesting_level_value =
+ value_field (tcb_value, pspace_data->atcb_fieldno.atc_nesting_level);
entry_calls_value =
- ada_coerce_to_simple_array_ptr (value_field (tcb_value,
- fieldno.entry_calls));
+ 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_as_long (atc_nesting_level_value));
then compute the "caller_task". Otherwise, zero. */
task_info->caller_task = 0;
- if (fieldno.call >= 0)
+ 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. */
const CORE_ADDR call =
- value_as_address (value_field (common_value, fieldno.call));
+ 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 (atcb_call_type, NULL, call);
+ value_from_contents_and_address (pspace_data->atcb_call_type,
+ NULL, call);
task_info->caller_task =
- value_as_address (value_field (call_val, fieldno.call_self));
+ value_as_address
+ (value_field (call_val, pspace_data->atcb_fieldno.call_self));
}
}
- /* And finally, compute the task ptid. */
-
- if (ada_task_is_alive (task_info))
+ /* And finally, compute the task ptid. Note that there are situations
+ where this cannot be determined:
+ - The task is no longer alive - the ptid is irrelevant;
+ - We are debugging a core file - the thread is not always
+ completely preserved for us to link back a task to its
+ underlying thread. Since we do not support task switching
+ when debugging core files anyway, we don't need to compute
+ that task ptid.
+ In either case, we don't need that ptid, and it is just good enough
+ to set it to null_ptid. */
+
+ if (target_has_execution && ada_task_is_alive (task_info))
task_info->ptid = ptid_from_atcb_common (common_value);
else
task_info->ptid = null_ptid;
}
/* Read the ATCB info of the given task (identified by TASK_ID), and
- add the result to the TASK_LIST. */
+ add the result to the given inferior's TASK_LIST. */
static void
-add_ada_task (CORE_ADDR task_id)
+add_ada_task (CORE_ADDR task_id, struct inferior *inf)
{
struct ada_task_info task_info;
+ struct ada_tasks_inferior_data *data = get_ada_tasks_inferior_data (inf);
read_atcb (task_id, &task_info);
- VEC_safe_push (ada_task_info_s, task_list, &task_info);
+ VEC_safe_push (ada_task_info_s, data->task_list, &task_info);
}
/* Read the Known_Tasks array from the inferior memory, and store
- it in TASK_LIST. Return non-zero upon success. */
+ it in the current inferior's TASK_LIST. Return non-zero upon success. */
static int
-read_known_tasks_array (void)
+read_known_tasks_array (CORE_ADDR known_tasks_addr)
{
const int target_ptr_byte =
gdbarch_ptr_bit (target_gdbarch) / TARGET_CHAR_BIT;
- const CORE_ADDR known_tasks_addr = get_known_tasks_addr ();
const int known_tasks_size = target_ptr_byte * MAX_NUMBER_OF_KNOWN_TASKS;
gdb_byte *known_tasks = alloca (known_tasks_size);
int i;
- /* Step 1: Clear the current list, if necessary. */
- VEC_truncate (ada_task_info_s, task_list, 0);
-
- /* If the application does not use task, then no more needs to be done.
- It is important to have the task list cleared (see above) before we
- return, as we don't want a stale task list to be used... This can
- happen for instance when debugging a non-multitasking program after
- having debugged a multitasking one. */
- if (known_tasks_addr == 0)
- return 0;
-
- /* Step 2: Build a new list by reading the ATCBs from the Known_Tasks
- array in the Ada runtime. */
+ /* Build a new list by reading the ATCBs from the Known_Tasks array
+ in the Ada runtime. */
read_memory (known_tasks_addr, known_tasks, known_tasks_size);
for (i = 0; i < MAX_NUMBER_OF_KNOWN_TASKS; i++)
{
data_ptr_type);
if (task_id != 0)
- add_ada_task (task_id);
+ add_ada_task (task_id, current_inferior ());
}
- /* Step 3: Unset stale_task_list_p, to avoid re-reading the Known_Tasks
- array unless needed. Then report a success. */
- stale_task_list_p = 0;
-
return 1;
}
-/* Builds the task_list by reading the Known_Tasks array from
- the inferior. Prints an appropriate message and returns non-zero
- if it failed to build this list. */
+/* Read the known tasks from the inferior memory, and store it in
+ the current inferior's TASK_LIST. Return non-zero upon success. */
-int
-ada_build_task_list (int warn_if_null)
+static int
+read_known_tasks_list (CORE_ADDR known_tasks_addr)
{
- if (!target_has_stack)
- error (_("Cannot inspect Ada tasks when program is not running"));
-
- if (stale_task_list_p)
- read_known_tasks_array ();
+ const int target_ptr_byte =
+ gdbarch_ptr_bit (target_gdbarch) / TARGET_CHAR_BIT;
+ gdb_byte *known_tasks = alloca (target_ptr_byte);
+ struct type *data_ptr_type =
+ builtin_type (target_gdbarch)->builtin_data_ptr;
+ CORE_ADDR task_id;
+ const struct ada_tasks_pspace_data *pspace_data
+ = get_ada_tasks_pspace_data (current_program_space);
+
+ /* Sanity check. */
+ if (pspace_data->atcb_fieldno.activation_link < 0)
+ return 0;
- if (task_list == NULL)
+ /* Build a new list by reading the ATCBs. Read head of the list. */
+ read_memory (known_tasks_addr, known_tasks, target_ptr_byte);
+ task_id = extract_typed_address (known_tasks, data_ptr_type);
+ while (task_id != 0)
{
- if (warn_if_null)
- printf_filtered (_("Your application does not use any Ada tasks.\n"));
- return 0;
+ struct value *tcb_value;
+ struct value *common_value;
+
+ add_ada_task (task_id, current_inferior ());
+
+ /* Read the chain. */
+ tcb_value = value_from_contents_and_address (pspace_data->atcb_type,
+ NULL, task_id);
+ 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));
}
return 1;
}
-/* Print a one-line description of the task whose number is TASKNO.
- The formatting should fit the "info tasks" array. */
+/* Return the address of the variable NAME that contains all the known
+ tasks maintained in the Ada Runtime. Return NULL if the variable
+ could not be found, meaning that the inferior program probably does
+ not use tasking. */
+
+static CORE_ADDR
+get_known_tasks_addr (const char *name)
+{
+ struct minimal_symbol *msym;
+
+ msym = lookup_minimal_symbol (name, NULL, NULL);
+ if (msym == NULL)
+ return 0;
+
+ return SYMBOL_VALUE_ADDRESS (msym);
+}
+
+/* Assuming DATA is the ada-tasks' data for the current inferior,
+ set the known_tasks_kind and known_tasks_addr fields. Do nothing
+ if those fields are already set and still up to date. */
static void
-short_task_info (int taskno)
+ada_set_current_inferior_known_tasks_addr (struct ada_tasks_inferior_data *data)
{
- const struct ada_task_info *const task_info =
- VEC_index (ada_task_info_s, task_list, taskno - 1);
- int active_task_p;
+ CORE_ADDR known_tasks_addr;
- gdb_assert (task_info != NULL);
+ if (data->known_tasks_kind != ADA_TASKS_UNKNOWN)
+ return;
- /* Print a star if this task is the current task (or the task currently
- selected). */
+ known_tasks_addr = get_known_tasks_addr (KNOWN_TASKS_NAME);
+ if (known_tasks_addr != 0)
+ {
+ data->known_tasks_kind = ADA_TASKS_ARRAY;
+ data->known_tasks_addr = known_tasks_addr;
+ return;
+ }
- active_task_p = ptid_equal (task_info->ptid, inferior_ptid);
- if (active_task_p)
- printf_filtered ("*");
- else
- printf_filtered (" ");
+ known_tasks_addr = get_known_tasks_addr (KNOWN_TASKS_LIST);
+ if (known_tasks_addr != 0)
+ {
+ data->known_tasks_kind = ADA_TASKS_LIST;
+ data->known_tasks_addr = known_tasks_addr;
+ return;
+ }
- /* Print the task number. */
- printf_filtered ("%3d", taskno);
+ data->known_tasks_kind = ADA_TASKS_NOT_FOUND;
+ data->known_tasks_addr = 0;
+}
- /* Print the Task ID. */
- printf_filtered (" %9lx", (long) task_info->task_id);
+/* Read the known tasks from the current inferior's memory, and store it
+ in the current inferior's data TASK_LIST.
+ Return non-zero upon success. */
- /* Print the Task ID of the task parent. */
- printf_filtered (" %4d", get_task_number_from_id (task_info->parent));
+static int
+read_known_tasks (void)
+{
+ struct ada_tasks_inferior_data *data =
+ get_ada_tasks_inferior_data (current_inferior ());
- /* Print the base priority of the task. */
- printf_filtered (" %3d", task_info->priority);
+ /* Step 1: Clear the current list, if necessary. */
+ VEC_truncate (ada_task_info_s, data->task_list, 0);
- /* Print the task current state. */
- if (task_info->caller_task)
- printf_filtered (_(" Accepting RV with %-4d"),
- get_task_number_from_id (task_info->caller_task));
- else if (task_info->state == Entry_Caller_Sleep && task_info->called_task)
- printf_filtered (_(" Waiting on RV with %-3d"),
- get_task_number_from_id (task_info->called_task));
- else
- printf_filtered (" %-22s", _(task_states[task_info->state]));
+ /* Step 2: do the real work.
+ If the application does not use task, then no more needs to be done.
+ It is important to have the task list cleared (see above) before we
+ return, as we don't want a stale task list to be used... This can
+ happen for instance when debugging a non-multitasking program after
+ having debugged a multitasking one. */
+ ada_set_current_inferior_known_tasks_addr (data);
+ gdb_assert (data->known_tasks_kind != ADA_TASKS_UNKNOWN);
- /* Finally, print the task name. */
- if (task_info->name[0] != '\0')
- printf_filtered (" %s\n", task_info->name);
- else
- printf_filtered (_(" <no name>\n"));
+ switch (data->known_tasks_kind)
+ {
+ case ADA_TASKS_NOT_FOUND: /* Tasking not in use in inferior. */
+ return 0;
+ case ADA_TASKS_ARRAY:
+ return read_known_tasks_array (data->known_tasks_addr);
+ case ADA_TASKS_LIST:
+ return read_known_tasks_list (data->known_tasks_addr);
+ }
+
+ /* Step 3: Set task_list_valid_p, to avoid re-reading the Known_Tasks
+ array unless needed. Then report a success. */
+ data->task_list_valid_p = 1;
+
+ return 1;
+}
+
+/* Build the task_list by reading the Known_Tasks array from
+ the inferior, and return the number of tasks in that list
+ (zero means that the program is not using tasking at all). */
+
+int
+ada_build_task_list (void)
+{
+ struct ada_tasks_inferior_data *data;
+
+ if (!target_has_stack)
+ error (_("Cannot inspect Ada tasks when program is not running"));
+
+ data = get_ada_tasks_inferior_data (current_inferior ());
+ if (!data->task_list_valid_p)
+ read_known_tasks ();
+
+ return VEC_length (ada_task_info_s, data->task_list);
}
-/* Print a list containing a short description of all Ada tasks. */
-/* FIXME: Shouldn't we be using ui_out??? */
+/* Print a table providing a short description of all Ada tasks
+ running inside inferior INF. If ARG_STR is set, it will be
+ interpreted as a task number, and the table will be limited to
+ that task only. */
static void
-info_tasks (int from_tty)
+print_ada_task_info (struct ui_out *uiout,
+ char *arg_str,
+ struct inferior *inf)
{
- int taskno;
- const int nb_tasks = VEC_length (ada_task_info_s, task_list);
+ struct ada_tasks_inferior_data *data;
+ int taskno, nb_tasks;
+ int taskno_arg = 0;
+ struct cleanup *old_chain;
+
+ if (ada_build_task_list () == 0)
+ {
+ ui_out_message (uiout, 0,
+ _("Your application does not use any Ada tasks.\n"));
+ return;
+ }
+
+ if (arg_str != NULL && arg_str[0] != '\0')
+ taskno_arg = value_as_long (parse_and_eval (arg_str));
+
+ data = get_ada_tasks_inferior_data (inf);
+ nb_tasks = VEC_length (ada_task_info_s, data->task_list);
+
+ old_chain = make_cleanup_ui_out_table_begin_end (uiout, 7, nb_tasks,
+ "tasks");
+ ui_out_table_header (uiout, 1, ui_left, "current", "");
+ ui_out_table_header (uiout, 3, ui_right, "id", "ID");
+ ui_out_table_header (uiout, 9, ui_right, "task-id", "TID");
+ ui_out_table_header (uiout, 4, ui_right, "parent-id", "P-ID");
+ ui_out_table_header (uiout, 3, ui_right, "priority", "Pri");
+ ui_out_table_header (uiout, 22, ui_left, "state", "State");
+ /* Use ui_noalign for the last column, to prevent the CLI uiout
+ from printing an extra space at the end of each row. This
+ is a bit of a hack, but does get the job done. */
+ ui_out_table_header (uiout, 1, ui_noalign, "name", "Name");
+ ui_out_table_body (uiout);
- printf_filtered (_(" ID TID P-ID Pri State Name\n"));
-
for (taskno = 1; taskno <= nb_tasks; taskno++)
- short_task_info (taskno);
+ {
+ const struct ada_task_info *const task_info =
+ VEC_index (ada_task_info_s, data->task_list, taskno - 1);
+ int parent_id;
+ struct cleanup *chain2;
+
+ gdb_assert (task_info != NULL);
+
+ /* If the user asked for the output to be restricted
+ to one task only, and this is not the task, skip
+ to the next one. */
+ if (taskno_arg && taskno != taskno_arg)
+ continue;
+
+ chain2 = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
+
+ /* Print a star if this task is the current task (or the task
+ currently selected). */
+ if (ptid_equal (task_info->ptid, inferior_ptid))
+ ui_out_field_string (uiout, "current", "*");
+ else
+ ui_out_field_skip (uiout, "current");
+
+ /* Print the task number. */
+ ui_out_field_int (uiout, "id", taskno);
+
+ /* Print the Task ID. */
+ ui_out_field_fmt (uiout, "task-id", "%9lx", (long) task_info->task_id);
+
+ /* Print the ID of the parent task. */
+ parent_id = get_task_number_from_id (task_info->parent, inf);
+ if (parent_id)
+ ui_out_field_int (uiout, "parent-id", parent_id);
+ else
+ ui_out_field_skip (uiout, "parent-id");
+
+ /* Print the base priority of the task. */
+ ui_out_field_int (uiout, "priority", task_info->priority);
+
+ /* Print the task current state. */
+ if (task_info->caller_task)
+ ui_out_field_fmt (uiout, "state",
+ _("Accepting RV with %-4d"),
+ get_task_number_from_id (task_info->caller_task,
+ inf));
+ else if (task_info->state == Entry_Caller_Sleep
+ && task_info->called_task)
+ ui_out_field_fmt (uiout, "state",
+ _("Waiting on RV with %-3d"),
+ get_task_number_from_id (task_info->called_task,
+ inf));
+ else
+ ui_out_field_string (uiout, "state", task_states[task_info->state]);
+
+ /* Finally, print the task name. */
+ ui_out_field_fmt (uiout, "name",
+ "%s",
+ task_info->name[0] != '\0' ? task_info->name
+ : _("<no name>"));
+
+ ui_out_text (uiout, "\n");
+ do_cleanups (chain2);
+ }
+
+ do_cleanups (old_chain);
}
-/* Print a detailed description of the Ada task whose ID is TASKNO_STR. */
+/* Print a detailed description of the Ada task whose ID is TASKNO_STR
+ for the given inferior (INF). */
static void
-info_task (char *taskno_str, int from_tty)
+info_task (struct ui_out *uiout, char *taskno_str, struct inferior *inf)
{
const int taskno = value_as_long (parse_and_eval (taskno_str));
struct ada_task_info *task_info;
int parent_taskno = 0;
+ struct ada_tasks_inferior_data *data = get_ada_tasks_inferior_data (inf);
+
+ if (ada_build_task_list () == 0)
+ {
+ ui_out_message (uiout, 0,
+ _("Your application does not use any Ada tasks.\n"));
+ return;
+ }
- if (taskno <= 0 || taskno > VEC_length (ada_task_info_s, task_list))
+ if (taskno <= 0 || taskno > VEC_length (ada_task_info_s, data->task_list))
error (_("Task ID %d not known. Use the \"info tasks\" command to\n"
"see the IDs of currently known tasks"), taskno);
- task_info = VEC_index (ada_task_info_s, task_list, taskno - 1);
+ task_info = VEC_index (ada_task_info_s, data->task_list, taskno - 1);
/* Print the Ada task ID. */
printf_filtered (_("Ada Task: %s\n"),
/* Print who is the parent (if any). */
if (task_info->parent != 0)
- parent_taskno = get_task_number_from_id (task_info->parent);
+ parent_taskno = get_task_number_from_id (task_info->parent, inf);
if (parent_taskno)
{
struct ada_task_info *parent =
- VEC_index (ada_task_info_s, task_list, parent_taskno - 1);
+ VEC_index (ada_task_info_s, data->task_list, parent_taskno - 1);
printf_filtered (_("Parent: %d"), parent_taskno);
if (parent->name[0] != '\0')
if (task_info->caller_task)
{
- target_taskno = get_task_number_from_id (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);
}
else if (task_info->state == Entry_Caller_Sleep && task_info->called_task)
{
- target_taskno = get_task_number_from_id (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);
}
if (target_taskno)
{
struct ada_task_info *target_task_info =
- VEC_index (ada_task_info_s, task_list, target_taskno - 1);
+ VEC_index (ada_task_info_s, data->task_list, target_taskno - 1);
if (target_task_info->name[0] != '\0')
printf_filtered (" (%s)", target_task_info->name);
static void
info_tasks_command (char *arg, int from_tty)
{
- const int task_list_built = ada_build_task_list (1);
-
- if (!task_list_built)
- return;
+ struct ui_out *uiout = current_uiout;
if (arg == NULL || *arg == '\0')
- info_tasks (from_tty);
+ print_ada_task_info (uiout, NULL, current_inferior ());
else
- info_task (arg, from_tty);
+ info_task (uiout, arg, current_inferior ());
}
/* Print a message telling the user id of the current task.
that task. Print an error message if the task switch failed. */
static void
-task_command_1 (char *taskno_str, int from_tty)
+task_command_1 (char *taskno_str, int from_tty, struct inferior *inf)
{
const int taskno = value_as_long (parse_and_eval (taskno_str));
struct ada_task_info *task_info;
+ struct ada_tasks_inferior_data *data = get_ada_tasks_inferior_data (inf);
- if (taskno <= 0 || taskno > VEC_length (ada_task_info_s, task_list))
+ if (taskno <= 0 || taskno > VEC_length (ada_task_info_s, data->task_list))
error (_("Task ID %d not known. Use the \"info tasks\" command to\n"
"see the IDs of currently known tasks"), taskno);
- task_info = VEC_index (ada_task_info_s, task_list, taskno - 1);
+ task_info = VEC_index (ada_task_info_s, data->task_list, taskno - 1);
if (!ada_task_is_alive (task_info))
error (_("Cannot switch to task %d: Task is no longer running"), taskno);
to the thread list. */
target_find_new_threads ();
+ /* Verify that the ptid of the task we want to switch to is valid
+ (in other words, a ptid that GDB knows about). Otherwise, we will
+ cause an assertion failure later on, when we try to determine
+ the ptid associated thread_info data. We should normally never
+ encounter such an error, but the wrong ptid can actually easily be
+ 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. */
+ if (!find_thread_ptid (task_info->ptid))
+ error (_("Unable to compute thread ID for task %d.\n"
+ "Cannot switch to this task."),
+ taskno);
+
switch_to_thread (task_info->ptid);
ada_find_printable_frame (get_selected_frame (NULL));
printf_filtered (_("[Switching to task %d]\n"), taskno);
static void
task_command (char *taskno_str, int from_tty)
{
- const int task_list_built = ada_build_task_list (1);
+ struct ui_out *uiout = current_uiout;
- if (!task_list_built)
- return;
+ if (ada_build_task_list () == 0)
+ {
+ ui_out_message (uiout, 0,
+ _("Your application does not use any Ada tasks.\n"));
+ return;
+ }
if (taskno_str == NULL || taskno_str[0] == '\0')
display_current_task_id ();
error (_("\
Task switching not supported when debugging from core files\n\
(use thread support instead)"));
- task_command_1 (taskno_str, from_tty);
+ task_command_1 (taskno_str, from_tty, current_inferior ());
}
}
-/* Indicate that the task list may have changed, so invalidate the cache. */
+/* Indicate that the given inferior's task list may have changed,
+ so invalidate the cache. */
static void
-ada_task_list_changed (void)
+ada_task_list_changed (struct inferior *inf)
{
- stale_task_list_p = 1;
+ struct ada_tasks_inferior_data *data = get_ada_tasks_inferior_data (inf);
+
+ data->task_list_valid_p = 0;
+}
+
+/* Invalidate the per-program-space data. */
+
+static void
+ada_tasks_invalidate_pspace_data (struct program_space *pspace)
+{
+ get_ada_tasks_pspace_data (pspace)->initialized_p = 0;
+}
+
+/* Invalidate the per-inferior data. */
+
+static void
+ada_tasks_invalidate_inferior_data (struct inferior *inf)
+{
+ struct ada_tasks_inferior_data *data = get_ada_tasks_inferior_data (inf);
+
+ data->known_tasks_kind = ADA_TASKS_UNKNOWN;
+ data->task_list_valid_p = 0;
}
/* The 'normal_stop' observer notification callback. */
{
/* The inferior has been resumed, and just stopped. This means that
our task_list needs to be recomputed before it can be used again. */
- ada_task_list_changed ();
+ ada_task_list_changed (current_inferior ());
}
/* A routine to be called when the objfiles have changed. */
static void
ada_new_objfile_observer (struct objfile *objfile)
{
- /* Invalidate all cached data that were extracted from an objfile. */
+ struct inferior *inf;
+
+ /* Invalidate the relevant data in our program-space data. */
+
+ if (objfile == NULL)
+ {
+ /* 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);
+ }
+ else
+ {
+ /* The associated program-space data might have changed after
+ this objfile was added. Invalidate all cached data. */
+ ada_tasks_invalidate_pspace_data (objfile->pspace);
+ }
- atcb_type = NULL;
- atcb_common_type = NULL;
- atcb_ll_type = NULL;
- atcb_call_type = NULL;
+ /* Invalidate the per-inferior cache for all inferiors using
+ this objfile (or, in other words, for all inferiors who have
+ the same program-space as the objfile's program space).
+ If all objfiles are being cleared (OBJFILE is NULL), then
+ clear the caches for all inferiors. */
- ada_tasks_check_symbol_table = 1;
+ for (inf = inferior_list; inf != NULL; inf = inf->next)
+ if (objfile == NULL || inf->pspace == objfile->pspace)
+ ada_tasks_invalidate_inferior_data (inf);
}
/* Provide a prototype to silence -Wmissing-prototypes. */
void
_initialize_tasks (void)
{
+ ada_tasks_pspace_data_handle = register_program_space_data ();
+ ada_tasks_inferior_data_handle = register_inferior_data ();
+
/* Attach various observers. */
observer_attach_normal_stop (ada_normal_stop_observer);
observer_attach_new_objfile (ada_new_objfile_observer);
projects / external / binutils.git / blobdiff