This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 3/5] inline download_tracepoints into cmd_qtstart.
In cmd_qtstart, the tracepoint download and installation are not
close enough. This patch is to `inline' download_tracepoints
in cmd_qtstart, and move tracepoint download and installation
as close as possible. Then, in next patch, we can replace
regular tracepoint download and install with agent's implementation.
2012-03-07 Yao Qi <yao@codesourcery.com>
* tracepoint.c (maybe_write_ipa_not_loaded): Removed.
(download_tracepoints): Moved to ...
(cmd_qtstart): ... here.
---
gdb/gdbserver/tracepoint.c | 143 ++++++++++++++++++--------------------------
1 files changed, 59 insertions(+), 84 deletions(-)
diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c
index 97f44d0..6d50293 100644
--- a/gdb/gdbserver/tracepoint.c
+++ b/gdb/gdbserver/tracepoint.c
@@ -277,20 +277,6 @@ write_e_ust_not_loaded (char *buffer)
#endif
}
-/* If the in-process agent library isn't loaded in the inferior, write
- an error to BUFFER, and return 1. Otherwise, return 0. */
-
-static int
-maybe_write_ipa_not_loaded (char *buffer)
-{
- if (!agent_loaded_p ())
- {
- write_e_ipa_not_loaded (buffer);
- return 1;
- }
- return 0;
-}
-
/* If the in-process agent library and the ust (static tracepoints)
library aren't loaded in the inferior, write an error to BUFFER,
and return 1. Otherwise, return 0. */
@@ -408,7 +394,6 @@ static int stop_tracing_handler (CORE_ADDR);
struct breakpoint *flush_trace_buffer_bkpt;
static int flush_trace_buffer_handler (CORE_ADDR);
-static void download_tracepoints (void);
static void download_trace_state_variables (void);
static void upload_fast_traceframes (void);
@@ -3061,10 +3046,13 @@ install_tracepoint (struct tracepoint *tpoint, char *own_buf)
write_ok (own_buf);
}
+static void download_tracepoint_1 (struct tracepoint *tpoint);
+
static void
cmd_qtstart (char *packet)
{
struct tracepoint *tpoint, *prev_ftpoint, *prev_stpoint;
+ CORE_ADDR tpptr = 0, prev_tpptr = 0;
trace_debug ("Starting the trace");
@@ -3082,10 +3070,7 @@ cmd_qtstart (char *packet)
/* Sync the fast tracepoints list in the inferior ftlib. */
if (agent_loaded_p ())
- {
- download_tracepoints ();
- download_trace_state_variables ();
- }
+ download_trace_state_variables ();
/* No previous fast tpoint yet. */
prev_ftpoint = NULL;
@@ -3095,7 +3080,10 @@ cmd_qtstart (char *packet)
*packet = '\0';
- /* Install tracepoints. */
+ /* Start out empty. */
+ write_inferior_data_ptr (ipa_sym_addrs.addr_tracepoints, 0);
+
+ /* Donwload and install tracepoints. */
for (tpoint = tracepoints; tpoint; tpoint = tpoint->next)
{
/* Ensure all the hit counts start at zero. */
@@ -3111,48 +3099,71 @@ cmd_qtstart (char *packet)
tpoint->handle = set_breakpoint_at (tpoint->address,
tracepoint_handler);
}
- else if (tpoint->type == fast_tracepoint)
+ else if (tpoint->type == fast_tracepoint
+ || tpoint->type == static_tracepoint)
{
- if (maybe_write_ipa_not_loaded (packet))
+ if (!agent_loaded_p ())
{
- trace_debug ("Requested a fast tracepoint, but fast "
- "tracepoints aren't supported.");
+ trace_debug ("Requested a %s tracepoint, but fast "
+ "tracepoints aren't supported.",
+ tpoint->type == static_tracepoint
+ ? "static" : "fast");
break;
}
- if (prev_ftpoint != NULL && prev_ftpoint->address == tpoint->address)
- clone_fast_tracepoint (tpoint, prev_ftpoint);
- else
- {
- if (install_fast_tracepoint (tpoint, packet) == 0)
- prev_ftpoint = tpoint;
- }
- }
- else if (tpoint->type == static_tracepoint)
- {
- if (maybe_write_ipa_ust_not_loaded (packet))
+ if (tpoint->type == fast_tracepoint)
{
- trace_debug ("Requested a static tracepoint, but static "
- "tracepoints are not supported.");
- break;
- }
+ download_tracepoint_1 (tpoint);
- /* Can only probe a given marker once. */
- if (prev_stpoint != NULL && prev_stpoint->address == tpoint->address)
- {
- tpoint->handle = (void *) -1;
+ if (prev_ftpoint != NULL
+ && prev_ftpoint->address == tpoint->address)
+ clone_fast_tracepoint (tpoint, prev_ftpoint);
+ else
+ {
+ if (install_fast_tracepoint (tpoint, packet) == 0)
+ prev_ftpoint = tpoint;
+ }
}
else
{
- if (probe_marker_at (tpoint->address, packet) == 0)
+ if (!in_process_agent_supports_ust ())
{
- tpoint->handle = (void *) -1;
+ trace_debug ("Requested a static tracepoint, but static "
+ "tracepoints are not supported.");
+ break;
+ }
- /* So that we can handle multiple static tracepoints
- at the same address easily. */
- prev_stpoint = tpoint;
+ download_tracepoint_1 (tpoint);
+ /* Can only probe a given marker once. */
+ if (prev_stpoint != NULL
+ && prev_stpoint->address == tpoint->address)
+ {
+ tpoint->handle = (void *) -1;
+ }
+ else
+ {
+ if (probe_marker_at (tpoint->address, packet) == 0)
+ {
+ tpoint->handle = (void *) -1;
+
+ /* So that we can handle multiple static tracepoints
+ at the same address easily. */
+ prev_stpoint = tpoint;
+ }
}
}
+
+ prev_tpptr = tpptr;
+ tpptr = tpoint->obj_addr_on_target;
+
+ if (tpoint == tracepoints)
+ /* First object in list, set the head pointer in the
+ inferior. */
+ write_inferior_data_ptr (ipa_sym_addrs.addr_tracepoints, tpptr);
+ else
+ write_inferior_data_ptr (prev_tpptr + offsetof (struct tracepoint,
+ next),
+ tpptr);
}
/* Any failure in the inner loop is sufficient cause to give
@@ -5822,42 +5833,6 @@ download_tracepoint (struct tracepoint *tpoint)
}
static void
-download_tracepoints (void)
-{
- CORE_ADDR tpptr = 0, prev_tpptr = 0;
- struct tracepoint *tpoint;
-
- /* Start out empty. */
- write_inferior_data_ptr (ipa_sym_addrs.addr_tracepoints, 0);
-
- for (tpoint = tracepoints; tpoint; tpoint = tpoint->next)
- {
- if (tpoint->type != fast_tracepoint
- && tpoint->type != static_tracepoint)
- continue;
-
- prev_tpptr = tpptr;
-
- download_tracepoint_1 (tpoint);
-
- tpptr = tpoint->obj_addr_on_target;
-
- if (tpoint == tracepoints)
- {
- /* First object in list, set the head pointer in the
- inferior. */
- write_inferior_data_ptr (ipa_sym_addrs.addr_tracepoints, tpptr);
- }
- else
- {
- write_inferior_data_ptr (prev_tpptr + offsetof (struct tracepoint,
- next),
- tpptr);
- }
- }
-}
-
-static void
download_trace_state_variables (void)
{
CORE_ADDR ptr = 0, prev_ptr = 0;
--
1.7.0.4