2009-01-03 13:58:08 +08:00
|
|
|
/* Copyright (C) 1992, 1993, 1994, 1997, 1998, 1999, 2000, 2003, 2004, 2005,
|
2011-01-01 23:34:07 +08:00
|
|
|
2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
This file is part of GDB.
|
|
|
|
|
|
|
|
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 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 "defs.h"
|
|
|
|
#include "observer.h"
|
|
|
|
#include "gdbcmd.h"
|
|
|
|
#include "target.h"
|
|
|
|
#include "ada-lang.h"
|
|
|
|
#include "gdbcore.h"
|
|
|
|
#include "inferior.h"
|
|
|
|
#include "gdbthread.h"
|
2011-09-17 03:09:07 +08:00
|
|
|
#include "progspace.h"
|
|
|
|
#include "objfiles.h"
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
/* 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"
|
|
|
|
|
2011-01-06 22:43:37 +08:00
|
|
|
/* The maximum number of tasks known to the Ada runtime. */
|
2008-10-23 03:45:05 +08:00
|
|
|
static const int MAX_NUMBER_OF_KNOWN_TASKS = 1000;
|
|
|
|
|
2011-07-05 03:32:07 +08:00
|
|
|
/* 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"
|
|
|
|
|
2008-10-23 03:45:05 +08:00
|
|
|
enum task_states
|
|
|
|
{
|
|
|
|
Unactivated,
|
|
|
|
Runnable,
|
|
|
|
Terminated,
|
|
|
|
Activator_Sleep,
|
|
|
|
Acceptor_Sleep,
|
|
|
|
Entry_Caller_Sleep,
|
|
|
|
Async_Select_Sleep,
|
|
|
|
Delay_Sleep,
|
|
|
|
Master_Completion_Sleep,
|
|
|
|
Master_Phase_2_Sleep,
|
|
|
|
Interrupt_Server_Idle_Sleep,
|
|
|
|
Interrupt_Server_Blocked_Interrupt_Sleep,
|
|
|
|
Timer_Server_Sleep,
|
|
|
|
AST_Server_Sleep,
|
|
|
|
Asynchronous_Hold,
|
2009-03-13 06:53:38 +08:00
|
|
|
Interrupt_Server_Blocked_On_Event_Flag,
|
|
|
|
Activating,
|
|
|
|
Acceptor_Delay_Sleep
|
2008-10-23 03:45:05 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* A short description corresponding to each possible task state. */
|
2008-10-23 23:42:19 +08:00
|
|
|
static const char *task_states[] = {
|
|
|
|
N_("Unactivated"),
|
|
|
|
N_("Runnable"),
|
|
|
|
N_("Terminated"),
|
|
|
|
N_("Child Activation Wait"),
|
2009-03-13 06:53:38 +08:00
|
|
|
N_("Accept or Select Term"),
|
2008-10-23 23:42:19 +08:00
|
|
|
N_("Waiting on entry call"),
|
|
|
|
N_("Async Select Wait"),
|
|
|
|
N_("Delay Sleep"),
|
|
|
|
N_("Child Termination Wait"),
|
|
|
|
N_("Wait Child in Term Alt"),
|
2008-10-23 03:45:05 +08:00
|
|
|
"",
|
|
|
|
"",
|
|
|
|
"",
|
|
|
|
"",
|
2008-10-23 23:42:19 +08:00
|
|
|
N_("Asynchronous Hold"),
|
2009-03-13 06:53:38 +08:00
|
|
|
"",
|
|
|
|
N_("Activating"),
|
|
|
|
N_("Selective Wait")
|
2008-10-23 03:45:05 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* A longer description corresponding to each possible task state. */
|
2008-10-23 23:42:19 +08:00
|
|
|
static const char *long_task_states[] = {
|
|
|
|
N_("Unactivated"),
|
|
|
|
N_("Runnable"),
|
|
|
|
N_("Terminated"),
|
|
|
|
N_("Waiting for child activation"),
|
2009-03-13 06:53:38 +08:00
|
|
|
N_("Blocked in accept or select with terminate"),
|
2008-10-23 23:42:19 +08:00
|
|
|
N_("Waiting on entry call"),
|
|
|
|
N_("Asynchronous Selective Wait"),
|
|
|
|
N_("Delay Sleep"),
|
|
|
|
N_("Waiting for children termination"),
|
|
|
|
N_("Waiting for children in terminate alternative"),
|
2008-10-23 03:45:05 +08:00
|
|
|
"",
|
|
|
|
"",
|
|
|
|
"",
|
|
|
|
"",
|
2008-10-23 23:42:19 +08:00
|
|
|
N_("Asynchronous Hold"),
|
2009-03-13 06:53:38 +08:00
|
|
|
"",
|
|
|
|
N_("Activating"),
|
|
|
|
N_("Blocked in selective wait statement")
|
2008-10-23 03:45:05 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* The index of certain important fields in the Ada Task Control Block
|
|
|
|
record and sub-records. */
|
|
|
|
|
2011-09-17 03:08:50 +08:00
|
|
|
struct atcb_fieldnos
|
2008-10-23 03:45:05 +08:00
|
|
|
{
|
|
|
|
/* Fields in record Ada_Task_Control_Block. */
|
|
|
|
int common;
|
|
|
|
int entry_calls;
|
|
|
|
int atc_nesting_level;
|
|
|
|
|
|
|
|
/* Fields in record Common_ATCB. */
|
|
|
|
int state;
|
|
|
|
int parent;
|
|
|
|
int priority;
|
|
|
|
int image;
|
|
|
|
int image_len; /* This field may be missing. */
|
2011-07-05 03:32:07 +08:00
|
|
|
int activation_link;
|
2008-10-23 03:45:05 +08:00
|
|
|
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;
|
|
|
|
};
|
|
|
|
|
2011-09-17 03:09:07 +08:00
|
|
|
/* This module's per-program-space data. */
|
2008-10-23 03:45:05 +08:00
|
|
|
|
2011-09-17 03:09:07 +08:00
|
|
|
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;
|
|
|
|
|
|
|
|
/* 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;
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
typedef struct ada_task_info ada_task_info_s;
|
|
|
|
DEF_VEC_O(ada_task_info_s);
|
|
|
|
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
/* 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;
|
2008-10-23 03:45:05 +08:00
|
|
|
|
2011-09-17 03:09:07 +08:00
|
|
|
/* 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;
|
|
|
|
}
|
|
|
|
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
/* 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;
|
|
|
|
}
|
|
|
|
|
2008-10-23 03:45:05 +08:00
|
|
|
/* Return the task number of the task whose ptid is PTID, or zero
|
|
|
|
if the task could not be found. */
|
|
|
|
|
2009-04-01 00:44:18 +08:00
|
|
|
int
|
2008-10-23 03:45:05 +08:00
|
|
|
ada_get_task_number (ptid_t ptid)
|
|
|
|
{
|
|
|
|
int i;
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
struct inferior *inf = find_inferior_pid (ptid_get_pid (ptid));
|
|
|
|
struct ada_tasks_inferior_data *data;
|
|
|
|
|
|
|
|
gdb_assert (inf != NULL);
|
|
|
|
data = get_ada_tasks_inferior_data (inf);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
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))
|
2008-10-23 03:45:05 +08:00
|
|
|
return i + 1;
|
|
|
|
|
|
|
|
return 0; /* No matching task found. */
|
|
|
|
}
|
|
|
|
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
/* Return the task number of the task running in inferior INF which
|
|
|
|
matches TASK_ID , or zero if the task could not be found. */
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
static int
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
get_task_number_from_id (CORE_ADDR task_id, struct inferior *inf)
|
2008-10-23 03:45:05 +08:00
|
|
|
{
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
struct ada_tasks_inferior_data *data = get_ada_tasks_inferior_data (inf);
|
2008-10-23 03:45:05 +08:00
|
|
|
int i;
|
|
|
|
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
for (i = 0; i < VEC_length (ada_task_info_s, data->task_list); i++)
|
2008-10-23 03:45:05 +08:00
|
|
|
{
|
|
|
|
struct ada_task_info *task_info =
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
VEC_index (ada_task_info_s, data->task_list, i);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
if (task_info->task_id == task_id)
|
|
|
|
return i + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Task not found. Return 0. */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return non-zero if TASK_NUM is a valid task number. */
|
|
|
|
|
|
|
|
int
|
|
|
|
valid_task_id (int task_num)
|
|
|
|
{
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
struct ada_tasks_inferior_data *data;
|
|
|
|
|
2011-09-17 03:09:26 +08:00
|
|
|
ada_build_task_list ();
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
data = get_ada_tasks_inferior_data (current_inferior ());
|
2008-10-23 03:45:05 +08:00
|
|
|
return (task_num > 0
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
&& task_num <= VEC_length (ada_task_info_s, data->task_list));
|
2008-10-23 03:45:05 +08:00
|
|
|
}
|
|
|
|
|
2009-03-13 09:51:17 +08:00
|
|
|
/* Return non-zero iff the task STATE corresponds to a non-terminated
|
|
|
|
task state. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
ada_task_is_alive (struct ada_task_info *task_info)
|
|
|
|
{
|
|
|
|
return (task_info->state != Terminated);
|
|
|
|
}
|
|
|
|
|
2010-09-29 05:39:03 +08:00
|
|
|
/* 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;
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
struct ada_tasks_inferior_data *data;
|
2010-09-29 05:39:03 +08:00
|
|
|
|
2011-09-17 03:09:26 +08:00
|
|
|
ada_build_task_list ();
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
data = get_ada_tasks_inferior_data (current_inferior ());
|
|
|
|
nb_tasks = VEC_length (ada_task_info_s, data->task_list);
|
2010-09-29 05:39:03 +08:00
|
|
|
|
|
|
|
for (i = 0; i < nb_tasks; i++)
|
|
|
|
{
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
task = VEC_index (ada_task_info_s, data->task_list, i);
|
2010-09-29 05:39:03 +08:00
|
|
|
if (!ada_task_is_alive (task))
|
|
|
|
continue;
|
|
|
|
iterator (task);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-10-23 03:45:05 +08:00
|
|
|
/* Extract the contents of the value as a string whose length is LENGTH,
|
|
|
|
and store the result in DEST. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
value_as_string (char *dest, struct value *val, int length)
|
|
|
|
{
|
|
|
|
memcpy (dest, value_contents (val), length);
|
|
|
|
dest[length] = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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 void
|
|
|
|
read_fat_string_value (char *dest, struct value *val, int max_len)
|
|
|
|
{
|
|
|
|
struct value *array_val;
|
|
|
|
struct value *bounds_val;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
/* 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;
|
|
|
|
|
|
|
|
/* 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)
|
|
|
|
{
|
|
|
|
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);
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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));
|
|
|
|
|
|
|
|
/* 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));
|
2009-05-28 08:53:52 +08:00
|
|
|
read_memory (value_address (array_val), dest, len);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
/* Add the NUL character to close the string. */
|
|
|
|
dest[len] = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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
|
|
|
|
associated ATCB_FIELDNOS.
|
|
|
|
|
|
|
|
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 void
|
2011-07-05 03:31:49 +08:00
|
|
|
get_tcb_types_info (void)
|
2008-10-23 03:45:05 +08:00
|
|
|
{
|
|
|
|
struct type *type;
|
|
|
|
struct type *common_type;
|
|
|
|
struct type *ll_type;
|
|
|
|
struct type *call_type;
|
2011-09-17 03:08:50 +08:00
|
|
|
struct atcb_fieldnos fieldnos;
|
2011-09-17 03:09:07 +08:00
|
|
|
struct ada_tasks_pspace_data *pspace_data;
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
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";
|
|
|
|
const char *entry_call_record_name = "system__tasking__entry_call_record";
|
|
|
|
|
2011-01-08 03:36:19 +08:00
|
|
|
/* ATCB symbols may be found in several compilation units. As we
|
2010-11-23 09:04:54 +08:00
|
|
|
are only interested in one instance, use standard (literal,
|
|
|
|
C-like) lookups to get the first match. */
|
|
|
|
|
2008-10-23 03:45:05 +08:00
|
|
|
struct symbol *atcb_sym =
|
2010-11-23 09:04:54 +08:00
|
|
|
lookup_symbol_in_language (atcb_name, NULL, VAR_DOMAIN,
|
|
|
|
language_c, NULL);
|
2008-10-23 03:45:05 +08:00
|
|
|
const struct symbol *common_atcb_sym =
|
2010-11-23 09:04:54 +08:00
|
|
|
lookup_symbol_in_language (common_atcb_name, NULL, VAR_DOMAIN,
|
|
|
|
language_c, NULL);
|
2008-10-23 03:45:05 +08:00
|
|
|
const struct symbol *private_data_sym =
|
2010-11-23 09:04:54 +08:00
|
|
|
lookup_symbol_in_language (private_data_name, NULL, VAR_DOMAIN,
|
|
|
|
language_c, NULL);
|
2008-10-23 03:45:05 +08:00
|
|
|
const struct symbol *entry_call_record_sym =
|
2010-11-23 09:04:54 +08:00
|
|
|
lookup_symbol_in_language (entry_call_record_name, NULL, VAR_DOMAIN,
|
|
|
|
language_c, NULL);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
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. */
|
2010-11-23 09:04:54 +08:00
|
|
|
atcb_sym = lookup_symbol_in_language (atcb_name_fixed, NULL, VAR_DOMAIN,
|
|
|
|
language_c, NULL);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
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 (_("Cannot find Common_ATCB type. Aborting"));
|
|
|
|
if (private_data_sym == NULL || private_data_sym->type == NULL)
|
|
|
|
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", 1);
|
|
|
|
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);
|
2011-07-05 03:32:07 +08:00
|
|
|
fieldnos.activation_link = ada_get_field_index (common_type,
|
|
|
|
"activation_link", 1);
|
2008-10-23 03:45:05 +08:00
|
|
|
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,
|
|
|
|
but we need to support both possibilities to avoid an unnecessary
|
|
|
|
dependency on a recent compiler. We therefore try locating the
|
|
|
|
"thread_id" field in place of the "lwp" field if we did not find
|
|
|
|
the latter. */
|
|
|
|
if (fieldnos.ll_lwp < 0)
|
|
|
|
fieldnos.ll_lwp = ada_get_field_index (ll_type, "thread_id", 1);
|
|
|
|
|
|
|
|
/* Set all the out parameters all at once, now that we are certain
|
|
|
|
that there are no potential error() anymore. */
|
2011-09-17 03:09:07 +08:00
|
|
|
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;
|
2008-10-23 03:45:05 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* 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. */
|
|
|
|
|
|
|
|
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;
|
2011-09-17 03:09:07 +08:00
|
|
|
const struct ada_tasks_pspace_data *pspace_data
|
|
|
|
= get_ada_tasks_pspace_data (current_program_space);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
2011-09-17 03:09:07 +08:00
|
|
|
ll_value = value_field (common_value, pspace_data->atcb_fieldno.ll);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
2011-09-17 03:09:07 +08:00
|
|
|
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));
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
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
|
|
|
|
read_atcb (CORE_ADDR task_id, struct ada_task_info *task_info)
|
|
|
|
{
|
|
|
|
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;
|
2011-10-05 15:41:13 +08:00
|
|
|
static const char ravenscar_task_name[] = "Ravenscar task";
|
2011-09-17 03:09:07 +08:00
|
|
|
const struct ada_tasks_pspace_data *pspace_data
|
|
|
|
= get_ada_tasks_pspace_data (current_program_space);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
2011-09-17 03:09:07 +08:00
|
|
|
if (!pspace_data->initialized_p)
|
2011-07-05 03:31:49 +08:00
|
|
|
get_tcb_types_info ();
|
2008-10-23 03:45:05 +08:00
|
|
|
|
2011-09-17 03:09:07 +08:00
|
|
|
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);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
/* Fill in the task_id. */
|
|
|
|
|
|
|
|
task_info->task_id = task_id;
|
|
|
|
|
|
|
|
/* Compute the name of the task.
|
|
|
|
|
|
|
|
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
|
2011-01-08 03:36:19 +08:00
|
|
|
the ATCB to store the string length. For efficiency reasons, newer
|
2008-10-23 03:45:05 +08:00
|
|
|
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
|
2011-01-08 03:36:19 +08:00
|
|
|
the length of the task name. The method used to extract the task name
|
2008-10-23 03:45:05 +08:00
|
|
|
is selected depending on the existence of this field.
|
|
|
|
|
|
|
|
In some run-time libs (e.g. Ravenscar), the name is not in the ATCB;
|
2011-01-08 03:36:19 +08:00
|
|
|
we may want to get it from the first user frame of the stack. For now,
|
2008-10-23 03:45:05 +08:00
|
|
|
we just give a dummy name. */
|
|
|
|
|
2011-09-17 03:09:07 +08:00
|
|
|
if (pspace_data->atcb_fieldno.image_len == -1)
|
2008-10-23 03:45:05 +08:00
|
|
|
{
|
2011-09-17 03:09:07 +08:00
|
|
|
if (pspace_data->atcb_fieldno.image >= 0)
|
2008-10-23 03:45:05 +08:00
|
|
|
read_fat_string_value (task_info->name,
|
2011-09-17 03:09:07 +08:00
|
|
|
value_field (common_value,
|
|
|
|
pspace_data->atcb_fieldno.image),
|
2008-10-23 03:45:05 +08:00
|
|
|
sizeof (task_info->name) - 1);
|
|
|
|
else
|
2011-10-05 15:41:13 +08:00
|
|
|
{
|
|
|
|
struct minimal_symbol *msym;
|
|
|
|
|
|
|
|
msym = lookup_minimal_symbol_by_pc (task_id);
|
|
|
|
if (msym)
|
|
|
|
{
|
|
|
|
const char *full_name = SYMBOL_LINKAGE_NAME (msym);
|
|
|
|
const char *task_name = full_name;
|
|
|
|
const char *p;
|
|
|
|
|
|
|
|
/* Strip the prefix. */
|
|
|
|
for (p = full_name; *p; p++)
|
|
|
|
if (p[0] == '_' && p[1] == '_')
|
|
|
|
task_name = p + 2;
|
|
|
|
|
|
|
|
/* Copy the task name. */
|
|
|
|
strncpy (task_info->name, task_name, sizeof (task_info->name));
|
|
|
|
task_info->name[sizeof (task_info->name) - 1] = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* No symbol found. Use a default name. */
|
|
|
|
strcpy (task_info->name, ravenscar_task_name);
|
|
|
|
}
|
|
|
|
}
|
2008-10-23 03:45:05 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-09-17 03:09:07 +08:00
|
|
|
int len = value_as_long
|
|
|
|
(value_field (common_value,
|
|
|
|
pspace_data->atcb_fieldno.image_len));
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
value_as_string (task_info->name,
|
2011-09-17 03:09:07 +08:00
|
|
|
value_field (common_value,
|
|
|
|
pspace_data->atcb_fieldno.image),
|
|
|
|
len);
|
2008-10-23 03:45:05 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Compute the task state and priority. */
|
|
|
|
|
2011-07-05 03:31:49 +08:00
|
|
|
task_info->state =
|
2011-09-17 03:09:07 +08:00
|
|
|
value_as_long (value_field (common_value,
|
|
|
|
pspace_data->atcb_fieldno.state));
|
2008-10-23 03:45:05 +08:00
|
|
|
task_info->priority =
|
2011-09-17 03:09:07 +08:00
|
|
|
value_as_long (value_field (common_value,
|
|
|
|
pspace_data->atcb_fieldno.priority));
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
/* If the ATCB contains some information about the parent task,
|
|
|
|
then compute it as well. Otherwise, zero. */
|
|
|
|
|
2011-09-17 03:09:07 +08:00
|
|
|
if (pspace_data->atcb_fieldno.parent >= 0)
|
2008-10-23 03:45:05 +08:00
|
|
|
task_info->parent =
|
2011-09-17 03:09:07 +08:00
|
|
|
value_as_address (value_field (common_value,
|
|
|
|
pspace_data->atcb_fieldno.parent));
|
2008-10-23 03:45:05 +08:00
|
|
|
else
|
|
|
|
task_info->parent = 0;
|
|
|
|
|
|
|
|
|
|
|
|
/* If the ATCB contains some information about entry calls, then
|
|
|
|
compute the "called_task" as well. Otherwise, zero. */
|
|
|
|
|
2011-09-17 03:09:07 +08:00
|
|
|
if (pspace_data->atcb_fieldno.atc_nesting_level > 0
|
|
|
|
&& pspace_data->atcb_fieldno.entry_calls > 0)
|
2008-10-23 03:45:05 +08:00
|
|
|
{
|
|
|
|
/* 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. */
|
2011-09-17 03:09:07 +08:00
|
|
|
atc_nesting_level_value =
|
|
|
|
value_field (tcb_value, pspace_data->atcb_fieldno.atc_nesting_level);
|
2008-10-23 03:45:05 +08:00
|
|
|
entry_calls_value =
|
2011-09-17 03:09:07 +08:00
|
|
|
ada_coerce_to_simple_array_ptr
|
|
|
|
(value_field (tcb_value, pspace_data->atcb_fieldno.entry_calls));
|
2008-10-23 03:45:05 +08:00
|
|
|
entry_calls_value_element =
|
* value.h (value_subscript, value_subscripted_rvalue,
value_bitstring_subscript, value_ptradd): Use LONGEST instead
of value as type of the index argument.
(value_ptrsub): Remove.
* valarith.c (value_subscript, value_subscripted_rvalue,
value_bitstring_subscript, value_ptradd): Use LONGEST instead
of value as type of the index argument.
(value_ptrsub): Remove.
* wrapper.h (gdb_value_subscript): Use LONGEST instead of
value as type of the index argument.
* wrapper.c (gdb_value_subscript): Likewise.
Update calls to gdb_value_subscript, value_subscript,
value_subscripted_rvalue, value_bitstring_subscript and
value_ptradd to use LONGEST instead of value as index
argument type. Use value_ptradd instead of value_ptrsub.
* ada-lang.c (ada_value_subscript, ada_value_ptr_subscript,
ada_tag_name_2): Update.
* ada-tasks.c (read_atcb): Update.
* eval.c (evaluate_subexp_standard): Update.
* valarith.c (value_subscript): Update.
* gnu-v2-abi.c (gnuv2_virtual_fn_field): Update.
* gnu-v3-abi.c (gnuv3_get_virtual_fn, gnuv3_baseclass_offset,
gnuv3_method_ptr_to_value): Update.
* jv-lang.c (evaluate_subexp_java): Update.
* m2-lang.c (evaluate_subexp_modula2): Update.
* python/python-value.c (valpy_getitem, valpy_binop): Update.
* wrapper.c (gdb_value_subscript): Update.
* varobj.c (c_describe_child): Update.
2009-06-29 21:24:41 +08:00
|
|
|
value_subscript (entry_calls_value,
|
|
|
|
value_as_long (atc_nesting_level_value));
|
2008-10-23 03:45:05 +08:00
|
|
|
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
|
|
|
|
{
|
|
|
|
task_info->called_task = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If the ATCB cotnains some information about RV callers,
|
|
|
|
then compute the "caller_task". Otherwise, zero. */
|
|
|
|
|
|
|
|
task_info->caller_task = 0;
|
2011-09-17 03:09:07 +08:00
|
|
|
if (pspace_data->atcb_fieldno.call >= 0)
|
2008-10-23 03:45:05 +08:00
|
|
|
{
|
|
|
|
/* 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 =
|
2011-09-17 03:09:07 +08:00
|
|
|
value_as_address (value_field (common_value,
|
|
|
|
pspace_data->atcb_fieldno.call));
|
2008-10-23 03:45:05 +08:00
|
|
|
struct value *call_val;
|
|
|
|
|
|
|
|
if (call != 0)
|
|
|
|
{
|
|
|
|
call_val =
|
2011-09-17 03:09:07 +08:00
|
|
|
value_from_contents_and_address (pspace_data->atcb_call_type,
|
|
|
|
NULL, call);
|
2008-10-23 03:45:05 +08:00
|
|
|
task_info->caller_task =
|
2011-09-17 03:09:07 +08:00
|
|
|
value_as_address
|
|
|
|
(value_field (call_val, pspace_data->atcb_fieldno.call_self));
|
2008-10-23 03:45:05 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-09-23 06:50:54 +08:00
|
|
|
/* 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))
|
2008-10-23 03:45:05 +08:00
|
|
|
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
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
add the result to the given inferior's TASK_LIST. */
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
static void
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
add_ada_task (CORE_ADDR task_id, struct inferior *inf)
|
2008-10-23 03:45:05 +08:00
|
|
|
{
|
|
|
|
struct ada_task_info task_info;
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
struct ada_tasks_inferior_data *data = get_ada_tasks_inferior_data (inf);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
read_atcb (task_id, &task_info);
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
VEC_safe_push (ada_task_info_s, data->task_list, &task_info);
|
2008-10-23 03:45:05 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Read the Known_Tasks array from the inferior memory, and store
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
it in the current inferior's TASK_LIST. Return non-zero upon success. */
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
static int
|
2011-07-05 03:32:07 +08:00
|
|
|
read_known_tasks_array (CORE_ADDR known_tasks_addr)
|
2008-10-23 03:45:05 +08:00
|
|
|
{
|
|
|
|
const int target_ptr_byte =
|
2009-06-18 02:44:23 +08:00
|
|
|
gdbarch_ptr_bit (target_gdbarch) / TARGET_CHAR_BIT;
|
2008-10-23 03:45:05 +08:00
|
|
|
const int known_tasks_size = target_ptr_byte * MAX_NUMBER_OF_KNOWN_TASKS;
|
|
|
|
gdb_byte *known_tasks = alloca (known_tasks_size);
|
|
|
|
int i;
|
|
|
|
|
2011-07-05 03:32:07 +08:00
|
|
|
/* Build a new list by reading the ATCBs from the Known_Tasks array
|
|
|
|
in the Ada runtime. */
|
2008-10-23 03:45:05 +08:00
|
|
|
read_memory (known_tasks_addr, known_tasks, known_tasks_size);
|
|
|
|
for (i = 0; i < MAX_NUMBER_OF_KNOWN_TASKS; i++)
|
|
|
|
{
|
|
|
|
struct type *data_ptr_type =
|
2009-06-18 02:44:23 +08:00
|
|
|
builtin_type (target_gdbarch)->builtin_data_ptr;
|
2008-10-23 03:45:05 +08:00
|
|
|
CORE_ADDR task_id =
|
|
|
|
extract_typed_address (known_tasks + i * target_ptr_byte,
|
|
|
|
data_ptr_type);
|
|
|
|
|
|
|
|
if (task_id != 0)
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
add_ada_task (task_id, current_inferior ());
|
2008-10-23 03:45:05 +08:00
|
|
|
}
|
|
|
|
|
2011-07-05 03:32:07 +08:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Read the known tasks from the inferior memory, and store it in
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
the current inferior's TASK_LIST. Return non-zero upon success. */
|
2011-07-05 03:32:07 +08:00
|
|
|
|
|
|
|
static int
|
|
|
|
read_known_tasks_list (CORE_ADDR known_tasks_addr)
|
|
|
|
{
|
|
|
|
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;
|
2011-09-17 03:09:07 +08:00
|
|
|
const struct ada_tasks_pspace_data *pspace_data
|
|
|
|
= get_ada_tasks_pspace_data (current_program_space);
|
2011-07-05 03:32:07 +08:00
|
|
|
|
|
|
|
/* Sanity check. */
|
2011-09-17 03:09:07 +08:00
|
|
|
if (pspace_data->atcb_fieldno.activation_link < 0)
|
2011-07-05 03:32:07 +08:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* 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 value *tcb_value;
|
|
|
|
struct value *common_value;
|
|
|
|
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
add_ada_task (task_id, current_inferior ());
|
2011-07-05 03:32:07 +08:00
|
|
|
|
|
|
|
/* Read the chain. */
|
2011-09-17 03:09:07 +08:00
|
|
|
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));
|
2011-07-05 03:32:07 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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);
|
|
|
|
}
|
|
|
|
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
/* 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
|
|
|
|
ada_set_current_inferior_known_tasks_addr (struct ada_tasks_inferior_data *data)
|
|
|
|
{
|
|
|
|
CORE_ADDR known_tasks_addr;
|
|
|
|
|
|
|
|
if (data->known_tasks_kind != ADA_TASKS_UNKNOWN)
|
|
|
|
return;
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
data->known_tasks_kind = ADA_TASKS_NOT_FOUND;
|
|
|
|
data->known_tasks_addr = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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. */
|
2011-07-05 03:32:07 +08:00
|
|
|
|
|
|
|
static int
|
|
|
|
read_known_tasks (void)
|
|
|
|
{
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
struct ada_tasks_inferior_data *data =
|
|
|
|
get_ada_tasks_inferior_data (current_inferior ());
|
2011-07-05 03:32:07 +08:00
|
|
|
|
|
|
|
/* Step 1: Clear the current list, if necessary. */
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
VEC_truncate (ada_task_info_s, data->task_list, 0);
|
2011-07-05 03:32:07 +08:00
|
|
|
|
|
|
|
/* 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] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
ada_set_current_inferior_known_tasks_addr (data);
|
|
|
|
gdb_assert (data->known_tasks_kind != ADA_TASKS_UNKNOWN);
|
|
|
|
|
|
|
|
switch (data->known_tasks_kind)
|
2011-07-05 03:32:07 +08:00
|
|
|
{
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
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);
|
2011-07-05 03:32:07 +08:00
|
|
|
}
|
|
|
|
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
/* Step 3: Set task_list_valid_p, to avoid re-reading the Known_Tasks
|
2008-10-23 03:45:05 +08:00
|
|
|
array unless needed. Then report a success. */
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
data->task_list_valid_p = 1;
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2011-09-17 03:09:26 +08:00
|
|
|
/* 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). */
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
int
|
2011-09-17 03:09:26 +08:00
|
|
|
ada_build_task_list (void)
|
2008-10-23 03:45:05 +08:00
|
|
|
{
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
struct ada_tasks_inferior_data *data;
|
|
|
|
|
2008-10-23 03:45:05 +08:00
|
|
|
if (!target_has_stack)
|
|
|
|
error (_("Cannot inspect Ada tasks when program is not running"));
|
|
|
|
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
data = get_ada_tasks_inferior_data (current_inferior ());
|
|
|
|
if (!data->task_list_valid_p)
|
2011-07-05 03:32:07 +08:00
|
|
|
read_known_tasks ();
|
2008-10-23 03:45:05 +08:00
|
|
|
|
2011-09-17 03:09:26 +08:00
|
|
|
return VEC_length (ada_task_info_s, data->task_list);
|
2008-10-23 03:45:05 +08:00
|
|
|
}
|
|
|
|
|
[Ada] Re-implement `info tasks' command using ui-out
This is in preparation for providing a GDB/MI equivalent of
the `info tasks' command. The previous implementation was using
various printf commands to generate the command output, which
does not work at all if we want to use that same code to generate
the result for that new GDB/MI command.
This patch thus re-implements the `info tasks' command (with no
arguments) in a way that makes it GDB/MI friendly.
There is an additional hicup, which is the fact that the `info tasks'
command displays a completely different type of output when a task
ID is given. For instance:
(gdb) info task 2
Ada Task: 0x644d20
Name: my_callee
Thread: 0
LWP: 0x5809
Parent: 1 (main_task)
Base Priority: 48
State: Blocked in accept or select with terminate
The above output is better when in CLI mode, but really not
what we want when in GDB/MI mode. In GDB/MI mode, we want to
follow what the `-thread-info' command does when a task-id
is given as an argument, which is to produce the same table,
but with only one element/task in it.
For compatibility as well as practical reasons, we do not want
to change the output of the `info task TASKNO' command when in
CLI mode. But it's easy to preserve this behavior while providing
the desirable output when in GDB/MI mode. For this, the function
used to generated the `info tasks' output has been enhanced to take
an argument interpreted as a string. The CLI command knows to never
provide that argument, while the GDB/MI command will pass one if
provided by the user.
gdb/ChangeLog:
* ada-tasks.c (print_ada_task_info): New function, merging
short_task_info and info_tasks together. Reimplement using
ui-out instead of printing to stdout directly. Move the code
building and checking the task list here, instead of leaving it
in info_tasks_command.
(info_task): Move the code building and checking the task
list here, instead of leaving it in info_tasks_command.
(info_tasks_command): Delete code building and checking
the task list - moved elsewhere. Update calls to info_tasks
and info_task.
One of the minor changes the switch caused is the introduction
of a space between the "current" column, and the task "ID"
column, which wasn't there before. This matches what we do
in the "info threads" command, so I kept that change. This
required an adjustment in the testsuite, however...
gdb/testsuite/ChangeLog:
* gdb.ada/tasks.exp: Make the expected output for
the `info tasks' tests more resilient to spacing
changes.
2011-09-17 03:09:57 +08:00
|
|
|
/* 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. */
|
2008-10-23 03:45:05 +08:00
|
|
|
|
2011-10-04 05:38:31 +08:00
|
|
|
void
|
[Ada] Re-implement `info tasks' command using ui-out
This is in preparation for providing a GDB/MI equivalent of
the `info tasks' command. The previous implementation was using
various printf commands to generate the command output, which
does not work at all if we want to use that same code to generate
the result for that new GDB/MI command.
This patch thus re-implements the `info tasks' command (with no
arguments) in a way that makes it GDB/MI friendly.
There is an additional hicup, which is the fact that the `info tasks'
command displays a completely different type of output when a task
ID is given. For instance:
(gdb) info task 2
Ada Task: 0x644d20
Name: my_callee
Thread: 0
LWP: 0x5809
Parent: 1 (main_task)
Base Priority: 48
State: Blocked in accept or select with terminate
The above output is better when in CLI mode, but really not
what we want when in GDB/MI mode. In GDB/MI mode, we want to
follow what the `-thread-info' command does when a task-id
is given as an argument, which is to produce the same table,
but with only one element/task in it.
For compatibility as well as practical reasons, we do not want
to change the output of the `info task TASKNO' command when in
CLI mode. But it's easy to preserve this behavior while providing
the desirable output when in GDB/MI mode. For this, the function
used to generated the `info tasks' output has been enhanced to take
an argument interpreted as a string. The CLI command knows to never
provide that argument, while the GDB/MI command will pass one if
provided by the user.
gdb/ChangeLog:
* ada-tasks.c (print_ada_task_info): New function, merging
short_task_info and info_tasks together. Reimplement using
ui-out instead of printing to stdout directly. Move the code
building and checking the task list here, instead of leaving it
in info_tasks_command.
(info_task): Move the code building and checking the task
list here, instead of leaving it in info_tasks_command.
(info_tasks_command): Delete code building and checking
the task list - moved elsewhere. Update calls to info_tasks
and info_task.
One of the minor changes the switch caused is the introduction
of a space between the "current" column, and the task "ID"
column, which wasn't there before. This matches what we do
in the "info threads" command, so I kept that change. This
required an adjustment in the testsuite, however...
gdb/testsuite/ChangeLog:
* gdb.ada/tasks.exp: Make the expected output for
the `info tasks' tests more resilient to spacing
changes.
2011-09-17 03:09:57 +08:00
|
|
|
print_ada_task_info (struct ui_out *uiout,
|
|
|
|
char *arg_str,
|
|
|
|
struct inferior *inf)
|
2008-10-23 03:45:05 +08:00
|
|
|
{
|
[Ada] Re-implement `info tasks' command using ui-out
This is in preparation for providing a GDB/MI equivalent of
the `info tasks' command. The previous implementation was using
various printf commands to generate the command output, which
does not work at all if we want to use that same code to generate
the result for that new GDB/MI command.
This patch thus re-implements the `info tasks' command (with no
arguments) in a way that makes it GDB/MI friendly.
There is an additional hicup, which is the fact that the `info tasks'
command displays a completely different type of output when a task
ID is given. For instance:
(gdb) info task 2
Ada Task: 0x644d20
Name: my_callee
Thread: 0
LWP: 0x5809
Parent: 1 (main_task)
Base Priority: 48
State: Blocked in accept or select with terminate
The above output is better when in CLI mode, but really not
what we want when in GDB/MI mode. In GDB/MI mode, we want to
follow what the `-thread-info' command does when a task-id
is given as an argument, which is to produce the same table,
but with only one element/task in it.
For compatibility as well as practical reasons, we do not want
to change the output of the `info task TASKNO' command when in
CLI mode. But it's easy to preserve this behavior while providing
the desirable output when in GDB/MI mode. For this, the function
used to generated the `info tasks' output has been enhanced to take
an argument interpreted as a string. The CLI command knows to never
provide that argument, while the GDB/MI command will pass one if
provided by the user.
gdb/ChangeLog:
* ada-tasks.c (print_ada_task_info): New function, merging
short_task_info and info_tasks together. Reimplement using
ui-out instead of printing to stdout directly. Move the code
building and checking the task list here, instead of leaving it
in info_tasks_command.
(info_task): Move the code building and checking the task
list here, instead of leaving it in info_tasks_command.
(info_tasks_command): Delete code building and checking
the task list - moved elsewhere. Update calls to info_tasks
and info_task.
One of the minor changes the switch caused is the introduction
of a space between the "current" column, and the task "ID"
column, which wasn't there before. This matches what we do
in the "info threads" command, so I kept that change. This
required an adjustment in the testsuite, however...
gdb/testsuite/ChangeLog:
* gdb.ada/tasks.exp: Make the expected output for
the `info tasks' tests more resilient to spacing
changes.
2011-09-17 03:09:57 +08:00
|
|
|
struct ada_tasks_inferior_data *data;
|
|
|
|
int taskno, nb_tasks;
|
|
|
|
int taskno_arg = 0;
|
|
|
|
struct cleanup *old_chain;
|
2011-10-04 05:38:39 +08:00
|
|
|
int nb_columns;
|
2008-10-23 03:45:05 +08:00
|
|
|
|
[Ada] Re-implement `info tasks' command using ui-out
This is in preparation for providing a GDB/MI equivalent of
the `info tasks' command. The previous implementation was using
various printf commands to generate the command output, which
does not work at all if we want to use that same code to generate
the result for that new GDB/MI command.
This patch thus re-implements the `info tasks' command (with no
arguments) in a way that makes it GDB/MI friendly.
There is an additional hicup, which is the fact that the `info tasks'
command displays a completely different type of output when a task
ID is given. For instance:
(gdb) info task 2
Ada Task: 0x644d20
Name: my_callee
Thread: 0
LWP: 0x5809
Parent: 1 (main_task)
Base Priority: 48
State: Blocked in accept or select with terminate
The above output is better when in CLI mode, but really not
what we want when in GDB/MI mode. In GDB/MI mode, we want to
follow what the `-thread-info' command does when a task-id
is given as an argument, which is to produce the same table,
but with only one element/task in it.
For compatibility as well as practical reasons, we do not want
to change the output of the `info task TASKNO' command when in
CLI mode. But it's easy to preserve this behavior while providing
the desirable output when in GDB/MI mode. For this, the function
used to generated the `info tasks' output has been enhanced to take
an argument interpreted as a string. The CLI command knows to never
provide that argument, while the GDB/MI command will pass one if
provided by the user.
gdb/ChangeLog:
* ada-tasks.c (print_ada_task_info): New function, merging
short_task_info and info_tasks together. Reimplement using
ui-out instead of printing to stdout directly. Move the code
building and checking the task list here, instead of leaving it
in info_tasks_command.
(info_task): Move the code building and checking the task
list here, instead of leaving it in info_tasks_command.
(info_tasks_command): Delete code building and checking
the task list - moved elsewhere. Update calls to info_tasks
and info_task.
One of the minor changes the switch caused is the introduction
of a space between the "current" column, and the task "ID"
column, which wasn't there before. This matches what we do
in the "info threads" command, so I kept that change. This
required an adjustment in the testsuite, however...
gdb/testsuite/ChangeLog:
* gdb.ada/tasks.exp: Make the expected output for
the `info tasks' tests more resilient to spacing
changes.
2011-09-17 03:09:57 +08:00
|
|
|
if (ada_build_task_list () == 0)
|
|
|
|
{
|
|
|
|
ui_out_message (uiout, 0,
|
|
|
|
_("Your application does not use any Ada tasks.\n"));
|
|
|
|
return;
|
|
|
|
}
|
2008-10-23 03:45:05 +08:00
|
|
|
|
[Ada] Re-implement `info tasks' command using ui-out
This is in preparation for providing a GDB/MI equivalent of
the `info tasks' command. The previous implementation was using
various printf commands to generate the command output, which
does not work at all if we want to use that same code to generate
the result for that new GDB/MI command.
This patch thus re-implements the `info tasks' command (with no
arguments) in a way that makes it GDB/MI friendly.
There is an additional hicup, which is the fact that the `info tasks'
command displays a completely different type of output when a task
ID is given. For instance:
(gdb) info task 2
Ada Task: 0x644d20
Name: my_callee
Thread: 0
LWP: 0x5809
Parent: 1 (main_task)
Base Priority: 48
State: Blocked in accept or select with terminate
The above output is better when in CLI mode, but really not
what we want when in GDB/MI mode. In GDB/MI mode, we want to
follow what the `-thread-info' command does when a task-id
is given as an argument, which is to produce the same table,
but with only one element/task in it.
For compatibility as well as practical reasons, we do not want
to change the output of the `info task TASKNO' command when in
CLI mode. But it's easy to preserve this behavior while providing
the desirable output when in GDB/MI mode. For this, the function
used to generated the `info tasks' output has been enhanced to take
an argument interpreted as a string. The CLI command knows to never
provide that argument, while the GDB/MI command will pass one if
provided by the user.
gdb/ChangeLog:
* ada-tasks.c (print_ada_task_info): New function, merging
short_task_info and info_tasks together. Reimplement using
ui-out instead of printing to stdout directly. Move the code
building and checking the task list here, instead of leaving it
in info_tasks_command.
(info_task): Move the code building and checking the task
list here, instead of leaving it in info_tasks_command.
(info_tasks_command): Delete code building and checking
the task list - moved elsewhere. Update calls to info_tasks
and info_task.
One of the minor changes the switch caused is the introduction
of a space between the "current" column, and the task "ID"
column, which wasn't there before. This matches what we do
in the "info threads" command, so I kept that change. This
required an adjustment in the testsuite, however...
gdb/testsuite/ChangeLog:
* gdb.ada/tasks.exp: Make the expected output for
the `info tasks' tests more resilient to spacing
changes.
2011-09-17 03:09:57 +08:00
|
|
|
if (arg_str != NULL && arg_str[0] != '\0')
|
|
|
|
taskno_arg = value_as_long (parse_and_eval (arg_str));
|
2008-10-23 03:45:05 +08:00
|
|
|
|
2011-10-04 05:38:39 +08:00
|
|
|
if (ui_out_is_mi_like_p (uiout))
|
|
|
|
/* In GDB/MI mode, we want to provide the thread ID corresponding
|
|
|
|
to each task. This allows clients to quickly find the thread
|
|
|
|
associated to any task, which is helpful for commands that
|
|
|
|
take a --thread argument. However, in order to be able to
|
|
|
|
provide that thread ID, the thread list must be up to date
|
|
|
|
first. */
|
|
|
|
target_find_new_threads ();
|
|
|
|
|
[Ada] Re-implement `info tasks' command using ui-out
This is in preparation for providing a GDB/MI equivalent of
the `info tasks' command. The previous implementation was using
various printf commands to generate the command output, which
does not work at all if we want to use that same code to generate
the result for that new GDB/MI command.
This patch thus re-implements the `info tasks' command (with no
arguments) in a way that makes it GDB/MI friendly.
There is an additional hicup, which is the fact that the `info tasks'
command displays a completely different type of output when a task
ID is given. For instance:
(gdb) info task 2
Ada Task: 0x644d20
Name: my_callee
Thread: 0
LWP: 0x5809
Parent: 1 (main_task)
Base Priority: 48
State: Blocked in accept or select with terminate
The above output is better when in CLI mode, but really not
what we want when in GDB/MI mode. In GDB/MI mode, we want to
follow what the `-thread-info' command does when a task-id
is given as an argument, which is to produce the same table,
but with only one element/task in it.
For compatibility as well as practical reasons, we do not want
to change the output of the `info task TASKNO' command when in
CLI mode. But it's easy to preserve this behavior while providing
the desirable output when in GDB/MI mode. For this, the function
used to generated the `info tasks' output has been enhanced to take
an argument interpreted as a string. The CLI command knows to never
provide that argument, while the GDB/MI command will pass one if
provided by the user.
gdb/ChangeLog:
* ada-tasks.c (print_ada_task_info): New function, merging
short_task_info and info_tasks together. Reimplement using
ui-out instead of printing to stdout directly. Move the code
building and checking the task list here, instead of leaving it
in info_tasks_command.
(info_task): Move the code building and checking the task
list here, instead of leaving it in info_tasks_command.
(info_tasks_command): Delete code building and checking
the task list - moved elsewhere. Update calls to info_tasks
and info_task.
One of the minor changes the switch caused is the introduction
of a space between the "current" column, and the task "ID"
column, which wasn't there before. This matches what we do
in the "info threads" command, so I kept that change. This
required an adjustment in the testsuite, however...
gdb/testsuite/ChangeLog:
* gdb.ada/tasks.exp: Make the expected output for
the `info tasks' tests more resilient to spacing
changes.
2011-09-17 03:09:57 +08:00
|
|
|
data = get_ada_tasks_inferior_data (inf);
|
2011-10-22 02:46:06 +08:00
|
|
|
|
|
|
|
/* Compute the number of tasks that are going to be displayed
|
|
|
|
in the output. If an argument was given, there will be
|
|
|
|
at most 1 entry. Otherwise, there will be as many entries
|
|
|
|
as we have tasks. */
|
|
|
|
if (taskno_arg)
|
|
|
|
{
|
|
|
|
if (taskno_arg > 0
|
|
|
|
&& taskno_arg <= VEC_length (ada_task_info_s, data->task_list))
|
|
|
|
nb_tasks = 1;
|
|
|
|
else
|
|
|
|
nb_tasks = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
nb_tasks = VEC_length (ada_task_info_s, data->task_list);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
2011-10-04 05:38:39 +08:00
|
|
|
nb_columns = ui_out_is_mi_like_p (uiout) ? 8 : 7;
|
|
|
|
old_chain = make_cleanup_ui_out_table_begin_end (uiout, nb_columns,
|
|
|
|
nb_tasks, "tasks");
|
[Ada] Re-implement `info tasks' command using ui-out
This is in preparation for providing a GDB/MI equivalent of
the `info tasks' command. The previous implementation was using
various printf commands to generate the command output, which
does not work at all if we want to use that same code to generate
the result for that new GDB/MI command.
This patch thus re-implements the `info tasks' command (with no
arguments) in a way that makes it GDB/MI friendly.
There is an additional hicup, which is the fact that the `info tasks'
command displays a completely different type of output when a task
ID is given. For instance:
(gdb) info task 2
Ada Task: 0x644d20
Name: my_callee
Thread: 0
LWP: 0x5809
Parent: 1 (main_task)
Base Priority: 48
State: Blocked in accept or select with terminate
The above output is better when in CLI mode, but really not
what we want when in GDB/MI mode. In GDB/MI mode, we want to
follow what the `-thread-info' command does when a task-id
is given as an argument, which is to produce the same table,
but with only one element/task in it.
For compatibility as well as practical reasons, we do not want
to change the output of the `info task TASKNO' command when in
CLI mode. But it's easy to preserve this behavior while providing
the desirable output when in GDB/MI mode. For this, the function
used to generated the `info tasks' output has been enhanced to take
an argument interpreted as a string. The CLI command knows to never
provide that argument, while the GDB/MI command will pass one if
provided by the user.
gdb/ChangeLog:
* ada-tasks.c (print_ada_task_info): New function, merging
short_task_info and info_tasks together. Reimplement using
ui-out instead of printing to stdout directly. Move the code
building and checking the task list here, instead of leaving it
in info_tasks_command.
(info_task): Move the code building and checking the task
list here, instead of leaving it in info_tasks_command.
(info_tasks_command): Delete code building and checking
the task list - moved elsewhere. Update calls to info_tasks
and info_task.
One of the minor changes the switch caused is the introduction
of a space between the "current" column, and the task "ID"
column, which wasn't there before. This matches what we do
in the "info threads" command, so I kept that change. This
required an adjustment in the testsuite, however...
gdb/testsuite/ChangeLog:
* gdb.ada/tasks.exp: Make the expected output for
the `info tasks' tests more resilient to spacing
changes.
2011-09-17 03:09:57 +08:00
|
|
|
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");
|
2011-10-04 05:38:39 +08:00
|
|
|
/* The following column is provided in GDB/MI mode only because
|
|
|
|
it is only really useful in that mode, and also because it
|
|
|
|
allows us to keep the CLI output shorter and more compact. */
|
|
|
|
if (ui_out_is_mi_like_p (uiout))
|
|
|
|
ui_out_table_header (uiout, 4, ui_right, "thread-id", "");
|
[Ada] Re-implement `info tasks' command using ui-out
This is in preparation for providing a GDB/MI equivalent of
the `info tasks' command. The previous implementation was using
various printf commands to generate the command output, which
does not work at all if we want to use that same code to generate
the result for that new GDB/MI command.
This patch thus re-implements the `info tasks' command (with no
arguments) in a way that makes it GDB/MI friendly.
There is an additional hicup, which is the fact that the `info tasks'
command displays a completely different type of output when a task
ID is given. For instance:
(gdb) info task 2
Ada Task: 0x644d20
Name: my_callee
Thread: 0
LWP: 0x5809
Parent: 1 (main_task)
Base Priority: 48
State: Blocked in accept or select with terminate
The above output is better when in CLI mode, but really not
what we want when in GDB/MI mode. In GDB/MI mode, we want to
follow what the `-thread-info' command does when a task-id
is given as an argument, which is to produce the same table,
but with only one element/task in it.
For compatibility as well as practical reasons, we do not want
to change the output of the `info task TASKNO' command when in
CLI mode. But it's easy to preserve this behavior while providing
the desirable output when in GDB/MI mode. For this, the function
used to generated the `info tasks' output has been enhanced to take
an argument interpreted as a string. The CLI command knows to never
provide that argument, while the GDB/MI command will pass one if
provided by the user.
gdb/ChangeLog:
* ada-tasks.c (print_ada_task_info): New function, merging
short_task_info and info_tasks together. Reimplement using
ui-out instead of printing to stdout directly. Move the code
building and checking the task list here, instead of leaving it
in info_tasks_command.
(info_task): Move the code building and checking the task
list here, instead of leaving it in info_tasks_command.
(info_tasks_command): Delete code building and checking
the task list - moved elsewhere. Update calls to info_tasks
and info_task.
One of the minor changes the switch caused is the introduction
of a space between the "current" column, and the task "ID"
column, which wasn't there before. This matches what we do
in the "info threads" command, so I kept that change. This
required an adjustment in the testsuite, however...
gdb/testsuite/ChangeLog:
* gdb.ada/tasks.exp: Make the expected output for
the `info tasks' tests more resilient to spacing
changes.
2011-09-17 03:09:57 +08:00
|
|
|
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);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
2011-10-22 02:46:06 +08:00
|
|
|
for (taskno = 1;
|
|
|
|
taskno <= VEC_length (ada_task_info_s, data->task_list);
|
|
|
|
taskno++)
|
[Ada] Re-implement `info tasks' command using ui-out
This is in preparation for providing a GDB/MI equivalent of
the `info tasks' command. The previous implementation was using
various printf commands to generate the command output, which
does not work at all if we want to use that same code to generate
the result for that new GDB/MI command.
This patch thus re-implements the `info tasks' command (with no
arguments) in a way that makes it GDB/MI friendly.
There is an additional hicup, which is the fact that the `info tasks'
command displays a completely different type of output when a task
ID is given. For instance:
(gdb) info task 2
Ada Task: 0x644d20
Name: my_callee
Thread: 0
LWP: 0x5809
Parent: 1 (main_task)
Base Priority: 48
State: Blocked in accept or select with terminate
The above output is better when in CLI mode, but really not
what we want when in GDB/MI mode. In GDB/MI mode, we want to
follow what the `-thread-info' command does when a task-id
is given as an argument, which is to produce the same table,
but with only one element/task in it.
For compatibility as well as practical reasons, we do not want
to change the output of the `info task TASKNO' command when in
CLI mode. But it's easy to preserve this behavior while providing
the desirable output when in GDB/MI mode. For this, the function
used to generated the `info tasks' output has been enhanced to take
an argument interpreted as a string. The CLI command knows to never
provide that argument, while the GDB/MI command will pass one if
provided by the user.
gdb/ChangeLog:
* ada-tasks.c (print_ada_task_info): New function, merging
short_task_info and info_tasks together. Reimplement using
ui-out instead of printing to stdout directly. Move the code
building and checking the task list here, instead of leaving it
in info_tasks_command.
(info_task): Move the code building and checking the task
list here, instead of leaving it in info_tasks_command.
(info_tasks_command): Delete code building and checking
the task list - moved elsewhere. Update calls to info_tasks
and info_task.
One of the minor changes the switch caused is the introduction
of a space between the "current" column, and the task "ID"
column, which wasn't there before. This matches what we do
in the "info threads" command, so I kept that change. This
required an adjustment in the testsuite, however...
gdb/testsuite/ChangeLog:
* gdb.ada/tasks.exp: Make the expected output for
the `info tasks' tests more resilient to spacing
changes.
2011-09-17 03:09:57 +08:00
|
|
|
{
|
|
|
|
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;
|
2008-10-23 03:45:05 +08:00
|
|
|
|
[Ada] Re-implement `info tasks' command using ui-out
This is in preparation for providing a GDB/MI equivalent of
the `info tasks' command. The previous implementation was using
various printf commands to generate the command output, which
does not work at all if we want to use that same code to generate
the result for that new GDB/MI command.
This patch thus re-implements the `info tasks' command (with no
arguments) in a way that makes it GDB/MI friendly.
There is an additional hicup, which is the fact that the `info tasks'
command displays a completely different type of output when a task
ID is given. For instance:
(gdb) info task 2
Ada Task: 0x644d20
Name: my_callee
Thread: 0
LWP: 0x5809
Parent: 1 (main_task)
Base Priority: 48
State: Blocked in accept or select with terminate
The above output is better when in CLI mode, but really not
what we want when in GDB/MI mode. In GDB/MI mode, we want to
follow what the `-thread-info' command does when a task-id
is given as an argument, which is to produce the same table,
but with only one element/task in it.
For compatibility as well as practical reasons, we do not want
to change the output of the `info task TASKNO' command when in
CLI mode. But it's easy to preserve this behavior while providing
the desirable output when in GDB/MI mode. For this, the function
used to generated the `info tasks' output has been enhanced to take
an argument interpreted as a string. The CLI command knows to never
provide that argument, while the GDB/MI command will pass one if
provided by the user.
gdb/ChangeLog:
* ada-tasks.c (print_ada_task_info): New function, merging
short_task_info and info_tasks together. Reimplement using
ui-out instead of printing to stdout directly. Move the code
building and checking the task list here, instead of leaving it
in info_tasks_command.
(info_task): Move the code building and checking the task
list here, instead of leaving it in info_tasks_command.
(info_tasks_command): Delete code building and checking
the task list - moved elsewhere. Update calls to info_tasks
and info_task.
One of the minor changes the switch caused is the introduction
of a space between the "current" column, and the task "ID"
column, which wasn't there before. This matches what we do
in the "info threads" command, so I kept that change. This
required an adjustment in the testsuite, however...
gdb/testsuite/ChangeLog:
* gdb.ada/tasks.exp: Make the expected output for
the `info tasks' tests more resilient to spacing
changes.
2011-09-17 03:09:57 +08:00
|
|
|
gdb_assert (task_info != NULL);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
[Ada] Re-implement `info tasks' command using ui-out
This is in preparation for providing a GDB/MI equivalent of
the `info tasks' command. The previous implementation was using
various printf commands to generate the command output, which
does not work at all if we want to use that same code to generate
the result for that new GDB/MI command.
This patch thus re-implements the `info tasks' command (with no
arguments) in a way that makes it GDB/MI friendly.
There is an additional hicup, which is the fact that the `info tasks'
command displays a completely different type of output when a task
ID is given. For instance:
(gdb) info task 2
Ada Task: 0x644d20
Name: my_callee
Thread: 0
LWP: 0x5809
Parent: 1 (main_task)
Base Priority: 48
State: Blocked in accept or select with terminate
The above output is better when in CLI mode, but really not
what we want when in GDB/MI mode. In GDB/MI mode, we want to
follow what the `-thread-info' command does when a task-id
is given as an argument, which is to produce the same table,
but with only one element/task in it.
For compatibility as well as practical reasons, we do not want
to change the output of the `info task TASKNO' command when in
CLI mode. But it's easy to preserve this behavior while providing
the desirable output when in GDB/MI mode. For this, the function
used to generated the `info tasks' output has been enhanced to take
an argument interpreted as a string. The CLI command knows to never
provide that argument, while the GDB/MI command will pass one if
provided by the user.
gdb/ChangeLog:
* ada-tasks.c (print_ada_task_info): New function, merging
short_task_info and info_tasks together. Reimplement using
ui-out instead of printing to stdout directly. Move the code
building and checking the task list here, instead of leaving it
in info_tasks_command.
(info_task): Move the code building and checking the task
list here, instead of leaving it in info_tasks_command.
(info_tasks_command): Delete code building and checking
the task list - moved elsewhere. Update calls to info_tasks
and info_task.
One of the minor changes the switch caused is the introduction
of a space between the "current" column, and the task "ID"
column, which wasn't there before. This matches what we do
in the "info threads" command, so I kept that change. This
required an adjustment in the testsuite, however...
gdb/testsuite/ChangeLog:
* gdb.ada/tasks.exp: Make the expected output for
the `info tasks' tests more resilient to spacing
changes.
2011-09-17 03:09:57 +08:00
|
|
|
/* 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;
|
2008-10-23 03:45:05 +08:00
|
|
|
|
[Ada] Re-implement `info tasks' command using ui-out
This is in preparation for providing a GDB/MI equivalent of
the `info tasks' command. The previous implementation was using
various printf commands to generate the command output, which
does not work at all if we want to use that same code to generate
the result for that new GDB/MI command.
This patch thus re-implements the `info tasks' command (with no
arguments) in a way that makes it GDB/MI friendly.
There is an additional hicup, which is the fact that the `info tasks'
command displays a completely different type of output when a task
ID is given. For instance:
(gdb) info task 2
Ada Task: 0x644d20
Name: my_callee
Thread: 0
LWP: 0x5809
Parent: 1 (main_task)
Base Priority: 48
State: Blocked in accept or select with terminate
The above output is better when in CLI mode, but really not
what we want when in GDB/MI mode. In GDB/MI mode, we want to
follow what the `-thread-info' command does when a task-id
is given as an argument, which is to produce the same table,
but with only one element/task in it.
For compatibility as well as practical reasons, we do not want
to change the output of the `info task TASKNO' command when in
CLI mode. But it's easy to preserve this behavior while providing
the desirable output when in GDB/MI mode. For this, the function
used to generated the `info tasks' output has been enhanced to take
an argument interpreted as a string. The CLI command knows to never
provide that argument, while the GDB/MI command will pass one if
provided by the user.
gdb/ChangeLog:
* ada-tasks.c (print_ada_task_info): New function, merging
short_task_info and info_tasks together. Reimplement using
ui-out instead of printing to stdout directly. Move the code
building and checking the task list here, instead of leaving it
in info_tasks_command.
(info_task): Move the code building and checking the task
list here, instead of leaving it in info_tasks_command.
(info_tasks_command): Delete code building and checking
the task list - moved elsewhere. Update calls to info_tasks
and info_task.
One of the minor changes the switch caused is the introduction
of a space between the "current" column, and the task "ID"
column, which wasn't there before. This matches what we do
in the "info threads" command, so I kept that change. This
required an adjustment in the testsuite, however...
gdb/testsuite/ChangeLog:
* gdb.ada/tasks.exp: Make the expected output for
the `info tasks' tests more resilient to spacing
changes.
2011-09-17 03:09:57 +08:00
|
|
|
chain2 = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
[Ada] Re-implement `info tasks' command using ui-out
This is in preparation for providing a GDB/MI equivalent of
the `info tasks' command. The previous implementation was using
various printf commands to generate the command output, which
does not work at all if we want to use that same code to generate
the result for that new GDB/MI command.
This patch thus re-implements the `info tasks' command (with no
arguments) in a way that makes it GDB/MI friendly.
There is an additional hicup, which is the fact that the `info tasks'
command displays a completely different type of output when a task
ID is given. For instance:
(gdb) info task 2
Ada Task: 0x644d20
Name: my_callee
Thread: 0
LWP: 0x5809
Parent: 1 (main_task)
Base Priority: 48
State: Blocked in accept or select with terminate
The above output is better when in CLI mode, but really not
what we want when in GDB/MI mode. In GDB/MI mode, we want to
follow what the `-thread-info' command does when a task-id
is given as an argument, which is to produce the same table,
but with only one element/task in it.
For compatibility as well as practical reasons, we do not want
to change the output of the `info task TASKNO' command when in
CLI mode. But it's easy to preserve this behavior while providing
the desirable output when in GDB/MI mode. For this, the function
used to generated the `info tasks' output has been enhanced to take
an argument interpreted as a string. The CLI command knows to never
provide that argument, while the GDB/MI command will pass one if
provided by the user.
gdb/ChangeLog:
* ada-tasks.c (print_ada_task_info): New function, merging
short_task_info and info_tasks together. Reimplement using
ui-out instead of printing to stdout directly. Move the code
building and checking the task list here, instead of leaving it
in info_tasks_command.
(info_task): Move the code building and checking the task
list here, instead of leaving it in info_tasks_command.
(info_tasks_command): Delete code building and checking
the task list - moved elsewhere. Update calls to info_tasks
and info_task.
One of the minor changes the switch caused is the introduction
of a space between the "current" column, and the task "ID"
column, which wasn't there before. This matches what we do
in the "info threads" command, so I kept that change. This
required an adjustment in the testsuite, however...
gdb/testsuite/ChangeLog:
* gdb.ada/tasks.exp: Make the expected output for
the `info tasks' tests more resilient to spacing
changes.
2011-09-17 03:09:57 +08:00
|
|
|
/* 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");
|
2008-10-23 03:45:05 +08:00
|
|
|
|
[Ada] Re-implement `info tasks' command using ui-out
This is in preparation for providing a GDB/MI equivalent of
the `info tasks' command. The previous implementation was using
various printf commands to generate the command output, which
does not work at all if we want to use that same code to generate
the result for that new GDB/MI command.
This patch thus re-implements the `info tasks' command (with no
arguments) in a way that makes it GDB/MI friendly.
There is an additional hicup, which is the fact that the `info tasks'
command displays a completely different type of output when a task
ID is given. For instance:
(gdb) info task 2
Ada Task: 0x644d20
Name: my_callee
Thread: 0
LWP: 0x5809
Parent: 1 (main_task)
Base Priority: 48
State: Blocked in accept or select with terminate
The above output is better when in CLI mode, but really not
what we want when in GDB/MI mode. In GDB/MI mode, we want to
follow what the `-thread-info' command does when a task-id
is given as an argument, which is to produce the same table,
but with only one element/task in it.
For compatibility as well as practical reasons, we do not want
to change the output of the `info task TASKNO' command when in
CLI mode. But it's easy to preserve this behavior while providing
the desirable output when in GDB/MI mode. For this, the function
used to generated the `info tasks' output has been enhanced to take
an argument interpreted as a string. The CLI command knows to never
provide that argument, while the GDB/MI command will pass one if
provided by the user.
gdb/ChangeLog:
* ada-tasks.c (print_ada_task_info): New function, merging
short_task_info and info_tasks together. Reimplement using
ui-out instead of printing to stdout directly. Move the code
building and checking the task list here, instead of leaving it
in info_tasks_command.
(info_task): Move the code building and checking the task
list here, instead of leaving it in info_tasks_command.
(info_tasks_command): Delete code building and checking
the task list - moved elsewhere. Update calls to info_tasks
and info_task.
One of the minor changes the switch caused is the introduction
of a space between the "current" column, and the task "ID"
column, which wasn't there before. This matches what we do
in the "info threads" command, so I kept that change. This
required an adjustment in the testsuite, however...
gdb/testsuite/ChangeLog:
* gdb.ada/tasks.exp: Make the expected output for
the `info tasks' tests more resilient to spacing
changes.
2011-09-17 03:09:57 +08:00
|
|
|
/* Print the task number. */
|
|
|
|
ui_out_field_int (uiout, "id", taskno);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
[Ada] Re-implement `info tasks' command using ui-out
This is in preparation for providing a GDB/MI equivalent of
the `info tasks' command. The previous implementation was using
various printf commands to generate the command output, which
does not work at all if we want to use that same code to generate
the result for that new GDB/MI command.
This patch thus re-implements the `info tasks' command (with no
arguments) in a way that makes it GDB/MI friendly.
There is an additional hicup, which is the fact that the `info tasks'
command displays a completely different type of output when a task
ID is given. For instance:
(gdb) info task 2
Ada Task: 0x644d20
Name: my_callee
Thread: 0
LWP: 0x5809
Parent: 1 (main_task)
Base Priority: 48
State: Blocked in accept or select with terminate
The above output is better when in CLI mode, but really not
what we want when in GDB/MI mode. In GDB/MI mode, we want to
follow what the `-thread-info' command does when a task-id
is given as an argument, which is to produce the same table,
but with only one element/task in it.
For compatibility as well as practical reasons, we do not want
to change the output of the `info task TASKNO' command when in
CLI mode. But it's easy to preserve this behavior while providing
the desirable output when in GDB/MI mode. For this, the function
used to generated the `info tasks' output has been enhanced to take
an argument interpreted as a string. The CLI command knows to never
provide that argument, while the GDB/MI command will pass one if
provided by the user.
gdb/ChangeLog:
* ada-tasks.c (print_ada_task_info): New function, merging
short_task_info and info_tasks together. Reimplement using
ui-out instead of printing to stdout directly. Move the code
building and checking the task list here, instead of leaving it
in info_tasks_command.
(info_task): Move the code building and checking the task
list here, instead of leaving it in info_tasks_command.
(info_tasks_command): Delete code building and checking
the task list - moved elsewhere. Update calls to info_tasks
and info_task.
One of the minor changes the switch caused is the introduction
of a space between the "current" column, and the task "ID"
column, which wasn't there before. This matches what we do
in the "info threads" command, so I kept that change. This
required an adjustment in the testsuite, however...
gdb/testsuite/ChangeLog:
* gdb.ada/tasks.exp: Make the expected output for
the `info tasks' tests more resilient to spacing
changes.
2011-09-17 03:09:57 +08:00
|
|
|
/* Print the Task ID. */
|
|
|
|
ui_out_field_fmt (uiout, "task-id", "%9lx", (long) task_info->task_id);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
2011-10-04 05:38:39 +08:00
|
|
|
/* Print the associated Thread ID. */
|
|
|
|
if (ui_out_is_mi_like_p (uiout))
|
|
|
|
{
|
|
|
|
const int thread_id = pid_to_thread_id (task_info->ptid);
|
|
|
|
|
|
|
|
if (thread_id != 0)
|
|
|
|
ui_out_field_int (uiout, "thread-id", thread_id);
|
|
|
|
else
|
|
|
|
/* This should never happen unless there is a bug somewhere,
|
|
|
|
but be resilient when that happens. */
|
|
|
|
ui_out_field_skip (uiout, "thread-id");
|
|
|
|
}
|
|
|
|
|
[Ada] Re-implement `info tasks' command using ui-out
This is in preparation for providing a GDB/MI equivalent of
the `info tasks' command. The previous implementation was using
various printf commands to generate the command output, which
does not work at all if we want to use that same code to generate
the result for that new GDB/MI command.
This patch thus re-implements the `info tasks' command (with no
arguments) in a way that makes it GDB/MI friendly.
There is an additional hicup, which is the fact that the `info tasks'
command displays a completely different type of output when a task
ID is given. For instance:
(gdb) info task 2
Ada Task: 0x644d20
Name: my_callee
Thread: 0
LWP: 0x5809
Parent: 1 (main_task)
Base Priority: 48
State: Blocked in accept or select with terminate
The above output is better when in CLI mode, but really not
what we want when in GDB/MI mode. In GDB/MI mode, we want to
follow what the `-thread-info' command does when a task-id
is given as an argument, which is to produce the same table,
but with only one element/task in it.
For compatibility as well as practical reasons, we do not want
to change the output of the `info task TASKNO' command when in
CLI mode. But it's easy to preserve this behavior while providing
the desirable output when in GDB/MI mode. For this, the function
used to generated the `info tasks' output has been enhanced to take
an argument interpreted as a string. The CLI command knows to never
provide that argument, while the GDB/MI command will pass one if
provided by the user.
gdb/ChangeLog:
* ada-tasks.c (print_ada_task_info): New function, merging
short_task_info and info_tasks together. Reimplement using
ui-out instead of printing to stdout directly. Move the code
building and checking the task list here, instead of leaving it
in info_tasks_command.
(info_task): Move the code building and checking the task
list here, instead of leaving it in info_tasks_command.
(info_tasks_command): Delete code building and checking
the task list - moved elsewhere. Update calls to info_tasks
and info_task.
One of the minor changes the switch caused is the introduction
of a space between the "current" column, and the task "ID"
column, which wasn't there before. This matches what we do
in the "info threads" command, so I kept that change. This
required an adjustment in the testsuite, however...
gdb/testsuite/ChangeLog:
* gdb.ada/tasks.exp: Make the expected output for
the `info tasks' tests more resilient to spacing
changes.
2011-09-17 03:09:57 +08:00
|
|
|
/* 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);
|
2008-10-23 03:45:05 +08:00
|
|
|
}
|
|
|
|
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
/* Print a detailed description of the Ada task whose ID is TASKNO_STR
|
|
|
|
for the given inferior (INF). */
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
static void
|
[Ada] Re-implement `info tasks' command using ui-out
This is in preparation for providing a GDB/MI equivalent of
the `info tasks' command. The previous implementation was using
various printf commands to generate the command output, which
does not work at all if we want to use that same code to generate
the result for that new GDB/MI command.
This patch thus re-implements the `info tasks' command (with no
arguments) in a way that makes it GDB/MI friendly.
There is an additional hicup, which is the fact that the `info tasks'
command displays a completely different type of output when a task
ID is given. For instance:
(gdb) info task 2
Ada Task: 0x644d20
Name: my_callee
Thread: 0
LWP: 0x5809
Parent: 1 (main_task)
Base Priority: 48
State: Blocked in accept or select with terminate
The above output is better when in CLI mode, but really not
what we want when in GDB/MI mode. In GDB/MI mode, we want to
follow what the `-thread-info' command does when a task-id
is given as an argument, which is to produce the same table,
but with only one element/task in it.
For compatibility as well as practical reasons, we do not want
to change the output of the `info task TASKNO' command when in
CLI mode. But it's easy to preserve this behavior while providing
the desirable output when in GDB/MI mode. For this, the function
used to generated the `info tasks' output has been enhanced to take
an argument interpreted as a string. The CLI command knows to never
provide that argument, while the GDB/MI command will pass one if
provided by the user.
gdb/ChangeLog:
* ada-tasks.c (print_ada_task_info): New function, merging
short_task_info and info_tasks together. Reimplement using
ui-out instead of printing to stdout directly. Move the code
building and checking the task list here, instead of leaving it
in info_tasks_command.
(info_task): Move the code building and checking the task
list here, instead of leaving it in info_tasks_command.
(info_tasks_command): Delete code building and checking
the task list - moved elsewhere. Update calls to info_tasks
and info_task.
One of the minor changes the switch caused is the introduction
of a space between the "current" column, and the task "ID"
column, which wasn't there before. This matches what we do
in the "info threads" command, so I kept that change. This
required an adjustment in the testsuite, however...
gdb/testsuite/ChangeLog:
* gdb.ada/tasks.exp: Make the expected output for
the `info tasks' tests more resilient to spacing
changes.
2011-09-17 03:09:57 +08:00
|
|
|
info_task (struct ui_out *uiout, char *taskno_str, struct inferior *inf)
|
2008-10-23 03:45:05 +08:00
|
|
|
{
|
|
|
|
const int taskno = value_as_long (parse_and_eval (taskno_str));
|
|
|
|
struct ada_task_info *task_info;
|
|
|
|
int parent_taskno = 0;
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
struct ada_tasks_inferior_data *data = get_ada_tasks_inferior_data (inf);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
[Ada] Re-implement `info tasks' command using ui-out
This is in preparation for providing a GDB/MI equivalent of
the `info tasks' command. The previous implementation was using
various printf commands to generate the command output, which
does not work at all if we want to use that same code to generate
the result for that new GDB/MI command.
This patch thus re-implements the `info tasks' command (with no
arguments) in a way that makes it GDB/MI friendly.
There is an additional hicup, which is the fact that the `info tasks'
command displays a completely different type of output when a task
ID is given. For instance:
(gdb) info task 2
Ada Task: 0x644d20
Name: my_callee
Thread: 0
LWP: 0x5809
Parent: 1 (main_task)
Base Priority: 48
State: Blocked in accept or select with terminate
The above output is better when in CLI mode, but really not
what we want when in GDB/MI mode. In GDB/MI mode, we want to
follow what the `-thread-info' command does when a task-id
is given as an argument, which is to produce the same table,
but with only one element/task in it.
For compatibility as well as practical reasons, we do not want
to change the output of the `info task TASKNO' command when in
CLI mode. But it's easy to preserve this behavior while providing
the desirable output when in GDB/MI mode. For this, the function
used to generated the `info tasks' output has been enhanced to take
an argument interpreted as a string. The CLI command knows to never
provide that argument, while the GDB/MI command will pass one if
provided by the user.
gdb/ChangeLog:
* ada-tasks.c (print_ada_task_info): New function, merging
short_task_info and info_tasks together. Reimplement using
ui-out instead of printing to stdout directly. Move the code
building and checking the task list here, instead of leaving it
in info_tasks_command.
(info_task): Move the code building and checking the task
list here, instead of leaving it in info_tasks_command.
(info_tasks_command): Delete code building and checking
the task list - moved elsewhere. Update calls to info_tasks
and info_task.
One of the minor changes the switch caused is the introduction
of a space between the "current" column, and the task "ID"
column, which wasn't there before. This matches what we do
in the "info threads" command, so I kept that change. This
required an adjustment in the testsuite, however...
gdb/testsuite/ChangeLog:
* gdb.ada/tasks.exp: Make the expected output for
the `info tasks' tests more resilient to spacing
changes.
2011-09-17 03:09:57 +08:00
|
|
|
if (ada_build_task_list () == 0)
|
|
|
|
{
|
|
|
|
ui_out_message (uiout, 0,
|
|
|
|
_("Your application does not use any Ada tasks.\n"));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
if (taskno <= 0 || taskno > VEC_length (ada_task_info_s, data->task_list))
|
2008-10-23 03:45:05 +08:00
|
|
|
error (_("Task ID %d not known. Use the \"info tasks\" command to\n"
|
|
|
|
"see the IDs of currently known tasks"), taskno);
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
task_info = VEC_index (ada_task_info_s, data->task_list, taskno - 1);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
/* Print the Ada task ID. */
|
* defs.h (strlen_paddr, paddr, paddr_nz): Remove.
(paddress): Add GDBARCH parameter.
* utils.c (strlen_paddr, paddr, paddr_nz): Remove.
(paddress): Add GDBARCH parameter, use it instead of current_gdbarch.
* ui-out.h (ui_out_field_core_addr): Add GDBARCH parameter.
* ui-out.c (ui_out_field_core_addr): Add GDBARCH parameter,
use it instead of current_gdbarch.
Update calls to ui_out_field_core_addr to pass architecture:
* ada-lang.c (print_one_exception): Update.
* breakpoint.c (print_one_breakpoint_location,
print_one_exception_catchpoint): Update.
* disasm.c (dump_insns): Update.
* darwin-nat-info.c (darwin_debug_regions_recurse): Update.
* mi/mi-main.c (mi_cmd_data_read_memory): Update.
* mi/mi-symbol-cmds.c: Include "objfiles.h".
(mi_cmd_symbol_list_lines): Update.
* stack.c (print_frame_info, print_frame): Update.
Update callers of paddress to pass architecture:
* ada-tasks.c (info_task): Update.
* ada-valprint.c (ada_val_print_1): Update.
* annotate.c (annotate_source, annotate_frame_begin): Update.
* breakpoint.c (insert_bp_location, describe_other_breakpoints,
mention): Update.
* cli/cli-cmds.c (edit_command, list_command, print_disassembly):
Update.
* corefile.c (memory_error): Update.
* c-valprint.c (print_function_pointer_address, c_val_print): Update.
* disasm.c (dis_asm_print_address): Update.
* exec.c (print_section_info): Update.
* f-valprint.c (f_val_print): Update.
* infcmd.c: Include "arch-utils.h".
(jump_command, program_info): Update.
* linux-fork.c: Include "arch-utils.h".
(info_forks_command): Update.
* m2-valprint.c (print_function_pointer_address,
print_unpacked_pointer, print_variable_at_address,
m2_val_print): Update.
* m32r-rom.c (m32r_load_section, m32r_load, m32r_upload_command):
Update.
* printcmd.c (print_address, print_address_demangle, address_info):
Update.
* p-valprint.c (pascal_val_print): Update.
* source.c: Include "arch-utils.h".
(line_info): Update.
* stack.c (frame_info, print_block_frame_labels): Update.
* symfile.c (add_symbol_file_command, list_overlays_command): Update.
* symmisc.c (dump_msymbols, dump_psymtab, dump_symtab_1,
print_symbol, print_partial_symbols, maintenance_info_psymtabs,
maintenance_check_symtabs): Update.
* symtab.c (find_pc_sect_symtab): Update.
* target.c (deprecated_debug_xfer_memory): Update.
* tracepoint.c (scope_info): Update.
* tui/tui-stack.c (tui_make_status_line): Update.
* valprint.c (val_print_string): Update.
Update callers of paddr_nz to use paddress instead (keeping
user-visible output identical):
* alpha-tdep.c (alpha_heuristic_proc_start): Update.
* amd64-tdep.c (fixup_riprel, amd64_displaced_step_copy_insn,
amd64_displaced_step_fixup): Update.
* arch-utils.c (simple_displaced_step_copy_insn): Update.
* auxv.c (fprint_target_auxv): Update.
* breakpoint.c (insert_single_step_breakpoint): Update.
* buildsym.c (finish_block): Update.
* cli/cli-dump.c (restore_section_callback): Update.
* fbsd-nat.c (fbsd_find_memory_regions): Update.
* frame.c (frame_unwind_register_value): Update.
* gcore.c (gcore_create_callback): Update.
* hppa-tdep.c (hppa_frame_cache, hppa_skip_trampoline_code): Update.
* i386-tdep.c (i386_displaced_step_fixup, i386_record_modrm,
i386_record_lea_modrm_addr, i386_record_lea_modrm,
i386_process_record): Update.
* ia64-tdep.c (ia64_frame_this_id, ia64_sigtramp_frame_this_id,
ia64_libunwind_frame_this_id, ia64_libunwind_sigtramp_frame_this_id,
ia64_dummy_id, ia64_access_reg, ia64_access_rse_reg): Update.
* infrun.c (displaced_step_prepare, displaced_step_fixup,
handle_inferior_event, insert_step_resume_breakpoint_at_sal,
insert_longjmp_resume_breakpoint): Update.
* linux-nat.c (linux_nat_find_memory_regions): Update.
* linux-record.c (record_linux_system_call): Update.
* mips-tdep.c (heuristic_proc_start, mips_eabi_push_dummy_call,
mips_n32n64_push_dummy_call, mips_o32_push_dummy_call,
mips_o64_push_dummy_call): Update.
* monitor.c (monitor_error, monitor_remove_breakpoint): Update.
* record.c (record_arch_list_add_mem, record_wait,
record_xfer_partial): Update.
* remote-mips.c (mips_fetch_word, mips_check_lsi_error,
mips_common_breakpoint): Update.
* remote-sim.c (gdbsim_xfer_inferior_memory): Update.
* rs6000-tdep.c (ppc_displaced_step_fixup): Update.
* solib-som.c (som_current_sos): Update.
* symfile.c (load_progress, generic_load): Update.
* symfile-mem.c (add_vsyscall_page): Update.
* valops.c (value_fetch_lazy): Update.
* windows-tdep.c (windows_xfer_shared_library): Update.
Update callers of paddr_nz to use paddress instead (changing
user-visible output to make it more correct):
* dwarf2loc.c (locexpr_describe_location): Update.
* ia64-tdep.c (ia64_memory_insert_breakpoint,
ia64_memory_remove_breakpoint): Update.
* jv-valprint.c (java_value_print): Update.
* m32c-tdep.c (m32c_m16c_address_to_pointer): Update.
* monitor.c (monitor_read_memory): Update.
Update callers of paddr to use paddress instead (changing
user-visible output to make it more correct):
* arm-tdep.c (arm_push_dummy_call): Update.
* breakpoint.c (insert_bp_location, create_thread_event_breakpoint,
create_breakpoint): Update.
* darwin-nat-info.c (darwin_debug_regions): Update.
* dcache.c (dcache_info): Update.
* dsrec.c (load_srec, make_srec): Update.
* dwarf2-frame.c (dwarf2_restore_rule, execute_cfa_program,
dwarf2_frame_cache): Update.
* gcore.c (gcore_copy_callback): Update.
* gnu-nat.c (gnu_xfer_memory): Update.
* mips-linux-nat.c (mips_show_dr): Update.
* monitor.c (monitor_write_memory, monitor_insert_breakpoint,
monitor_remove_breakpoint): Update.
* remote.c (compare_sections_command): Update.
* remote-m32r-sdi.c (m32r_xfer_memory, m32r_insert_breakpoint,
m32r_remove_breakpoint, m32r_insert_watchpoint,
m32r_remove_watchpoint): Update.
* sol-thread.c (info_cb): Update.
* symfile.c (load_progress): Update.
Update callers of paddress or paddr_nz to use hex_string instead
(changes output of internal/error/debug messages only):
* dwarf2read.c (dump_die_shallow): Update.
* frame.c (fprint_field, fprint_frame, frame_pc_unwind,
get_frame_func, create_new_frame): Update.
* hppa-tdep.c (find_unwind_entry, unwind_command): Update.
* ia64-tdep.c (get_kernel_table, ia64_find_proc_info_x,
ia64_get_dyn_info_list): Update.
* maint.c (maintenance_translate_address): Update.
* mi/mi-cmd-var.c (mi_cmd_var_create): Update.
* target.c (target_flash_erase): Update.
Update callers of paddr/paddr_nz to use phex/phex_nz instead,
using an appropriate address size. Remove use of strlen_paddr.
* exec.c (exec_files_info): Update.
* i386-nat.c (i386_show_dr): Update.
* remote.c (remote_flash_erase): Update.
* m32r-rom.c (m32r_load_section): Update.
* monitor.c (monitor_vsprintf, monitor_store_register): Update.
* remote.c (remote_check_symbols, remote_search_memory): Update.
* remote-mips.c (mips_request, mips_common_breakpoint): Update.
* scm-valprint.c (scm_ipruk, scm_scmval_print): Update.
* sh64-tdep.c (sh64_show_media_regs, sh64_show_compact_regs): Update.
* sh-tdep.c (sh_generic_show_regs, sh3_show_regs, sh2e_show_regs,
sh2a_show_regs, sh2a_nofpu_show_regs, sh3e_show_regs,
sh3_dsp_show_regs, sh4_show_regs, sh4_nofpu_show_regs,
sh_dsp_show_regs): Update.
* xcoffsolib.c (sharedlibrary_command): Update.
* maint.c (maint_print_section_info): Add ADDR_SIZE parameter.
Use hex_string_custom instead of paddr.
(print_bfd_section_info): Pass address size.
(print_objfile_section_info): Likewise.
* annotate.h (annotate_source): Add GDBARCH parameter.
(annotate_frame_begin): Likewise.
* annotate.c (annotate_source): Add GDBARCH parameter.
(annotate_frame_begin): Likewise.
* source.c (identify_source_line): Update call to annotate_source.
* stack.c (print_frame_info, print_frame): Update call to
annotate_frame_begin.
* breakpoint.c (describe_other_breakpoints): Add GDBARCH parameter.
(create_breakpoint, create_ada_exception_breakpoint): Update call.
* stack.c (print_block_frame_labels): Add GDBARCH parameter.
(print_frame_label_vars): Update call.
* symmisc.c (print_partial_symbols): Add GDBARCH parameter.
(dump_psymtab): Update call to print_partial_symbols.
(struct print_symbol_args): Add GDBARCH member.
(dump_symtab_1): Set print_symbol_args architecture member.
(print_symbol): Use it.
* windows-tdep.h (windows_xfer_shared_library): Add GDBARCH
parameter.
* windows-tdep.c (windows_xfer_shared_library): Likewise.
* i386-cygwin-tdep.c (struct cpms_data): Add GDBARCH member.
(core_process_module_section): Pass architecture from cpms_data to
windows_xfer_shared_library.
(windows_core_xfer_shared_libraries): Initialize cmps_data
architecture member.
* windows-nat.c (windows_xfer_shared_libraries): Pass architecture
to windows_xfer_shared_library.
* defs.h (print_address): Add GDBARCH parameter.
* printcmd.c (print_address): Add GDBARCH parameter.
(print_scalar_formatted, do_examine): Update call.
* findcmd.c (find_command): Update call.
* tracepoint.c: Include "arch-utils.h".
(trace_find_line_command): Update call.
* tui/tui-disasm.c (tui_disassemble): Update call.
* value.h (print_address_demangle): Add GDBARCH parameter.
* printcmd.c (print_address_demangle): Add GDBARCH parameter.
* c-valprint.c (print_function_pointer_address, c_val_print):
Update call.
* f-valprint.c (f_val_print): Update call.
* gnu-v3-abi.c (gnuv3_print_method_ptr): Update call.
* jv-valprint.c (java_val_print): Update call.
* m2-valprint.c (print_function_pointer_address, m2_val_print):
Update call.
* p-valprint.c (pascal_val_print): Update call.
* disasm.c (gdb_disassemble_info): Install architecture into
di.application_data field.
testsuite/ChangeLog:
* gdb.threads/tls-shared.exp: Update to locexpr_describe_location
change to prefix TLS offset in hex with 0x.
doc/ChangeLog:
* gdbint.texinfo (Item Output Functions): Update signature
for ui_out_field_core_addr.
2009-07-03 01:21:10 +08:00
|
|
|
printf_filtered (_("Ada Task: %s\n"),
|
|
|
|
paddress (target_gdbarch, task_info->task_id));
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
/* 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"));
|
|
|
|
|
|
|
|
/* 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));
|
|
|
|
|
|
|
|
/* Print who is the parent (if any). */
|
|
|
|
if (task_info->parent != 0)
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
parent_taskno = get_task_number_from_id (task_info->parent, inf);
|
2008-10-23 03:45:05 +08:00
|
|
|
if (parent_taskno)
|
|
|
|
{
|
|
|
|
struct ada_task_info *parent =
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
VEC_index (ada_task_info_s, data->task_list, parent_taskno - 1);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
printf_filtered (_("Parent: %d"), parent_taskno);
|
|
|
|
if (parent->name[0] != '\0')
|
|
|
|
printf_filtered (" (%s)", parent->name);
|
|
|
|
printf_filtered ("\n");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
printf_filtered (_("No parent\n"));
|
|
|
|
|
|
|
|
/* Print the base priority. */
|
|
|
|
printf_filtered (_("Base Priority: %d\n"), task_info->priority);
|
|
|
|
|
|
|
|
/* print the task current state. */
|
|
|
|
{
|
|
|
|
int target_taskno = 0;
|
|
|
|
|
|
|
|
if (task_info->caller_task)
|
|
|
|
{
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
target_taskno = get_task_number_from_id (task_info->caller_task, inf);
|
2008-10-23 03:45:05 +08:00
|
|
|
printf_filtered (_("State: Accepting rendezvous with %d"),
|
|
|
|
target_taskno);
|
|
|
|
}
|
|
|
|
else if (task_info->state == Entry_Caller_Sleep && task_info->called_task)
|
|
|
|
{
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
target_taskno = get_task_number_from_id (task_info->called_task, inf);
|
2008-10-23 03:45:05 +08:00
|
|
|
printf_filtered (_("State: Waiting on task %d's entry"),
|
|
|
|
target_taskno);
|
|
|
|
}
|
|
|
|
else
|
2008-10-23 23:42:19 +08:00
|
|
|
printf_filtered (_("State: %s"), _(long_task_states[task_info->state]));
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
if (target_taskno)
|
|
|
|
{
|
|
|
|
struct ada_task_info *target_task_info =
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
VEC_index (ada_task_info_s, data->task_list, target_taskno - 1);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
if (target_task_info->name[0] != '\0')
|
|
|
|
printf_filtered (" (%s)", target_task_info->name);
|
|
|
|
}
|
|
|
|
|
|
|
|
printf_filtered ("\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
info_tasks_command (char *arg, int from_tty)
|
|
|
|
{
|
2011-09-17 03:09:26 +08:00
|
|
|
struct ui_out *uiout = current_uiout;
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
if (arg == NULL || *arg == '\0')
|
[Ada] Re-implement `info tasks' command using ui-out
This is in preparation for providing a GDB/MI equivalent of
the `info tasks' command. The previous implementation was using
various printf commands to generate the command output, which
does not work at all if we want to use that same code to generate
the result for that new GDB/MI command.
This patch thus re-implements the `info tasks' command (with no
arguments) in a way that makes it GDB/MI friendly.
There is an additional hicup, which is the fact that the `info tasks'
command displays a completely different type of output when a task
ID is given. For instance:
(gdb) info task 2
Ada Task: 0x644d20
Name: my_callee
Thread: 0
LWP: 0x5809
Parent: 1 (main_task)
Base Priority: 48
State: Blocked in accept or select with terminate
The above output is better when in CLI mode, but really not
what we want when in GDB/MI mode. In GDB/MI mode, we want to
follow what the `-thread-info' command does when a task-id
is given as an argument, which is to produce the same table,
but with only one element/task in it.
For compatibility as well as practical reasons, we do not want
to change the output of the `info task TASKNO' command when in
CLI mode. But it's easy to preserve this behavior while providing
the desirable output when in GDB/MI mode. For this, the function
used to generated the `info tasks' output has been enhanced to take
an argument interpreted as a string. The CLI command knows to never
provide that argument, while the GDB/MI command will pass one if
provided by the user.
gdb/ChangeLog:
* ada-tasks.c (print_ada_task_info): New function, merging
short_task_info and info_tasks together. Reimplement using
ui-out instead of printing to stdout directly. Move the code
building and checking the task list here, instead of leaving it
in info_tasks_command.
(info_task): Move the code building and checking the task
list here, instead of leaving it in info_tasks_command.
(info_tasks_command): Delete code building and checking
the task list - moved elsewhere. Update calls to info_tasks
and info_task.
One of the minor changes the switch caused is the introduction
of a space between the "current" column, and the task "ID"
column, which wasn't there before. This matches what we do
in the "info threads" command, so I kept that change. This
required an adjustment in the testsuite, however...
gdb/testsuite/ChangeLog:
* gdb.ada/tasks.exp: Make the expected output for
the `info tasks' tests more resilient to spacing
changes.
2011-09-17 03:09:57 +08:00
|
|
|
print_ada_task_info (uiout, NULL, current_inferior ());
|
2008-10-23 03:45:05 +08:00
|
|
|
else
|
[Ada] Re-implement `info tasks' command using ui-out
This is in preparation for providing a GDB/MI equivalent of
the `info tasks' command. The previous implementation was using
various printf commands to generate the command output, which
does not work at all if we want to use that same code to generate
the result for that new GDB/MI command.
This patch thus re-implements the `info tasks' command (with no
arguments) in a way that makes it GDB/MI friendly.
There is an additional hicup, which is the fact that the `info tasks'
command displays a completely different type of output when a task
ID is given. For instance:
(gdb) info task 2
Ada Task: 0x644d20
Name: my_callee
Thread: 0
LWP: 0x5809
Parent: 1 (main_task)
Base Priority: 48
State: Blocked in accept or select with terminate
The above output is better when in CLI mode, but really not
what we want when in GDB/MI mode. In GDB/MI mode, we want to
follow what the `-thread-info' command does when a task-id
is given as an argument, which is to produce the same table,
but with only one element/task in it.
For compatibility as well as practical reasons, we do not want
to change the output of the `info task TASKNO' command when in
CLI mode. But it's easy to preserve this behavior while providing
the desirable output when in GDB/MI mode. For this, the function
used to generated the `info tasks' output has been enhanced to take
an argument interpreted as a string. The CLI command knows to never
provide that argument, while the GDB/MI command will pass one if
provided by the user.
gdb/ChangeLog:
* ada-tasks.c (print_ada_task_info): New function, merging
short_task_info and info_tasks together. Reimplement using
ui-out instead of printing to stdout directly. Move the code
building and checking the task list here, instead of leaving it
in info_tasks_command.
(info_task): Move the code building and checking the task
list here, instead of leaving it in info_tasks_command.
(info_tasks_command): Delete code building and checking
the task list - moved elsewhere. Update calls to info_tasks
and info_task.
One of the minor changes the switch caused is the introduction
of a space between the "current" column, and the task "ID"
column, which wasn't there before. This matches what we do
in the "info threads" command, so I kept that change. This
required an adjustment in the testsuite, however...
gdb/testsuite/ChangeLog:
* gdb.ada/tasks.exp: Make the expected output for
the `info tasks' tests more resilient to spacing
changes.
2011-09-17 03:09:57 +08:00
|
|
|
info_task (uiout, arg, current_inferior ());
|
2008-10-23 03:45:05 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Print a message telling the user id of the current task.
|
|
|
|
This function assumes that tasking is in use in the inferior. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
display_current_task_id (void)
|
|
|
|
{
|
|
|
|
const int current_task = ada_get_task_number (inferior_ptid);
|
|
|
|
|
|
|
|
if (current_task == 0)
|
|
|
|
printf_filtered (_("[Current task is unknown]\n"));
|
|
|
|
else
|
|
|
|
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
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
task_command_1 (char *taskno_str, int from_tty, struct inferior *inf)
|
2008-10-23 03:45:05 +08:00
|
|
|
{
|
|
|
|
const int taskno = value_as_long (parse_and_eval (taskno_str));
|
|
|
|
struct ada_task_info *task_info;
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
struct ada_tasks_inferior_data *data = get_ada_tasks_inferior_data (inf);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
if (taskno <= 0 || taskno > VEC_length (ada_task_info_s, data->task_list))
|
2008-10-23 03:45:05 +08:00
|
|
|
error (_("Task ID %d not known. Use the \"info tasks\" command to\n"
|
|
|
|
"see the IDs of currently known tasks"), taskno);
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
task_info = VEC_index (ada_task_info_s, data->task_list, taskno - 1);
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
if (!ada_task_is_alive (task_info))
|
|
|
|
error (_("Cannot switch to task %d: Task is no longer running"), taskno);
|
|
|
|
|
2009-04-24 02:55:20 +08:00
|
|
|
/* 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 ();
|
|
|
|
|
2010-03-17 02:47:15 +08:00
|
|
|
/* 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);
|
|
|
|
|
2008-10-23 03:45:05 +08:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* 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)
|
|
|
|
{
|
2011-09-17 03:09:26 +08:00
|
|
|
struct ui_out *uiout = current_uiout;
|
2008-10-23 03:45:05 +08:00
|
|
|
|
2011-09-17 03:09:26 +08:00
|
|
|
if (ada_build_task_list () == 0)
|
|
|
|
{
|
|
|
|
ui_out_message (uiout, 0,
|
|
|
|
_("Your application does not use any Ada tasks.\n"));
|
|
|
|
return;
|
|
|
|
}
|
2008-10-23 03:45:05 +08:00
|
|
|
|
|
|
|
if (taskno_str == NULL || taskno_str[0] == '\0')
|
|
|
|
display_current_task_id ();
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* 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)"));
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
task_command_1 (taskno_str, from_tty, current_inferior ());
|
2008-10-23 03:45:05 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
/* Indicate that the given inferior's task list may have changed,
|
|
|
|
so invalidate the cache. */
|
2008-10-23 03:45:05 +08:00
|
|
|
|
2008-02-21 Pedro Alves <pedro@codesorcery.com>
Silence a few -Wmissing-prototypes warnings.
PR build/9877:
* amd64-nat.c: Include "amd64-nat.h".
* fork-child.c (_initialize_fork_child): Ditto.
* gcore.c (_initialize_gcore): Ditto.
* inf-ptrace.c: Include "inf-ptrace.h".
(inf_ptrace_store_registers): Make it static.
* linux-nat.c (linux_nat_terminal_ours): Make it static.
(_initialize_linux_nat): Declare before definition.
* linux-tdep.c: Include "linux-tdep.h".
* linux-thread-db.c (_initialize_thread_db): Declare before
definition.
* proc-service.c (_initialize_proc_service): Ditto.
* remote.c (remote_send_printf): Make it static.
* solib.c: Include "solib.h".
* symfile-mem.c (_initialize_symfile_mem): Declare before
definition.
* ada-lang.c (ada_la_decode, ada_match_name)
(ada_suppress_symbol_printing, ada_is_array_type)
(ada_value_ptr_subscript, ada_array_length)
(ada_to_static_fixed_value): Make them static.
(_initialize_ada_language): Declare before definition.
* ada-tasks.c (ada_get_task_number, ada_get_environment_task)
(ada_task_list_changed, ada_new_objfile_observer): Make them
static.
(_initialize_tasks): Declare before definition.
* addrmap.c (_initialize_addrmap): Declare before definition.
* auxv.c (default_auxv_parse): Make it static.
* bfd-target.c (target_bfd_xfer_partial, target_bfd_xclose): Make
them static.
* breakpoint.c (remove_sal): Add line break.
(expand_line_sal_maybe): Make it static.
* cp-name-parser.y: Include "cp-support.h".
* cp-valprint.c (cp_find_class_member): Make it static.
* eval.c (value_f90_subarray): Ditto.
* exceptions.c (print_any_exception): Ditto.
* findcmd.c (_initialize_mem_search): Declare before definition.
* frame.c (frame_observer_target_changed): Make it static.
* gnu-v3-abi.c (gnuv3_find_method_in): Make it static.
* inf-child.c: Include "inf-child.h".
* inferior.h (valid_inferior_id): Rename to ...
(valid_gdb_inferior_id): ... this.
* infrun.c (infrun_thread_stop_requested, siginfo_make_value):
Make them static.
* jv-lang.c (java_language_arch_info): Make it static.
* m2-typeprint.c (m2_get_discrete_bounds): Ditto.
* osdata.c (info_osdata_command): Make it static.
* regcache.c (regcache_observer_target_changed): Make it static.
* reverse.c (_initialize_reverse): Declare before definition.
* stabsread.c (cleanup_undefined_types_noname)
(cleanup_undefined_types_1): Make them static.
* symfile.c (place_section): Make it static.
* symtab.c (find_pc_sect_psymtab_closer): Make it static.
* target-descriptions.c (_initialize_target_descriptions): Declare
before definition.
* target.c (default_get_ada_task_ptid, find_default_can_async_p)
(find_default_is_async_p, find_default_supports_non_stop): Make
them static.
(target_supports_non_stop): Add prototype.
(dummy_pid_to_str): Make it static.
* utils.c (_initialize_utils): Declare before definition.
* ada-exp.y (_initialize_ada_exp): Declare before definition.
* solib-svr4.c (HAS_LM_DYNAMIC_FROM_LINK_MAP): Add a prototype.
* target.h (struct target_ops): Add a prototype to the
to_can_execute_reverse callback.
* macroscope.c (_initialize_macroscope): Declare before definition.
* cp-namespace.c (_initialize_cp_namespace): Declare before definition.
* python/python.c (_initialize_python): Declare before definition.
* tui/tui-command.c: Include "tui/tui-command.h".
* tui/tui-data.c (init_content_element, init_win_info): Make them
static.
* tui/tui-disasm.c: Include "tui/tui-disasm.h".
* tui/tui-interp.c (_initialize_tui_interp): Declare before
definition.
* tui/tui-layout.c: Include "tui/tui-layout.h".
(_initialize_tui_layout): Declare before definition.
* tui/tui-regs.c: Include "tui/tui-regs.h".
(tui_display_reg_element_at_line): Make it static.
(_initialize_tui_regs): Declare before definition.
* tui/tui-stack.c (_initialize_tui_stack): Declare before
definition.
* tui/tui-win.c: Include "tui/tui-win.h".
(_initialize_tui_win): Declare before definition.
(tui_sigwinch_handler): Make it static. Wrap in ifdef SIGWINCH.
* tui/tui-win.h (tui_sigwinch_handler): Delete declaration.
(tui_get_cmd_list): Add a prototype.
* tui/tui-windata.c: Include tui-windata.h.
* tui/tui-wingeneral.c (box_win): Make it static.
* cli/cli-logging.c (show_logging_command): Make it static.
(_initialize_cli_logging): Declare before definition.
* mi/mi-common.c (_initialize_gdb_mi_common): Declare before
definition.
2009-02-22 00:14:50 +08:00
|
|
|
static void
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
ada_task_list_changed (struct inferior *inf)
|
2008-10-23 03:45:05 +08:00
|
|
|
{
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
struct ada_tasks_inferior_data *data = get_ada_tasks_inferior_data (inf);
|
|
|
|
|
|
|
|
data->task_list_valid_p = 0;
|
2008-10-23 03:45:05 +08:00
|
|
|
}
|
|
|
|
|
2011-09-17 03:09:07 +08:00
|
|
|
/* 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;
|
|
|
|
}
|
|
|
|
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
/* 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;
|
|
|
|
}
|
|
|
|
|
2008-10-23 03:45:05 +08:00
|
|
|
/* The 'normal_stop' observer notification callback. */
|
|
|
|
|
|
|
|
static void
|
2009-02-14 23:24:44 +08:00
|
|
|
ada_normal_stop_observer (struct bpstats *unused_args, int unused_args2)
|
2008-10-23 03:45:05 +08:00
|
|
|
{
|
|
|
|
/* 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] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
ada_task_list_changed (current_inferior ());
|
2008-10-23 03:45:05 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* A routine to be called when the objfiles have changed. */
|
|
|
|
|
2008-02-21 Pedro Alves <pedro@codesorcery.com>
Silence a few -Wmissing-prototypes warnings.
PR build/9877:
* amd64-nat.c: Include "amd64-nat.h".
* fork-child.c (_initialize_fork_child): Ditto.
* gcore.c (_initialize_gcore): Ditto.
* inf-ptrace.c: Include "inf-ptrace.h".
(inf_ptrace_store_registers): Make it static.
* linux-nat.c (linux_nat_terminal_ours): Make it static.
(_initialize_linux_nat): Declare before definition.
* linux-tdep.c: Include "linux-tdep.h".
* linux-thread-db.c (_initialize_thread_db): Declare before
definition.
* proc-service.c (_initialize_proc_service): Ditto.
* remote.c (remote_send_printf): Make it static.
* solib.c: Include "solib.h".
* symfile-mem.c (_initialize_symfile_mem): Declare before
definition.
* ada-lang.c (ada_la_decode, ada_match_name)
(ada_suppress_symbol_printing, ada_is_array_type)
(ada_value_ptr_subscript, ada_array_length)
(ada_to_static_fixed_value): Make them static.
(_initialize_ada_language): Declare before definition.
* ada-tasks.c (ada_get_task_number, ada_get_environment_task)
(ada_task_list_changed, ada_new_objfile_observer): Make them
static.
(_initialize_tasks): Declare before definition.
* addrmap.c (_initialize_addrmap): Declare before definition.
* auxv.c (default_auxv_parse): Make it static.
* bfd-target.c (target_bfd_xfer_partial, target_bfd_xclose): Make
them static.
* breakpoint.c (remove_sal): Add line break.
(expand_line_sal_maybe): Make it static.
* cp-name-parser.y: Include "cp-support.h".
* cp-valprint.c (cp_find_class_member): Make it static.
* eval.c (value_f90_subarray): Ditto.
* exceptions.c (print_any_exception): Ditto.
* findcmd.c (_initialize_mem_search): Declare before definition.
* frame.c (frame_observer_target_changed): Make it static.
* gnu-v3-abi.c (gnuv3_find_method_in): Make it static.
* inf-child.c: Include "inf-child.h".
* inferior.h (valid_inferior_id): Rename to ...
(valid_gdb_inferior_id): ... this.
* infrun.c (infrun_thread_stop_requested, siginfo_make_value):
Make them static.
* jv-lang.c (java_language_arch_info): Make it static.
* m2-typeprint.c (m2_get_discrete_bounds): Ditto.
* osdata.c (info_osdata_command): Make it static.
* regcache.c (regcache_observer_target_changed): Make it static.
* reverse.c (_initialize_reverse): Declare before definition.
* stabsread.c (cleanup_undefined_types_noname)
(cleanup_undefined_types_1): Make them static.
* symfile.c (place_section): Make it static.
* symtab.c (find_pc_sect_psymtab_closer): Make it static.
* target-descriptions.c (_initialize_target_descriptions): Declare
before definition.
* target.c (default_get_ada_task_ptid, find_default_can_async_p)
(find_default_is_async_p, find_default_supports_non_stop): Make
them static.
(target_supports_non_stop): Add prototype.
(dummy_pid_to_str): Make it static.
* utils.c (_initialize_utils): Declare before definition.
* ada-exp.y (_initialize_ada_exp): Declare before definition.
* solib-svr4.c (HAS_LM_DYNAMIC_FROM_LINK_MAP): Add a prototype.
* target.h (struct target_ops): Add a prototype to the
to_can_execute_reverse callback.
* macroscope.c (_initialize_macroscope): Declare before definition.
* cp-namespace.c (_initialize_cp_namespace): Declare before definition.
* python/python.c (_initialize_python): Declare before definition.
* tui/tui-command.c: Include "tui/tui-command.h".
* tui/tui-data.c (init_content_element, init_win_info): Make them
static.
* tui/tui-disasm.c: Include "tui/tui-disasm.h".
* tui/tui-interp.c (_initialize_tui_interp): Declare before
definition.
* tui/tui-layout.c: Include "tui/tui-layout.h".
(_initialize_tui_layout): Declare before definition.
* tui/tui-regs.c: Include "tui/tui-regs.h".
(tui_display_reg_element_at_line): Make it static.
(_initialize_tui_regs): Declare before definition.
* tui/tui-stack.c (_initialize_tui_stack): Declare before
definition.
* tui/tui-win.c: Include "tui/tui-win.h".
(_initialize_tui_win): Declare before definition.
(tui_sigwinch_handler): Make it static. Wrap in ifdef SIGWINCH.
* tui/tui-win.h (tui_sigwinch_handler): Delete declaration.
(tui_get_cmd_list): Add a prototype.
* tui/tui-windata.c: Include tui-windata.h.
* tui/tui-wingeneral.c (box_win): Make it static.
* cli/cli-logging.c (show_logging_command): Make it static.
(_initialize_cli_logging): Declare before definition.
* mi/mi-common.c (_initialize_gdb_mi_common): Declare before
definition.
2009-02-22 00:14:50 +08:00
|
|
|
static void
|
2008-10-23 03:45:05 +08:00
|
|
|
ada_new_objfile_observer (struct objfile *objfile)
|
|
|
|
{
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
struct inferior *inf;
|
2008-10-23 03:45:05 +08:00
|
|
|
|
2011-09-17 03:09:07 +08:00
|
|
|
/* Invalidate the relevant data in our program-space data. */
|
2008-10-23 03:45:05 +08:00
|
|
|
|
2011-09-17 03:09:07 +08:00
|
|
|
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);
|
|
|
|
}
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
|
|
|
|
/* 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);
|
2008-10-23 03:45:05 +08:00
|
|
|
}
|
|
|
|
|
2008-02-21 Pedro Alves <pedro@codesorcery.com>
Silence a few -Wmissing-prototypes warnings.
PR build/9877:
* amd64-nat.c: Include "amd64-nat.h".
* fork-child.c (_initialize_fork_child): Ditto.
* gcore.c (_initialize_gcore): Ditto.
* inf-ptrace.c: Include "inf-ptrace.h".
(inf_ptrace_store_registers): Make it static.
* linux-nat.c (linux_nat_terminal_ours): Make it static.
(_initialize_linux_nat): Declare before definition.
* linux-tdep.c: Include "linux-tdep.h".
* linux-thread-db.c (_initialize_thread_db): Declare before
definition.
* proc-service.c (_initialize_proc_service): Ditto.
* remote.c (remote_send_printf): Make it static.
* solib.c: Include "solib.h".
* symfile-mem.c (_initialize_symfile_mem): Declare before
definition.
* ada-lang.c (ada_la_decode, ada_match_name)
(ada_suppress_symbol_printing, ada_is_array_type)
(ada_value_ptr_subscript, ada_array_length)
(ada_to_static_fixed_value): Make them static.
(_initialize_ada_language): Declare before definition.
* ada-tasks.c (ada_get_task_number, ada_get_environment_task)
(ada_task_list_changed, ada_new_objfile_observer): Make them
static.
(_initialize_tasks): Declare before definition.
* addrmap.c (_initialize_addrmap): Declare before definition.
* auxv.c (default_auxv_parse): Make it static.
* bfd-target.c (target_bfd_xfer_partial, target_bfd_xclose): Make
them static.
* breakpoint.c (remove_sal): Add line break.
(expand_line_sal_maybe): Make it static.
* cp-name-parser.y: Include "cp-support.h".
* cp-valprint.c (cp_find_class_member): Make it static.
* eval.c (value_f90_subarray): Ditto.
* exceptions.c (print_any_exception): Ditto.
* findcmd.c (_initialize_mem_search): Declare before definition.
* frame.c (frame_observer_target_changed): Make it static.
* gnu-v3-abi.c (gnuv3_find_method_in): Make it static.
* inf-child.c: Include "inf-child.h".
* inferior.h (valid_inferior_id): Rename to ...
(valid_gdb_inferior_id): ... this.
* infrun.c (infrun_thread_stop_requested, siginfo_make_value):
Make them static.
* jv-lang.c (java_language_arch_info): Make it static.
* m2-typeprint.c (m2_get_discrete_bounds): Ditto.
* osdata.c (info_osdata_command): Make it static.
* regcache.c (regcache_observer_target_changed): Make it static.
* reverse.c (_initialize_reverse): Declare before definition.
* stabsread.c (cleanup_undefined_types_noname)
(cleanup_undefined_types_1): Make them static.
* symfile.c (place_section): Make it static.
* symtab.c (find_pc_sect_psymtab_closer): Make it static.
* target-descriptions.c (_initialize_target_descriptions): Declare
before definition.
* target.c (default_get_ada_task_ptid, find_default_can_async_p)
(find_default_is_async_p, find_default_supports_non_stop): Make
them static.
(target_supports_non_stop): Add prototype.
(dummy_pid_to_str): Make it static.
* utils.c (_initialize_utils): Declare before definition.
* ada-exp.y (_initialize_ada_exp): Declare before definition.
* solib-svr4.c (HAS_LM_DYNAMIC_FROM_LINK_MAP): Add a prototype.
* target.h (struct target_ops): Add a prototype to the
to_can_execute_reverse callback.
* macroscope.c (_initialize_macroscope): Declare before definition.
* cp-namespace.c (_initialize_cp_namespace): Declare before definition.
* python/python.c (_initialize_python): Declare before definition.
* tui/tui-command.c: Include "tui/tui-command.h".
* tui/tui-data.c (init_content_element, init_win_info): Make them
static.
* tui/tui-disasm.c: Include "tui/tui-disasm.h".
* tui/tui-interp.c (_initialize_tui_interp): Declare before
definition.
* tui/tui-layout.c: Include "tui/tui-layout.h".
(_initialize_tui_layout): Declare before definition.
* tui/tui-regs.c: Include "tui/tui-regs.h".
(tui_display_reg_element_at_line): Make it static.
(_initialize_tui_regs): Declare before definition.
* tui/tui-stack.c (_initialize_tui_stack): Declare before
definition.
* tui/tui-win.c: Include "tui/tui-win.h".
(_initialize_tui_win): Declare before definition.
(tui_sigwinch_handler): Make it static. Wrap in ifdef SIGWINCH.
* tui/tui-win.h (tui_sigwinch_handler): Delete declaration.
(tui_get_cmd_list): Add a prototype.
* tui/tui-windata.c: Include tui-windata.h.
* tui/tui-wingeneral.c (box_win): Make it static.
* cli/cli-logging.c (show_logging_command): Make it static.
(_initialize_cli_logging): Declare before definition.
* mi/mi-common.c (_initialize_gdb_mi_common): Declare before
definition.
2009-02-22 00:14:50 +08:00
|
|
|
/* Provide a prototype to silence -Wmissing-prototypes. */
|
|
|
|
extern initialize_file_ftype _initialize_tasks;
|
|
|
|
|
2008-10-23 03:45:05 +08:00
|
|
|
void
|
|
|
|
_initialize_tasks (void)
|
|
|
|
{
|
2011-09-17 03:09:07 +08:00
|
|
|
ada_tasks_pspace_data_handle = register_program_space_data ();
|
[Ada] Store the Ada task list in per-inferior data
Instead of storing "the" Ada task list using a static global
in ada-tasks, this patch stores that information inside
per-inferior data.
We also add in the per-inferior data the location and type of
data used in the runtime to store that task list. Previously,
this information was saved as a static variable in one of the
functions, but this approach has the major flaw that it does
not handle multi-inferior debugging.
gdb/ChangeLog:
* ada-tasks.c (ada_tasks_check_symbol_table, task_list): Delete.
(enum ada_known_tasks_kind, struct ada_tasks_inferior_data): New.
(ada_tasks_inferior_data_handle): New static global.
(get_ada_tasks_inferior_data): New function.
(ada_get_task_number, get_task_number_from_id, valid_task_id)
(ada_get_environment_task, iterate_over_live_ada_tasks)
(add_ada_task, read_known_tasks_array, read_known_tasks_list):
Adjust.
(ada_set_current_inferior_known_tasks_addr): New function.
(read_known_tasks, ada_build_task_list, short_task_info)
(info_tasks, info_task, info_tasks_command, task_command_1)
(task_command, ada_task_list_changed): Adjust.
(ada_tasks_invalidate_inferior_data): New function.
(ada_normal_stop_observer, ada_new_objfile_observer): Adjust.
(_initialize_tasks): Set ada_tasks_inferior_data_handle.
* ada-lang.h (struct inferior): Add declaration.
(ada_task_list_changed): Update profile.
* remote-wtx-pd.c: #include "inferior.h".
(switch_to_pd_internal): Update call to ada_task_list_changed.
2011-09-17 03:09:17 +08:00
|
|
|
ada_tasks_inferior_data_handle = register_inferior_data ();
|
2011-09-17 03:09:07 +08:00
|
|
|
|
2008-10-23 03:45:05 +08:00
|
|
|
/* 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,
|
|
|
|
_("Provide information about all known Ada tasks"));
|
|
|
|
add_cmd ("task", class_run, task_command,
|
|
|
|
_("Use this command to switch between Ada tasks.\n\
|
|
|
|
Without argument, this command simply prints the current task ID"),
|
|
|
|
&cmdlist);
|
|
|
|
}
|
|
|
|
|