-/* File ada-tasks.c: Ada tasking control for GDB
- Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
- Free Software Foundation, Inc.
- Contributed by Ada Core Technologies, Inc.
+/* Copyright (C) 1992, 1993, 1994, 1997, 1998, 1999, 2000, 2003, 2004, 2005,
+ 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GDB.
- Authors: Roch-Alexandre Nomine Beguin, Arnaud Charlet <charlet@gnat.com>
-
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-*/
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include <ctype.h>
-#include <gdb_string.h>
#include "defs.h"
-#include "command.h"
-#include "value.h"
-#include "language.h"
-#include "inferior.h"
-#include "symtab.h"
+#include "observer.h"
+#include "gdbcmd.h"
#include "target.h"
+#include "ada-lang.h"
#include "gdbcore.h"
+#include "inferior.h"
#include "gdbthread.h"
-#include "regcache.h" /* for registers_changed */
-
-#if defined (__fsu__) || defined (HAVE_SPYTHREAD) \
- || (defined(__alpha__) && defined(__osf__) && !defined(__alpha_vxworks))
-#include <sys/procfs.h>
-#endif
+#include "progspace.h"
+#include "objfiles.h"
-#if defined (__fsu__) || defined (HAVE_SPYTHREAD) \
- || (defined(__alpha__) && defined(__osf__) && !defined(VXWORKS_TARGET))
-#include "gregset.h"
-#endif
+/* 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"
-#ifdef I386_GNULINUX_TARGET
-#include "gdb_thread_db.h"
-#endif
+/* The maximum number of tasks known to the Ada runtime. */
+static const int MAX_NUMBER_OF_KNOWN_TASKS = 1000;
-#if defined (HAVE_SPYTHREAD)
-#include "irix6-spyThread.h"
-#endif
-
-#include "ada-lang.h"
-#include "observer.h"
+/* 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
{
Async_Select_Sleep,
Delay_Sleep,
Master_Completion_Sleep,
- Master_Phase_2_Sleep
+ Master_Phase_2_Sleep,
+ Interrupt_Server_Idle_Sleep,
+ Interrupt_Server_Blocked_Interrupt_Sleep,
+ Timer_Server_Sleep,
+ AST_Server_Sleep,
+ Asynchronous_Hold,
+ Interrupt_Server_Blocked_On_Event_Flag,
+ Activating,
+ Acceptor_Delay_Sleep
+};
+
+/* A short description corresponding to each possible task state. */
+static const char *task_states[] = {
+ N_("Unactivated"),
+ N_("Runnable"),
+ N_("Terminated"),
+ N_("Child Activation Wait"),
+ N_("Accept or Select Term"),
+ N_("Waiting on entry call"),
+ N_("Async Select Wait"),
+ N_("Delay Sleep"),
+ N_("Child Termination Wait"),
+ N_("Wait Child in Term Alt"),
+ "",
+ "",
+ "",
+ "",
+ N_("Asynchronous Hold"),
+ "",
+ N_("Activating"),
+ N_("Selective Wait")
+};
+
+/* A longer description corresponding to each possible task state. */
+static const char *long_task_states[] = {
+ N_("Unactivated"),
+ N_("Runnable"),
+ N_("Terminated"),
+ N_("Waiting for child activation"),
+ N_("Blocked in accept or select with terminate"),
+ N_("Waiting on entry call"),
+ N_("Asynchronous Selective Wait"),
+ N_("Delay Sleep"),
+ N_("Waiting for children termination"),
+ N_("Waiting for children in terminate alternative"),
+ "",
+ "",
+ "",
+ "",
+ N_("Asynchronous Hold"),
+ "",
+ N_("Activating"),
+ N_("Blocked in selective wait statement")
};
/* 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 entry_calls;
+ int atc_nesting_level;
/* Fields in record Common_ATCB. */
int state;
int priority;
int image;
int image_len; /* This field may be missing. */
+ int activation_link;
int call;
int ll;
/* Fields in Task_Primitives.Private_Data. */
int ll_thread;
int ll_lwp; /* This field may be missing. */
+
+ /* Fields in Common_ATCB.Call.all. */
+ int call_self;
};
-#if defined (linux)
-#define TASK_LWP(atcb) 0L
-#else
-#define TASK_LWP(atcb) extract_unsigned_integer (&(atcb).lwp, sizeof ((atcb).lwp))
-#endif
-
-/* FIXME: move all this conditional compilation in description
- files or in configure.in */
-
-#if defined(__alpha__) && defined(__osf__) && !defined(VXWORKS_TARGET)
-#define SPECIAL_THREAD_SUPPORT_ACTIVE() thread_support
-#define SAVE_TASK_REGISTERS(task) \
- do { fill_gregset (&gregset_saved, -1); \
- fill_fpregset (&fpregset_saved, -1); \
- } while (0)
-#define RESTORE_TASK_REGISTERS(task) \
- do { supply_gregset (&gregset_saved); \
- supply_fpregset (&fpregset_saved); \
- } while (0)
-
-#define THREAD_FETCH_REGISTERS dec_thread_fetch_registers
-#define GET_CURRENT_THREAD(PTID) dec_thread_get_current_thread ()
-extern unsigned long dec_thread_get_current_thread (void);
-extern int dec_thread_get_registers (gdb_gregset_t *, gdb_fpregset_t *);
-extern int dec_thread_fetch_registers (void);
-#endif
-
-#ifdef __fsu__
-#define SPECIAL_THREAD_SUPPORT_ACTIVE() \
- (thread_support && pthread_kern_addr != 0)
-#define SAVE_TASK_REGISTERS(task) \
- do { \
- if (pthread_kern_addr != 0) \
- { \
- fill_gregset (&gregset_saved, -1); \
- fill_fpregset (&fpregset_saved, -1); \
- } \
- } while (0)
-#define RESTORE_TASK_REGISTERS(task) \
- do { \
- if (pthread_kern_addr != 0) \
- { \
- supply_gregset (&gregset_saved); \
- supply_fpregset (&fpregset_saved); \
- } \
- } while (0)
-
-extern int fsu_thread_fetch_registers (void);
-extern unsigned long fsu_thread_get_current_thread (void);
-static int fsu_or_linux_thread_fetch_registers (void);
-static long fsu_or_linux_thread_get_current_thread (ptid_t);
-#define THREAD_FETCH_REGISTERS fsu_or_linux_thread_fetch_registers
-#define GET_CURRENT_THREAD(PTID) fsu_or_linux_thread_get_current_thread (PTID)
-#define PTHREAD_KERN "pthread_kern"
-#endif
-
-#ifdef I386_GNULINUX_TARGET
-extern td_thrinfo_t thread_db_pid_to_thread_info (int pid);
-extern int thread_db_tid_to_pid (void *tid);
-#endif
-
-#if defined(VXWORKS_TARGET)
-#define GET_CURRENT_THREAD(PTID) (unsigned long) ptid_get_pid (PTID)
-#define THREAD_FETCH_REGISTERS() (-1)
-
-#elif defined (__WIN32__) || defined (__CYGWIN__) || defined (hpux)
-#define GET_CURRENT_THREAD(PTID) ptid_get_pid (PTID)
-#define THREAD_FETCH_REGISTERS() (-1)
-#endif
-
-#if defined (HAVE_SPYTHREAD)
-#define GET_CURRENT_THREAD(PTID) (unsigned long) TIDGET (PTID)
-#endif
-
-#if !defined(GET_CURRENT_THREAD)
-#define GET_CURRENT_THREAD(PTID) (unsigned long) ptid_get_tid (PTID)
-#endif
-
-#if !defined(THREAD_FETCH_REGISTERS)
-#define THREAD_FETCH_REGISTERS() (target_fetch_registers (-1), 0)
-#endif
-
-#if !defined(SAVE_TASK_REGISTERS)
-#define SAVE_TASK_REGISTERS(task)
-#define RESTORE_TASK_REGISTERS(task)
-#endif
-
-#if !defined(SPECIAL_THREAD_SUPPORT_ACTIVE)
-#define SPECIAL_THREAD_SUPPORT_ACTIVE() 0
-#endif
+/* This module's per-program-space data. */
-#define KNOWN_TASKS_NAME "system__tasking__debug__known_tasks"
+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;
-#define READ_MEMORY(addr, var) read_memory (addr, (char *) &var, sizeof (var))
-
-/* If defined to 1, means that the thread ptids maintained by core GDB
- follow this format : first field (pid) contains the tid
- second field (lwp) contains 0
- third field (tid) contains 0 */
-#ifndef THREAD_PTID_CONTAINS_TID_NULL_NULL
-#define THREAD_PTID_CONTAINS_TID_NULL_NULL (0)
-#endif
-
-/* If defined to 1, means that the thread ptids maintained by core GDB
- follow this format: first field (pid) contains the LWP id
- second field (lwp) contains 0
- third field (tid) contains 0 */
-#ifndef THREAD_PTID_CONTAINS_LWP_NULL_NULL
-#define THREAD_PTID_CONTAINS_LWP_NULL_NULL (0)
-#endif
-
-/* If defined to 1, means that the thread ptids maintained by core GDB
- follow this format: first field (pid) contains the PID
- second field (lwp) contains 0
- third field (tid) contains the TID */
-#ifndef THREAD_PTID_CONTAINS_PID_NULL_TID
-#define THREAD_PTID_CONTAINS_PID_NULL_TID (0)
-#endif
-
-/* If defined to 1, means that the thread ptids maintained by core GDB
- follow this format: first field (pid) contains the PID
- second field (lwp) contains the TID
- third field (tid) contains the 0 */
-
-#ifndef THREAD_PTID_CONTAINS_PID_TID_NULL
-#define THREAD_PTID_CONTAINS_PID_TID_NULL (0)
-#endif
-
-/* If defined to 1, means that the thread id is not stored in the tid
- field of the task_ptid, but rather in the lwp field. */
-#ifndef ADA_THREAD_ID_IN_LWP
-#define ADA_THREAD_ID_IN_LWP (0)
-#endif
-
-static int task_ptid_get_pid (task_ptid_t task_ptid);
-static long task_ptid_get_lwp (task_ptid_t task_ptid);
-static long task_ptid_get_tid (task_ptid_t task_ptid);
-static task_ptid_t task_ptid_build (int pid, long lwp, long tid);
-static ptid_t task_ptid_get_ptid (task_ptid_t task_ptid);
-static long task_ptid_get_thread_id (task_ptid_t task_ptid);
-
-static int task_is_alive (enum task_states state);
-static CORE_ADDR get_self_id (ptid_t);
-static int get_entry_number (CORE_ADDR);
-static void get_tcb_types_info (struct type **atcb_type,
- struct type **atcb_common_type,
- struct type **atcb_ll_type,
- struct tcb_fieldnos *atcb_fieldnos);
-static void get_tcb_call_type_info (struct type **atcb_call_type,
- int *atcb_call_self_fieldno);
-static CORE_ADDR get_known_tasks_addr (void);
-static int read_known_tasks_array (void);
-static void value_as_string (char *dest, struct value *val, int length);
-static struct task_control_block read_atcb (CORE_ADDR atcb_addr);
-static CORE_ADDR read_caller (const CORE_ADDR call);
-static void display_current_task_id (void);
-static void task_command_1 (char *tidstr, int from_tty);
-
-/* Ada-tasks observers. */
-
-static void normal_stop_notification (void);
-static void ada_tasks_attach_observers (void);
-
-/* Global visible variables */
-
-int ada__tasks_check_symbol_table = 1;
-CORE_ADDR pthread_kern_addr = 0;
-struct task_entry *task_list = NULL;
-
-/* Local global variables. */
-
-/* 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;
-
-#if defined (__fsu__) || (defined(__alpha__) && defined(__osf__) && !defined(VXWORKS_TARGET))
-gdb_gregset_t gregset_saved;
-gdb_fpregset_t fpregset_saved;
-#endif
-
-/* The maximum number of tasks known to the Ada runtime */
-static const int MAX_NUMBER_OF_KNOWN_TASKS = 1000;
+ /* The ATCB record type. */
+ struct type *atcb_type;
-/* the current task, as seen by the user. Modified everytime the user
- does a task switch. */
-static int current_task = -1;
-
-unsigned long current_thread;
-
-/* The task where the debugger stopped, giving control back to the user.
- Not affected by task switching. Used to restore the registers before
- continuing the inferior. */
-int current_task_id = -1;
-
-static char *task_states[] = {
- "Unactivated",
- "Runnable",
- "Terminated",
- "Child Activation Wait",
- "Accept Statement",
- "Waiting on entry call",
- "Async Select Wait",
- "Delay Sleep",
- "Child Termination Wait",
- "Wait Child in Term Alt",
- "",
- "",
- "",
- "",
- "Asynchronous Hold"
-};
+ /* The ATCB "Common" component type. */
+ struct type *atcb_common_type;
-/* Global internal types */
-
-static char *long_task_states[] = {
- "Unactivated",
- "Runnable",
- "Terminated",
- "Waiting for child activation",
- "Blocked in accept statement",
- "Waiting on entry call",
- "Asynchronous Selective Wait",
- "Delay Sleep",
- "Waiting for children termination",
- "Waiting for children in terminate alternative",
- "",
- "",
- "",
- "",
- "Asynchronous Hold"
+ /* 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;
};
-/* Global internal variables */
+/* Key to our per-program-space data. */
+static const struct program_space_data *ada_tasks_pspace_data_handle;
-static int highest_task_num = 0;
-static int thread_support = 0; /* 1 if the thread library in use is
- supported. FIXME: Not reinitialized
- properly when program reloaded.
- */
-#ifdef __fsu__
-static int
-fsu_or_linux_thread_fetch_registers (void)
+typedef struct ada_task_info ada_task_info_s;
+DEF_VEC_O(ada_task_info_s);
+
+/* The kind of data structure used by the runtime to store the list
+ of Ada tasks. */
+
+enum ada_known_tasks_kind
{
- if (pthread_kern_addr != 0)
- return fsu_thread_fetch_registers ();
+ /* 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,
+};
- target_fetch_registers (-1);
- return 0L;
-}
+/* This module's per-inferior data. */
-static long
-fsu_or_linux_thread_get_current_thread (ptid_t ptid)
+struct ada_tasks_inferior_data
{
- if (pthread_kern_addr != 0)
- return fsu_thread_get_current_thread ();
+ /* 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;
+};
- return ptid_get_tid (ptid);
-}
+/* Key to our per-inferior data. */
+static const struct inferior_data *ada_tasks_inferior_data_handle;
-#endif /* __fsu__ */
+/* Return the ada-tasks module's data for the given program space (PSPACE).
+ If none is found, add a zero'ed one now.
-static int
-add_task_entry (CORE_ADDR p_task_id, int index)
-{
- struct task_entry *new_task_entry = NULL;
- struct task_entry *pt;
-
- highest_task_num++;
- new_task_entry = xmalloc (sizeof (struct task_entry));
- new_task_entry->task_num = highest_task_num;
- new_task_entry->task_id = p_task_id;
- new_task_entry->atcb = read_atcb (p_task_id);
- new_task_entry->known_tasks_index = index;
- new_task_entry->task_ptid =
- task_ptid_build (ptid_get_pid (inferior_ptid), /* ? */
- TASK_LWP (new_task_entry->atcb),
- new_task_entry->atcb.thread);
- new_task_entry->next_task = NULL;
- pt = task_list;
- if (pt)
- {
- while (pt->next_task)
- pt = pt->next_task;
- pt->next_task = new_task_entry;
- pt->stack_per = 0;
- }
- else
- task_list = new_task_entry;
- return new_task_entry->task_num;
-}
+ This function always returns a valid object. */
-static int
-get_entry_number (CORE_ADDR p_task_id)
+static struct ada_tasks_pspace_data *
+get_ada_tasks_pspace_data (struct program_space *pspace)
{
- struct task_entry *pt;
+ struct ada_tasks_pspace_data *data;
- pt = task_list;
- while (pt != NULL)
+ data = program_space_data (pspace, ada_tasks_pspace_data_handle);
+ if (data == NULL)
{
- if (pt->task_id == p_task_id)
- return pt->task_num;
- pt = pt->next_task;
+ data = XZALLOC (struct ada_tasks_pspace_data);
+ set_program_space_data (pspace, ada_tasks_pspace_data_handle, data);
}
- return 0;
+
+ return data;
}
-static struct task_entry *
-get_thread_entry_vptr (long thread)
-{
- struct task_entry *pt;
+/* Return the ada-tasks module's data for the given inferior (INF).
+ If none is found, add a zero'ed one now.
- pt = task_list;
- while (pt != NULL)
- {
- if (task_ptid_get_thread_id (pt->task_ptid) == thread)
- return pt;
- pt = pt->next_task;
- }
- return 0;
-}
+ 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 task_entry *
-get_entry_vptr (int p_task_num)
+static struct ada_tasks_inferior_data *
+get_ada_tasks_inferior_data (struct inferior *inf)
{
- struct task_entry *pt;
+ struct ada_tasks_inferior_data *data;
- pt = task_list;
- while (pt)
+ data = inferior_data (inf, ada_tasks_inferior_data_handle);
+ if (data == NULL)
{
- if (pt->task_num == p_task_num)
- return pt;
- pt = pt->next_task;
+ data = XZALLOC (struct ada_tasks_inferior_data);
+ set_inferior_data (inf, ada_tasks_inferior_data_handle, data);
}
- return NULL;
+
+ return data;
}
-void
-init_task_list (void)
+/* Return the task number of the task whose ptid is PTID, or zero
+ if the task could not be found. */
+
+int
+ada_get_task_number (ptid_t ptid)
{
- struct task_entry *pt, *old_pt;
+ int i;
+ struct inferior *inf = find_inferior_pid (ptid_get_pid (ptid));
+ struct ada_tasks_inferior_data *data;
- target_find_new_threads ();
+ gdb_assert (inf != NULL);
+ data = get_ada_tasks_inferior_data (inf);
- pt = task_list;
- while (pt)
- {
- old_pt = pt;
- pt = pt->next_task;
- xfree (old_pt);
- };
- task_list = NULL;
- highest_task_num = 0;
-}
+ 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;
-int
-valid_task_id (int task)
-{
- return get_entry_vptr (task) != NULL;
+ return 0; /* No matching task found. */
}
-/* Return the pid of a given task ptid. */
-
+/* 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
-task_ptid_get_pid (task_ptid_t task_ptid)
+get_task_number_from_id (CORE_ADDR task_id, struct inferior *inf)
{
- return task_ptid.pid;
-}
+ struct ada_tasks_inferior_data *data = get_ada_tasks_inferior_data (inf);
+ int i;
-/* Return the lwp of a given task ptid. */
+ 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, data->task_list, i);
-static long
-task_ptid_get_lwp (task_ptid_t task_ptid)
-{
- return task_ptid.lwp;
+ if (task_info->task_id == task_id)
+ return i + 1;
+ }
+
+ /* Task not found. Return 0. */
+ return 0;
}
-/* Return the tid of a given task ptid. */
+/* Return non-zero if TASK_NUM is a valid task number. */
-static long
-task_ptid_get_tid (task_ptid_t task_ptid)
+int
+valid_task_id (int task_num)
{
- return task_ptid.tid;
+ 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, data->task_list));
}
-/* Build a task ptid from the associated pid, lwp, and tid. */
+/* Return non-zero iff the task STATE corresponds to a non-terminated
+ task state. */
-static task_ptid_t
-task_ptid_build (int pid, long lwp, long tid)
+static int
+ada_task_is_alive (struct ada_task_info *task_info)
{
- task_ptid_t task_ptid;
-
- task_ptid.pid = pid;
- task_ptid.lwp = lwp;
- task_ptid.tid = tid;
- return task_ptid;
+ return (task_info->state != Terminated);
}
-/* Translate a task ptid into a ptid (the ptid maintained by core GDB).
-
- On most platforms, they are equivalent, and this function can be
- regarded as the identity. However, there are other platforms where
- the task ptid and the ptid are not equivalent. For instance, the task
- LWP value is sometimes stored by GDB-core as a pid! This translation
- therefore becomes necessary before invoking the GDB thread services. */
+/* Call the ITERATOR function once for each Ada task that hasn't been
+ terminated yet. */
-static ptid_t
-task_ptid_get_ptid (task_ptid_t task_ptid)
+void
+iterate_over_live_ada_tasks (ada_task_list_iterator_ftype *iterator)
{
- ptid_t ptid;
+ int i, nb_tasks;
+ struct ada_task_info *task;
+ struct ada_tasks_inferior_data *data;
- if (THREAD_PTID_CONTAINS_TID_NULL_NULL)
- ptid = ptid_build (task_ptid_get_tid (task_ptid), 0, 0);
- else if (THREAD_PTID_CONTAINS_LWP_NULL_NULL)
- ptid = ptid_build (task_ptid_get_lwp (task_ptid), 0, 0);
- else if (THREAD_PTID_CONTAINS_PID_NULL_TID)
- ptid = ptid_build (task_ptid_get_pid (task_ptid),
- 0, task_ptid_get_tid (task_ptid));
- else if (THREAD_PTID_CONTAINS_PID_TID_NULL)
- ptid = ptid_build (task_ptid_get_pid (task_ptid),
- task_ptid_get_tid (task_ptid), 0);
- else
- ptid = ptid_build (task_ptid_get_pid (task_ptid),
- task_ptid_get_lwp (task_ptid),
- task_ptid_get_tid (task_ptid));
+ ada_build_task_list ();
+ data = get_ada_tasks_inferior_data (current_inferior ());
+ nb_tasks = VEC_length (ada_task_info_s, data->task_list);
- return ptid;
+ 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 and return the thread_id for the given TASK_PTID. */
+/* Extract the contents of the value as a string whose length is LENGTH,
+ and store the result in DEST. */
-static long
-task_ptid_get_thread_id (task_ptid_t task_ptid)
+static void
+value_as_string (char *dest, struct value *val, int length)
{
- /* On most platforms, the thread_id is stored in task_ptid.tid.
- Unfortunately, some other platforms store it as the task_ptid.lwp... */
-
- if (ADA_THREAD_ID_IN_LWP)
- return task_ptid_get_lwp (task_ptid);
- else
- return task_ptid_get_tid (task_ptid);
+ memcpy (dest, value_contents (val), length);
+ dest[length] = '\0';
}
-/* Return non-zero iff the task STATE corresponds to a non-terminated
- task state. */
+/* Extract the string image from the fat string corresponding to VAL,
+ and store it in DEST. If the string length is greater than MAX_LEN,
+ then truncate the result to the first MAX_LEN characters of the fat
+ string. */
-static int
-task_is_alive (enum task_states state)
+static void
+read_fat_string_value (char *dest, struct value *val, int max_len)
{
- return (state != Terminated);
-}
+ struct value *array_val;
+ struct value *bounds_val;
+ int len;
-static CORE_ADDR
-get_self_id (ptid_t ptid)
-{
-#ifdef GNAT_GDB
- struct task_entry *ent;
+ /* The following variables are made static to avoid recomputing them
+ each time this function is called. */
+ static int initialize_fieldnos = 1;
+ static int array_fieldno;
+ static int bounds_fieldno;
+ static int upper_bound_fieldno;
-#if !((defined(sun) && defined(__SVR4)) || defined(VXWORKS_TARGET) || defined(__WIN32__))
- if (thread_support)
-#endif
+ /* Get the index of the fields that we will need to read in order
+ to extract the string from the fat string. */
+ if (initialize_fieldnos)
{
- ent = get_thread_entry_vptr (GET_CURRENT_THREAD (ptid));
- return ent ? ent->task_id : 0;
- }
-#endif
+ struct type *type = value_type (val);
+ struct type *bounds_type;
- /* FIXME: calling a function in the inferior with a multithreaded application
- is not reliable, so return a null address if there is no safe way to
- get the current task */
- return 0;
-}
+ array_fieldno = ada_get_field_index (type, "P_ARRAY", 0);
+ bounds_fieldno = ada_get_field_index (type, "P_BOUNDS", 0);
-int
-ada_get_current_task (ptid_t ptid)
-{
- int result;
+ 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"));
+ upper_bound_fieldno = ada_get_field_index (bounds_type, "UB0", 0);
+
+ initialize_fieldnos = 0;
+ }
- if (current_language->la_language != language_ada)
- return -1;
+ /* Get the size of the task image by checking the value of the bounds.
+ The lower bound is always 1, so we only need to read the upper bound. */
+ bounds_val = value_ind (value_field (val, bounds_fieldno));
+ len = value_as_long (value_field (bounds_val, upper_bound_fieldno));
- result = get_entry_number (get_self_id (ptid));
+ /* Make sure that we do not read more than max_len characters... */
+ if (len > max_len)
+ len = max_len;
+
+ /* Extract LEN characters from the fat string. */
+ array_val = value_ind (value_field (val, array_fieldno));
+ read_memory (value_address (array_val), dest, len);
- /* return -1 if not found */
- return result == 0 ? -1 : result;
+ /* Add the NUL character to close the string. */
+ dest[len] = '\0';
}
/* Get from the debugging information the type description of all types
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 tcb_fieldnos *atcb_fieldnos)
+get_tcb_types_info (void)
{
struct type *type;
struct type *common_type;
struct type *ll_type;
- struct tcb_fieldnos fieldnos;
+ struct type *call_type;
+ struct atcb_fieldnos fieldnos;
+ struct ada_tasks_pspace_data *pspace_data;
-#ifndef ADA_RETAIN_DOTS
const char *atcb_name = "system__tasking__ada_task_control_block___XVE";
+ const char *atcb_name_fixed = "system__tasking__ada_task_control_block";
const char *common_atcb_name = "system__tasking__common_atcb";
const char *private_data_name = "system__task_primitives__private_data";
-#else
- const char *atcb_name = "system.tasking.ada_task_control_block___XVE";
- const char *common_atcb_name = "system.tasking.common_atcb";
- const char *private_data_name = "system.task_primitives.private_data";
-#endif
-
- const struct symbol *atcb_sym =
- lookup_symbol (atcb_name, NULL, VAR_DOMAIN, NULL, NULL);
+ 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_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, 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, NULL);
+ lookup_symbol_in_language (private_data_name, NULL, VAR_DOMAIN,
+ language_c, NULL);
+ const struct symbol *entry_call_record_sym =
+ lookup_symbol_in_language (entry_call_record_name, NULL, VAR_DOMAIN,
+ language_c, NULL);
if (atcb_sym == NULL || atcb_sym->type == NULL)
- error ("Can not find Ada_Task_Control_Block type. Aborting");
+ {
+ /* In Ravenscar run-time libs, the ATCB does not have a dynamic
+ size, so the symbol name differs. */
+ 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"));
+
+ type = atcb_sym->type;
+ }
+ else
+ {
+ /* Get a static representation of the type record
+ Ada_Task_Control_Block. */
+ type = atcb_sym->type;
+ type = ada_template_to_fixed_record_type_1 (type, NULL, 0, NULL, 0);
+ }
+
if (common_atcb_sym == NULL || common_atcb_sym->type == NULL)
- error ("Can not find Common_ATCB type. Aborting");
+ error (_("Cannot find Common_ATCB type. Aborting"));
if (private_data_sym == NULL || private_data_sym->type == NULL)
- error ("Can not find Private_Data type. Aborting");
-
- /* Get a static representation of the type record Ada_Task_Control_Block. */
- type = atcb_sym->type;
- type = ada_template_to_fixed_record_type_1 (type, NULL, 0, NULL, 0);
+ error (_("Cannot find Private_Data type. Aborting"));
+ if (entry_call_record_sym == NULL || entry_call_record_sym->type == NULL)
+ error (_("Cannot find Entry_Call_Record type. Aborting"));
/* Get the type for Ada_Task_Control_Block.Common. */
common_type = common_atcb_sym->type;
/* Get the type for Ada_Task_Control_Bloc.Common.Call.LL. */
ll_type = private_data_sym->type;
+ /* Get the type for Common_ATCB.Call.all. */
+ call_type = entry_call_record_sym->type;
+
/* Get the field indices. */
fieldnos.common = ada_get_field_index (type, "common", 0);
+ fieldnos.entry_calls = ada_get_field_index (type, "entry_calls", 1);
+ fieldnos.atc_nesting_level =
+ ada_get_field_index (type, "atc_nesting_level", 1);
fieldnos.state = ada_get_field_index (common_type, "state", 0);
- fieldnos.parent = ada_get_field_index (common_type, "parent", 0);
+ fieldnos.parent = ada_get_field_index (common_type, "parent", 1);
fieldnos.priority = ada_get_field_index (common_type, "base_priority", 0);
- fieldnos.image = ada_get_field_index (common_type, "task_image", 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.call = ada_get_field_index (common_type, "call", 0);
+ 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);
fieldnos.ll_lwp = ada_get_field_index (ll_type, "lwp", 1);
+ fieldnos.call_self = ada_get_field_index (call_type, "self", 0);
/* On certain platforms such as x86-windows, the "lwp" field has been
named "thread_id". This field will likely be renamed in the future,
/* 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_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;
}
-/* Get from the debugging information the type description of the
- record type Entry_Call_Record (this is the type of the field
- Call.all in the Common_ATCB record type). Also return the index
- of the field "Self" in Entry_Call_Record.
+/* Build the PTID of the task from its COMMON_VALUE, which is the "Common"
+ component of its ATCB record. This PTID needs to match the PTID used
+ by the thread layer. */
- Error handling: Any data missing from the debugging info will cause
- an error to be raised, and none of the return values to be set.
- Users of this function can depend on the fact that all or none of the
- return values will be set. */
+static ptid_t
+ptid_from_atcb_common (struct value *common_value)
+{
+ long thread = 0;
+ 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, pspace_data->atcb_fieldno.ll);
+
+ 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);
+
+ return ptid;
+}
+
+/* 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
+ TASK_INFO. */
static void
-get_tcb_call_type_info (struct type **atcb_call_type,
- int *atcb_call_self_fieldno)
+read_atcb (CORE_ADDR task_id, struct ada_task_info *task_info)
{
- struct type *call_type;
- int call_self_fieldno;
+ struct value *tcb_value;
+ struct value *common_value;
+ struct value *atc_nesting_level_value;
+ struct value *entry_calls_value;
+ 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);
-#ifndef ADA_RETAIN_DOTS
- const char *entry_call_record_name = "system__tasking__entry_call_record";
-#else
- const char *entry_call_record_name = "system.tasking.entry_call_record";
-#endif
+ if (!pspace_data->initialized_p)
+ get_tcb_types_info ();
- const struct symbol *entry_call_record_sym =
- lookup_symbol (entry_call_record_name, NULL, VAR_DOMAIN, NULL, NULL);
+ 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);
- if (entry_call_record_sym == NULL || entry_call_record_sym->type == NULL)
- error ("Can not find Entry_Call_Record type. Aborting");
+ /* Fill in the task_id. */
- call_type = entry_call_record_sym->type;
- call_self_fieldno = ada_get_field_index (call_type, "self", 0);
+ task_info->task_id = task_id;
- /* Set all the out parameters all at once, now that we are certain
- that there are no potential error() anymore. */
- *atcb_call_type = call_type;
- *atcb_call_self_fieldno = call_self_fieldno;
-}
+ /* Compute the name of the task.
-/* 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.
+ 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
+ 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
+ is selected depending on the existence of this field.
- 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. */
+ 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 just give a dummy name. */
-static CORE_ADDR
-get_known_tasks_addr (void)
-{
- static CORE_ADDR known_tasks_addr = 0;
-
- if (ada__tasks_check_symbol_table)
+ if (pspace_data->atcb_fieldno.image_len == -1)
{
- struct symbol *sym;
- struct minimal_symbol *msym;
-
- thread_support = 0;
-#if (defined(__alpha__) && defined(__osf__) & !defined(VXWORKS_TARGET)) \
- || defined (_AIX) || defined (__CYGWIN__)
- thread_support = 1;
-#elif defined (__fsu__)
- msym = lookup_minimal_symbol (PTHREAD_KERN, NULL, NULL);
- if (msym != NULL)
- {
- pthread_kern_addr = SYMBOL_VALUE_ADDRESS (msym);
- thread_support = 1;
- }
-#elif defined (HAVE_SPYTHREAD)
- thread_support = libspy_enabled;
-#endif
-
-#ifdef I386_GNULINUX_TARGET
- /* We support threads via the Linux Threads... */
- thread_support = 1;
-#endif
-
- msym = lookup_minimal_symbol (KNOWN_TASKS_NAME, NULL, NULL);
- if (msym != NULL)
- known_tasks_addr = SYMBOL_VALUE_ADDRESS (msym);
+ if (pspace_data->atcb_fieldno.image >= 0)
+ read_fat_string_value (task_info->name,
+ value_field (common_value,
+ pspace_data->atcb_fieldno.image),
+ sizeof (task_info->name) - 1);
else
-#ifndef VXWORKS_TARGET
- return 0;
-#else
- {
- if (target_lookup_symbol (KNOWN_TASKS_NAME, &known_tasks_addr) != 0)
- return 0;
- }
-#endif
-
- /* 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;
+ strcpy (task_info->name, ravenscar_task_name);
+ }
+ else
+ {
+ 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,
+ pspace_data->atcb_fieldno.image),
+ len);
}
- return known_tasks_addr;
-}
+ /* Compute the task state and priority. */
-/* Read the Known_Tasks array from the inferior memory, and store
- it in task_list. Return non-zero upon success. */
+ 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,
+ pspace_data->atcb_fieldno.priority));
-static int
-read_known_tasks_array (void)
-{
- const int target_ptr_byte = TARGET_PTR_BIT / TARGET_CHAR_BIT;
- const int temp_tasks_size = target_ptr_byte * MAX_NUMBER_OF_KNOWN_TASKS;
- const CORE_ADDR known_tasks_addr = get_known_tasks_addr ();
- char *temp_tasks = (char *) alloca (temp_tasks_size);
- CORE_ADDR temp_task;
- int i;
+ /* If the ATCB contains some information about the parent task,
+ then compute it as well. Otherwise, zero. */
- /* Step 1: Clear the current list, if any. */
- init_task_list ();
+ if (pspace_data->atcb_fieldno.parent >= 0)
+ task_info->parent =
+ value_as_address (value_field (common_value,
+ pspace_data->atcb_fieldno.parent));
+ else
+ task_info->parent = 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;
+ /* If the ATCB contains some information about entry calls, then
+ compute the "called_task" as well. Otherwise, zero. */
- /* Step 2: Build a new list by reading the ATCBs from the Known_Tasks
- array in the Ada runtime. */
- read_memory (known_tasks_addr, temp_tasks, temp_tasks_size);
- for (i = 0; i < MAX_NUMBER_OF_KNOWN_TASKS; i++)
+ 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, pspace_data->atcb_fieldno.atc_nesting_level);
+ entry_calls_value =
+ 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));
+ called_task_fieldno =
+ 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));
+ }
+ else
{
- temp_task = extract_typed_address (temp_tasks + i * target_ptr_byte,
- builtin_type_void_data_ptr);
+ task_info->called_task = 0;
+ }
- if (temp_task != 0)
+ /* If the ATCB cotnains some information about RV callers,
+ then compute the "caller_task". Otherwise, zero. */
+
+ task_info->caller_task = 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,
+ pspace_data->atcb_fieldno.call));
+ struct value *call_val;
+
+ if (call != 0)
{
- if (get_entry_number (temp_task) == 0)
- add_task_entry (temp_task, i);
+ call_val =
+ value_from_contents_and_address (pspace_data->atcb_call_type,
+ NULL, call);
+ task_info->caller_task =
+ value_as_address
+ (value_field (call_val, pspace_data->atcb_fieldno.call_self));
}
}
- /* 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;
+ /* 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;
}
-/* 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 ATCB info of the given task (identified by TASK_ID), and
+ add the result to the given inferior's TASK_LIST. */
-int
-ada_build_task_list (void)
+static void
+add_ada_task (CORE_ADDR task_id, struct inferior *inf)
{
- if (!target_has_stack)
- error ("No stack");
+ struct ada_task_info task_info;
+ struct ada_tasks_inferior_data *data = get_ada_tasks_inferior_data (inf);
- if (stale_task_list_p)
- read_known_tasks_array ();
+ read_atcb (task_id, &task_info);
+ VEC_safe_push (ada_task_info_s, data->task_list, &task_info);
+}
- if (task_list == NULL)
+/* Read the Known_Tasks array from the inferior memory, and store
+ it in the current inferior's TASK_LIST. Return non-zero upon success. */
+
+static int
+read_known_tasks_array (CORE_ADDR known_tasks_addr)
+{
+ const int target_ptr_byte =
+ gdbarch_ptr_bit (target_gdbarch) / TARGET_CHAR_BIT;
+ const int known_tasks_size = target_ptr_byte * MAX_NUMBER_OF_KNOWN_TASKS;
+ gdb_byte *known_tasks = alloca (known_tasks_size);
+ int i;
+
+ /* 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++)
{
- printf_filtered ("Your application does not use any Ada task.\n");
- return 0;
+ struct type *data_ptr_type =
+ builtin_type (target_gdbarch)->builtin_data_ptr;
+ CORE_ADDR task_id =
+ extract_typed_address (known_tasks + i * target_ptr_byte,
+ data_ptr_type);
+
+ if (task_id != 0)
+ add_ada_task (task_id, current_inferior ());
}
return 1;
}
-/* Extract the contents of the value as a string whose length is LENGTH,
- and store the result in DEST. */
+/* Read the known tasks from the inferior memory, and store it in
+ the current inferior's TASK_LIST. Return non-zero upon success. */
-static void
-value_as_string (char *dest, struct value *val, int length)
-{
- memcpy (dest, VALUE_CONTENTS (val), length);
-}
-
-/* Extract the string image from the fat string corresponding to VAL,
- and store it in DEST. The length of the string is stored in LEN. If
- the string length is greater than MAX_LEN, then truncate the result
- to the first MAX_LEN characters of the fat string. */
-
-static void
-read_fat_string_value (char *dest, int *len, struct value *val, int max_len)
+static int
+read_known_tasks_list (CORE_ADDR known_tasks_addr)
{
- struct value *array_val;
- struct value *bounds_val;
-
- /* The following variables are made static to avoid recomputing them
- each time this function is called. */
- static int initialize_fieldnos = 1;
- static int array_fieldno;
- static int bounds_fieldno;
- static int upper_bound_fieldno;
+ 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;
- /* Get the index of the fields that we will need to read in order
- to extract the string from the fat string. */
- if (initialize_fieldnos)
+ /* 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)
{
- struct type *type = VALUE_TYPE (val);
- struct type *bounds_type;
-
- array_fieldno = ada_get_field_index (type, "P_ARRAY", 0);
- bounds_fieldno = ada_get_field_index (type, "P_BOUNDS", 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));
+ }
- 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");
- upper_bound_fieldno = ada_get_field_index (bounds_type, "UB0", 0);
+ return 1;
+}
- initialize_fieldnos = 0;
- }
+/* 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. */
- /* Get the size of the task image by checking the value of the bounds.
- The lower bound is always 1, so we only need to read the upper bound. */
- bounds_val = value_ind (value_field (val, bounds_fieldno));
- *len = value_as_long (value_field (bounds_val, upper_bound_fieldno));
+static CORE_ADDR
+get_known_tasks_addr (const char *name)
+{
+ struct minimal_symbol *msym;
- /* Make sure that we do not read more than max_len characters... */
- if (*len > max_len)
- *len = max_len;
+ msym = lookup_minimal_symbol (name, NULL, NULL);
+ if (msym == NULL)
+ return 0;
- /* Extract LEN characters from the fat string. */
- array_val = value_ind (value_field (val, array_fieldno));
- read_memory (VALUE_ADDRESS (array_val), dest, *len);
+ return SYMBOL_VALUE_ADDRESS (msym);
}
-/* Read the ATCB stored at ATCB_ADDR from the inferior memory. */
+/* 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 struct task_control_block
-read_atcb (CORE_ADDR atcb_addr)
+static void
+ada_set_current_inferior_known_tasks_addr (struct ada_tasks_inferior_data *data)
{
- /* The type description for the ATCB record and subrecords, and
- the associated tcb_fieldnos. For efficiency reasons, these are made
- static so that we can compute them only once the first time and
- reuse them later. */
- static struct type *atcb_type = NULL;
- static struct type *atcb_common_type = NULL;
- static struct type *atcb_ll_type = NULL;
- static struct tcb_fieldnos fieldno;
-
- struct task_control_block result;
- struct value *tcb_value;
- struct value *ll_value;
-
- if (atcb_type == NULL)
- get_tcb_types_info (&atcb_type, &atcb_common_type, &atcb_ll_type, &fieldno);
+ CORE_ADDR known_tasks_addr;
- tcb_value = value_from_contents_and_address (atcb_type, NULL, atcb_addr);
- tcb_value = value_field (tcb_value, fieldno.common);
-
- result.state = value_as_long (value_field (tcb_value, fieldno.state));
- result.parent = value_as_address (value_field (tcb_value, fieldno.parent));
- result.priority = value_as_long (value_field (tcb_value, fieldno.priority));
+ if (data->known_tasks_kind != ADA_TASKS_UNKNOWN)
+ return;
- /* 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
- 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
- is selected depending on the existence of this field. */
- if (fieldno.image_len == -1)
+ known_tasks_addr = get_known_tasks_addr (KNOWN_TASKS_NAME);
+ if (known_tasks_addr != 0)
{
- read_fat_string_value (result.image, &result.image_len,
- value_field (tcb_value, fieldno.image),
- sizeof (result.image));
+ data->known_tasks_kind = ADA_TASKS_ARRAY;
+ data->known_tasks_addr = known_tasks_addr;
+ return;
}
- else
+
+ known_tasks_addr = get_known_tasks_addr (KNOWN_TASKS_LIST);
+ if (known_tasks_addr != 0)
{
- value_as_string (result.image, value_field (tcb_value, fieldno.image),
- sizeof (result.image));
- result.image_len =
- value_as_long (value_field (tcb_value, fieldno.image_len));
+ data->known_tasks_kind = ADA_TASKS_LIST;
+ data->known_tasks_addr = known_tasks_addr;
+ return;
}
- result.call = value_as_address (value_field (tcb_value, fieldno.call));
-
- ll_value = value_field (tcb_value, fieldno.ll);
- result.thread = value_as_address (value_field (ll_value, fieldno.ll_thread));
- if (fieldno.ll_lwp >= 0)
- result.lwp = value_as_address (value_field (ll_value, fieldno.ll_lwp));
- else
- result.lwp = 0;
-
- return result;
+ data->known_tasks_kind = ADA_TASKS_NOT_FOUND;
+ data->known_tasks_addr = 0;
}
-/* Read the ID of the task with which a task is attempting a rendez-vous
- from the address of its Entry_Call_Record in the Ada TCB.
- If the address of the Entry_Call_Record is null, then return null. */
+/* 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. */
-static CORE_ADDR
-read_caller (const CORE_ADDR call)
+static int
+read_known_tasks (void)
{
- /* The type description for the Entry_Call_Record, and the index of
- the field "Self". For efficiency reasons, these are made static
- so that we can compute them only once the first time and reuse them
- later. */
- static struct type *atcb_call_type;
- static int self_fieldno = -1;
+ struct ada_tasks_inferior_data *data =
+ get_ada_tasks_inferior_data (current_inferior ());
- struct value *call_value;
+ /* Step 1: Clear the current list, if necessary. */
+ VEC_truncate (ada_task_info_s, data->task_list, 0);
- if (call == 0)
- return 0;
+ /* 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);
- if (atcb_call_type == NULL)
- get_tcb_call_type_info (&atcb_call_type, &self_fieldno);
+ 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);
+ }
- call_value = value_from_contents_and_address (atcb_call_type, NULL, call);
- return value_as_address (value_field (call_value, self_fieldno));
+ /* 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;
}
-#if 0
-/* FIXME: Now modified and back in breakpoint.c */
-/* breakpoint_task_match (PC) returns true if the breakpoint at PC
- is valid for current task. */
+/* 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
-breakpoint_task_match (CORE_ADDR pc)
+ada_build_task_list (void)
{
- const int this_task = get_current_task ();
- const struct breakpoint *breakpoints = get_breakpoint_chain ();
- const struct breakpoint *b;
+ struct ada_tasks_inferior_data *data;
- for (b = breakpoints; b; b = b->next)
- {
- if (b->enable_state != bp_disabled
- && b->enable_state != bp_shlib_disabled
- && (b->address == 0 || b->address == pc)
- && (b->task == 0 || b->task == this_task))
- {
- return 1;
- }
- }
+ if (!target_has_stack)
+ error (_("Cannot inspect Ada tasks when program is not running"));
- return 0;
+ 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);
}
-#endif
-/* Print detailed information about specified task */
+/* 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_task (char *arg, int from_tty)
+print_ada_task_info (struct ui_out *uiout,
+ char *arg_str,
+ struct inferior *inf)
{
-#ifdef GNAT_GDB
- struct task_entry *pt, *pt2;
- CORE_ADDR caller;
- int num;
+ struct ada_tasks_inferior_data *data;
+ int taskno, nb_tasks;
+ int taskno_arg = 0;
+ struct cleanup *old_chain;
- if (current_language->la_language != language_ada)
+ if (ada_build_task_list () == 0)
{
- printf_filtered ("The current language does not support tasks.\n");
+ ui_out_message (uiout, 0,
+ _("Your application does not use any Ada tasks.\n"));
return;
}
- target_find_new_threads ();
-
- pt = get_entry_vptr (atoi (arg));
- if (pt == NULL)
+ 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);
+
+ for (taskno = 1; taskno <= nb_tasks; taskno++)
{
- printf_filtered ("Task %s not found.\n", arg);
- return;
- }
+ 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;
- /* print the Ada task id */
- printf_filtered ("Ada Task: %s\n", paddr_nz (pt->task_id));
+ gdb_assert (task_info != NULL);
- /* print the name of the task */
- if (pt->atcb.image_len != 0)
- printf_filtered ("Name: %.*s\n", pt->atcb.image_len, pt->atcb.image);
- else
- printf_filtered ("<no name>\n");
+ /* 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;
- /* print the thread id */
+ chain2 = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
- if (task_ptid_get_tid (pt->task_ptid) < 65536)
- printf_filtered
- ("Thread: %ld\n", (long int) task_ptid_get_tid (pt->task_ptid));
- else
- printf_filtered
- ("Thread: %#lx\n", (long int) task_ptid_get_tid (pt->task_ptid));
-
- if (task_ptid_get_lwp (pt->task_ptid) != 0)
- {
- if ((long) task_ptid_get_lwp (pt->task_ptid) < 65536)
- printf_filtered
- ("LWP: %ld\n", (long int) task_ptid_get_lwp (pt->task_ptid));
+ /* 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
- printf_filtered
- ("LWP: %#lx\n", (long int) task_ptid_get_lwp (pt->task_ptid));
- }
+ ui_out_field_skip (uiout, "current");
- /* print the parent gdb task id */
- num = get_entry_number (pt->atcb.parent);
- if (num != 0)
- {
- printf_filtered ("Parent: %d", num);
- pt2 = get_entry_vptr (num);
+ /* Print the task number. */
+ ui_out_field_int (uiout, "id", taskno);
- /* print the name of the task */
- if (pt2->atcb.image_len != 0)
- printf_filtered (" (%.*s)\n", pt2->atcb.image_len, pt2->atcb.image);
- else
- printf_filtered ("\n");
- }
- else
- printf_filtered ("No parent\n");
+ /* Print the Task ID. */
+ ui_out_field_fmt (uiout, "task-id", "%9lx", (long) task_info->task_id);
- /* print the base priority of the task */
- printf_filtered ("Base Priority: %d\n", pt->atcb.priority);
+ /* 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]);
- /* print the current state of the task */
+ /* Finally, print the task name. */
+ ui_out_field_fmt (uiout, "name",
+ "%s",
+ task_info->name[0] != '\0' ? task_info->name
+ : _("<no name>"));
- /* check if this task is accepting a rendezvous */
- caller = read_caller (pt->atcb.call);
- if (caller != 0)
- {
- num = get_entry_number (caller);
- printf_filtered ("Accepting rendezvous with %d", num);
-
- if (num != 0)
- {
- pt2 = get_entry_vptr (num);
-
- /* print the name of the task */
- if (pt2->atcb.image_len != 0) {
- printf_filtered (" (%.*s)\n", pt2->atcb.image_len, pt2->atcb.image);
- }
- else
- printf_filtered ("\n");
- }
- else
- printf_filtered ("\n");
+ ui_out_text (uiout, "\n");
+ do_cleanups (chain2);
}
- else
- printf_filtered ("State: %s\n", long_task_states[pt->atcb.state]);
-#endif
+
+ do_cleanups (old_chain);
}
-/* Print information about currently known tasks */
+/* Print a detailed description of the Ada task whose ID is TASKNO_STR
+ for the given inferior (INF). */
static void
-info_tasks (char *arg, int from_tty)
+info_task (struct ui_out *uiout, char *taskno_str, struct inferior *inf)
{
-#ifdef GNAT_GDB
- struct task_entry *pt;
- CORE_ADDR caller;
- long thread_id = 0L;
- int size;
- char car;
- ptid_t current_ptid;
-
-#if defined(__alpha__) && defined(__osf__) && !defined(VXWORKS_TARGET)
- pthreadTeb_t thr;
- gdb_gregset_t regs;
-#endif
-
- current_ptid = inferior_ptid;
-
-#if !((defined(sun) && defined(__SVR4)) || defined(VXWORKS_TARGET) || defined(__WIN32__) || defined (hpux))
- if (thread_support)
-#endif
- thread_id = GET_CURRENT_THREAD (inferior_ptid);
-
- /* print the header */
-
-#if defined(__alpha__) && defined(__osf__) && !defined(VXWORKS_TARGET)
- printf_filtered
- (" ID TID P-ID Pri Stack %% State Name\n");
-#else
- printf_filtered (" ID TID P-ID Pri State Name\n");
-#endif
-
- /* Now that we have a list of task id's, we can print them */
- pt = task_list;
- while (pt)
- {
- /* print a star if this task is the current one */
- if (thread_id)
-#if defined (__WIN32__) || defined (SGI) || defined (hpux)
- printf_filtered
- (task_ptid_get_lwp (pt->task_ptid) == thread_id ? "*" : " ");
-#else
- printf_filtered
- (task_ptid_get_thread_id (pt->task_ptid) == thread_id ? "*" : " ");
-#endif
-
- /* print the gdb task id */
- printf_filtered ("%3d", pt->task_num);
-
- /* print the Ada task id */
- printf_filtered (" %9lx", (long) pt->task_id);
-
- /* print the parent gdb task id */
- printf_filtered (" %4d", get_entry_number (pt->atcb.parent));
-
- /* print the base priority of the task */
- printf_filtered (" %3d", pt->atcb.priority);
-
-#if defined(__alpha__) && defined(__osf__) && !defined(VXWORKS_TARGET)
- if (pt->task_num == 1 || pt->atcb.state == Terminated)
- {
- printf_filtered (" Unknown");
- goto next;
- }
+ 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);
- READ_MEMORY (pt->atcb.thread, thr);
- switch_to_thread (task_ptid_get_ptid (pt->task_ptid));
- /* ??? Brobecker 2003-03-13: Not sure what the next line is used for.
- And even if useful, it should probably be replaced by call to
- task_ptid_get_thread_id. */
- current_thread = task_ptid_get_tid (pt->task_ptid);
- regs.regs[SP_REGNUM] = 0;
- if (dec_thread_get_registers (®s, NULL) == 0)
- {
- pt->stack_per = (100 * ((long) thr.__stack_base -
- regs.regs[SP_REGNUM])) / thr.__stack_size;
- /* if the thread is terminated but still there, the
- stack_base/size values are erroneous. Try to patch it */
- if (pt->stack_per < 0 || pt->stack_per > 100)
- pt->stack_per = 0;
- }
- else
- {
- /* Set stack_per to an invalid value to signal that we did not
- manage to compute its value. */
- pt->stack_per = -1;
- }
-
- /* print information about stack space used in the thread */
- if (thr.__stack_size < 1024 * 1024)
- {
- size = thr.__stack_size / 1024;
- car = 'K';
- }
- else if (thr.__stack_size < 1024 * 1024 * 1024)
- {
- size = thr.__stack_size / 1024 / 1024;
- car = 'M';
- }
- else /* Who knows... */
- {
- size = thr.__stack_size / 1024 / 1024 / 1024;
- car = 'G';
- }
+ if (ada_build_task_list () == 0)
+ {
+ ui_out_message (uiout, 0,
+ _("Your application does not use any Ada tasks.\n"));
+ return;
+ }
- /* print the stack usage in percent, if available. */
- if (pt->stack_per != -1)
- printf_filtered (" %4d%c %2d", size, car, pt->stack_per);
- else
- {
- /* This error is not serious enough that we should raise
- an internal error, but print '???' to make it unambiguous
- that we failed to compute this value. */
- printf_filtered (" ???");
- }
+ 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, data->task_list, taskno - 1);
- next:
-#endif
+ /* Print the Ada task ID. */
+ printf_filtered (_("Ada Task: %s\n"),
+ paddress (target_gdbarch, task_info->task_id));
- /* print the current state of the task */
+ /* Print the name of the task. */
+ if (task_info->name[0] != '\0')
+ printf_filtered (_("Name: %s\n"), task_info->name);
+ else
+ printf_filtered (_("<no name>\n"));
- /* check if this task is accepting a rendezvous */
- caller = read_caller (pt->atcb.call);
- if (caller != 0)
- printf_filtered (" Accepting RV with %-4d",
- get_entry_number (caller));
- else
- {
-#if defined (__WIN32__) || defined (SGI) || defined (hpux)
- if (pt->atcb.state == Runnable
- && (thread_id
- && task_ptid_get_lwp (pt->task_ptid) == thread_id))
-#else
- if (pt->atcb.state == Runnable
- && (thread_id
- && task_ptid_get_thread_id (pt->task_ptid) == thread_id))
-#endif
- /* Replace "Runnable" by "Running" if this is the current task */
- printf_filtered (" %-22s", "Running");
- else
- printf_filtered (" %-22s", task_states[pt->atcb.state]);
- }
+ /* Print the TID and LWP. */
+ printf_filtered (_("Thread: %#lx\n"), ptid_get_tid (task_info->ptid));
+ printf_filtered (_("LWP: %#lx\n"), ptid_get_lwp (task_info->ptid));
- /* finally, print the name of the task */
- if (pt->atcb.image_len != 0) {
- printf_filtered (" %.*s\n", pt->atcb.image_len, pt->atcb.image);
- }
- else
- printf_filtered (" <no name>\n");
+ /* Print who is the parent (if any). */
+ if (task_info->parent != 0)
+ 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, data->task_list, parent_taskno - 1);
- pt = pt->next_task;
+ printf_filtered (_("Parent: %d"), parent_taskno);
+ if (parent->name[0] != '\0')
+ printf_filtered (" (%s)", parent->name);
+ printf_filtered ("\n");
}
- if (!ptid_equal (inferior_ptid, current_ptid))
- switch_to_thread (current_ptid);
-#endif
-}
+ else
+ printf_filtered (_("No parent\n"));
-static void
-info_tasks_command (char *arg, int from_tty)
-{
- const int task_list_built = ada_build_task_list ();
+ /* Print the base priority. */
+ printf_filtered (_("Base Priority: %d\n"), task_info->priority);
- if (!task_list_built)
- return;
+ /* print the task current state. */
+ {
+ int target_taskno = 0;
- if (arg == NULL || *arg == '\000')
- info_tasks (arg, from_tty);
- else
- info_task (arg, from_tty);
-}
-
-/* Switch to task indicated by NEW_TASK. Return 0 iff successful. */
+ 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);
+ }
+ else if (task_info->state == Entry_Caller_Sleep && 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);
+ }
+ else
+ printf_filtered (_("State: %s"), _(long_task_states[task_info->state]));
-static int
-switch_to_task (struct task_entry *new_task)
-{
-#ifdef GNAT_GDB
- /* Raise an error if task-switching is currently not allowed. */
- if (!THREAD_SWITCH_ALLOWED ())
- error ("Task switching is currently not allowed.");
+ if (target_taskno)
+ {
+ struct ada_task_info *target_task_info =
+ VEC_index (ada_task_info_s, data->task_list, target_taskno - 1);
- if (!task_is_alive (new_task->atcb.state))
- error ("Can not switch to task %d: Task is no longer running",
- new_task->task_num);
+ if (target_task_info->name[0] != '\0')
+ printf_filtered (" (%s)", target_task_info->name);
+ }
- current_task = new_task->task_num;
- current_thread = task_ptid_get_thread_id (new_task->task_ptid);
+ printf_filtered ("\n");
+ }
+}
- if (current_task_id == -1)
- {
- SAVE_TASK_REGISTERS (new_task);
- current_task_id = ada_get_current_task (inferior_ptid);
- }
+/* If ARG is empty or null, then print a list of all Ada tasks.
+ Otherwise, print detailed information about the task whose ID
+ is ARG.
+
+ Does nothing if the program doesn't use Ada tasking. */
- if (SPECIAL_THREAD_SUPPORT_ACTIVE ())
- {
- /* FIXME: Integrate with switch_to_thread */
- int ret_code;
- flush_cached_frames ();
- registers_changed ();
- if (current_task == current_task_id)
- {
- RESTORE_TASK_REGISTERS (new_task);
- ret_code = 0;
- }
- else
- ret_code = THREAD_FETCH_REGISTERS ();
- if (ret_code == 0)
- stop_pc = read_pc ();
- select_frame (get_current_frame ());
- return ret_code;
- }
+static void
+info_tasks_command (char *arg, int from_tty)
+{
+ struct ui_out *uiout = current_uiout;
- switch_to_thread (task_ptid_get_ptid (new_task->task_ptid));
-#endif
- return 0;
+ if (arg == NULL || *arg == '\0')
+ print_ada_task_info (uiout, NULL, current_inferior ());
+ else
+ info_task (uiout, arg, current_inferior ());
}
/* Print a message telling the user id of the current task.
- Print an error message if the application does not appear to
- be using any Ada task. */
+ This function assumes that tasking is in use in the inferior. */
static void
-display_current_task_id (void)
+display_current_task_id (void)
{
- const int current_task = ada_get_current_task (inferior_ptid);
+ const int current_task = ada_get_task_number (inferior_ptid);
- if (current_task == -1)
- printf_filtered ("[Current task is unknown]\n");
+ if (current_task == 0)
+ printf_filtered (_("[Current task is unknown]\n"));
else
- printf_filtered ("[Current task is %d]\n", current_task);
+ printf_filtered (_("[Current task is %d]\n"), current_task);
}
/* Parse and evaluate TIDSTR into a task id, and try to switch to
that task. Print an error message if the task switch failed. */
static void
-task_command_1 (char *tidstr, int from_tty)
+task_command_1 (char *taskno_str, int from_tty, struct inferior *inf)
{
- const int num = value_as_long (parse_and_eval (tidstr));
- struct task_entry *e = get_entry_vptr (num);
+ 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, 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, data->task_list, taskno - 1);
+
+ if (!ada_task_is_alive (task_info))
+ error (_("Cannot switch to task %d: Task is no longer running"), taskno);
+
+ /* On some platforms, the thread list is not updated until the user
+ performs a thread-related operation (by using the "info threads"
+ command, for instance). So this thread list may not be up to date
+ when the user attempts this task switch. Since we cannot switch
+ to the thread associated to our task if GDB does not know about
+ that thread, we need to make sure that any new threads gets added
+ 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);
+ print_stack_frame (get_selected_frame (NULL),
+ frame_relative_level (get_selected_frame (NULL)), 1);
+}
+
- if (e == NULL)
- error ("Task ID %d not known. Use the \"info tasks\" command to\n"
- "see the IDs of currently known tasks", num);
+/* Print the ID of the current task if TASKNO_STR is empty or NULL.
+ Otherwise, switch to the task indicated by TASKNO_STR. */
+
+static void
+task_command (char *taskno_str, int from_tty)
+{
+ struct ui_out *uiout = current_uiout;
- if (switch_to_task (e) == 0)
+ if (ada_build_task_list () == 0)
{
- ada_find_printable_frame (get_selected_frame ());
- printf_filtered ("[Switching to task %d]\n", num);
- print_stack_frame (get_selected_frame (),
- frame_relative_level (get_selected_frame ()), 1);
+ 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 ();
else
- printf_filtered ("Unable to switch to task %d\n", num);
+ {
+ /* Task switching in core files doesn't work, either because:
+ 1. Thread support is not implemented with core files
+ 2. Thread support is implemented, but the thread IDs created
+ after having read the core file are not the same as the ones
+ that were used during the program life, before the crash.
+ As a consequence, there is no longer a way for the debugger
+ to find the associated thead ID of any given Ada task.
+ So, instead of attempting a task switch without giving the user
+ any clue as to what might have happened, just error-out with
+ a message explaining that this feature is not supported. */
+ if (!target_has_execution)
+ error (_("\
+Task switching not supported when debugging from core files\n\
+(use thread support instead)"));
+ task_command_1 (taskno_str, from_tty, current_inferior ());
+ }
}
-/* Switch to task indicated in TIDSTR. Simply print the current task
- if TIDSTR is empty or NULL. */
+/* Indicate that the given inferior's task list may have changed,
+ so invalidate the cache. */
static void
-task_command (char *tidstr, int from_tty)
+ada_task_list_changed (struct inferior *inf)
{
- const int task_list_built = ada_build_task_list ();
+ struct ada_tasks_inferior_data *data = get_ada_tasks_inferior_data (inf);
- if (!task_list_built)
- return;
-
- if (tidstr == NULL || tidstr[0] == '\0')
- display_current_task_id ();
- else
- task_command_1 (tidstr, from_tty);
+ data->task_list_valid_p = 0;
}
-#if defined (__fsu__) || (defined(__alpha__) && defined(__osf__) && !defined(VXWORKS_TARGET))
-/* Restore saved registers if there was a task switch. */
-void
-ada_reset_thread_registers (void)
+/* Invalidate the per-program-space data. */
+
+static void
+ada_tasks_invalidate_pspace_data (struct program_space *pspace)
{
- if (current_task_id != -1 && SPECIAL_THREAD_SUPPORT_ACTIVE ())
- {
- supply_gregset (&gregset_saved);
- supply_fpregset (&fpregset_saved);
- reinit_frame_cache ();
- stop_pc = read_pc ();
- }
- current_task_id = -1;
+ get_ada_tasks_pspace_data (pspace)->initialized_p = 0;
}
-#else
-void
-ada_reset_thread_registers (void)
+
+/* 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;
}
-#endif
/* The 'normal_stop' observer notification callback. */
static void
-normal_stop_notification (void)
+ada_normal_stop_observer (struct bpstats *unused_args, int unused_args2)
{
/* The inferior has been resumed, and just stopped. This means that
our task_list needs to be recomputed before it can be used again. */
- stale_task_list_p = 1;
+ ada_task_list_changed (current_inferior ());
}
-/* Attach all the observers needed by the ada-tasks module. */
+/* A routine to be called when the objfiles have changed. */
static void
-ada_tasks_attach_observers (void)
+ada_new_objfile_observer (struct objfile *objfile)
{
- observer_attach_normal_stop (&normal_stop_notification);
+ 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);
+ }
+
+ /* 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. */
+
+ 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. */
+extern initialize_file_ftype _initialize_tasks;
+
void
_initialize_tasks (void)
{
-#ifdef GNAT_GDB
- extern struct cmd_list_element *cmdlist;
+ ada_tasks_pspace_data_handle = register_program_space_data ();
+ ada_tasks_inferior_data_handle = register_inferior_data ();
- ada_tasks_attach_observers ();
+ /* Attach various observers. */
+ observer_attach_normal_stop (ada_normal_stop_observer);
+ observer_attach_new_objfile (ada_new_objfile_observer);
+ /* Some new commands provided by this module. */
add_info ("tasks", info_tasks_command,
- "Without argument: list all known Ada tasks, with status information.\n"
- "info tasks n: print detailed information of task n.");
-
+ _("Provide information about all known Ada tasks"));
add_cmd ("task", class_run, task_command,
- "Without argument: print the current task ID.\n"
- "task n: Use this command to switch to task n.",
+ _("Use this command to switch between Ada tasks.\n\
+Without argument, this command simply prints the current task ID"),
&cmdlist);
-#endif
}
+
projects / external / binutils.git / blobdiff