* common/agent.c (agent_look_up_symbols): Add one parameter 'arg'.
* common/agent.h: Update declaration.
* inf-child.c (inf_child_use_agent): New.
(inf_child_can_use_agent): New.
(inf_child_target): Initialize fields `to_use_agent'
and `to_can_use_agent'.
* agent.c (agent_new_objfile): New.
(_initialize_agent): Add agent_new_objfile to new_objfile
observer.
* linux-nat.c (linux_child_static_tracepoint_markers_by_strid):
New.
(linux_target_install_ops): Initialize field
`to_static_tracepoint_markers_by_strid'.
* remote.c (free_current_marker): Move it to ...
* tracepoint.c (free_current_marker): ... here. New.
(cleanup_target_stop): New.
* tracepoint.h: Declare free_current_marker.
* NEWS: Add one entry about `info static-tracepoint-marker'.
gdb/gdbserver:
* tracepoint.c (tracepoint_look_up_symbols): Update call to
agent_look_up_symbols.
gdb/testsuite:
* gdb.trace/strace.exp: run strace_info_marker in linux native gdb.
2012-03-03 Yao Qi <yao@codesourcery.com>
+ * common/agent.c (agent_look_up_symbols): Add one parameter 'arg'.
+ * common/agent.h: Update declaration.
+ * inf-child.c (inf_child_use_agent): New.
+ (inf_child_can_use_agent): New.
+ (inf_child_target): Initialize fields `to_use_agent'
+ and `to_can_use_agent'.
+ * agent.c (agent_new_objfile): New.
+ (_initialize_agent): Add agent_new_objfile to new_objfile
+ observer.
+
+ * linux-nat.c (linux_child_static_tracepoint_markers_by_strid):
+ New.
+ (linux_target_install_ops): Initialize field
+ `to_static_tracepoint_markers_by_strid'.
+ * remote.c (free_current_marker): Move it to ...
+ * tracepoint.c (free_current_marker): ... here. New.
+ (cleanup_target_stop): New.
+ * tracepoint.h: Declare free_current_marker.
+ * NEWS: Add one entry about `info static-tracepoint-marker'.
+
+2012-03-03 Yao Qi <yao@codesourcery.com>
+
* common/agent.c (agent_loaded_p): New.
(agent_look_up_symbols): New global.
* common/agent.h: Declare agent_loaded_p.
but it had to be done as a second step, after the catchpoint had been
created, using the "condition" command.
+* The "info static-tracepoint-marker" command will now also work on
+ native Linux targets with in-process agent.
+
* New commands
** "catch load" and "catch unload" can be used to stop when a shared
/* -Wmissing-prototypes */
extern initialize_file_ftype _initialize_agent;
+#include "observer.h"
+#include "objfiles.h"
+
+static void
+agent_new_objfile (struct objfile *objfile)
+{
+ if (objfile == NULL || agent_loaded_p ())
+ return;
+
+ agent_look_up_symbols (objfile);
+}
+
void
_initialize_agent (void)
{
+ observer_attach_new_objfile (agent_new_objfile);
+
add_setshow_enum_cmd ("agent", class_run,
can_use_agent_enum,
&can_use_agent, _("\
found, return non-zero otherwise. */
int
-agent_look_up_symbols (void)
+agent_look_up_symbols (void *arg)
{
int i;
if (look_up_one_symbol (symbol_list[i].name, addrp, 1) == 0)
#else
- struct minimal_symbol *sym = lookup_minimal_symbol (symbol_list[i].name,
- NULL, NULL);
+ struct minimal_symbol *sym =
+ lookup_minimal_symbol (symbol_list[i].name, NULL,
+ (struct objfile *) arg);
if (sym != NULL)
*addrp = SYMBOL_VALUE_ADDRESS (sym);
int agent_run_command (int pid, const char *cmd);
-int agent_look_up_symbols (void);
+int agent_look_up_symbols (void *);
#define STRINGIZE_1(STR) #STR
#define STRINGIZE(STR) STRINGIZE_1(STR)
2012-03-03 Yao Qi <yao@codesourcery.com>
+ * tracepoint.c (tracepoint_look_up_symbols): Update call to
+ agent_look_up_symbols.
+
+2012-03-03 Yao Qi <yao@codesourcery.com>
+
* Makefile.in (linux-low.o): Keep dependence on agent.h.
(linux-x86-low.o): Likewise.
* server.h: Remove in_process_agent_loaded.
}
}
- agent_look_up_symbols ();
+ agent_look_up_symbols (NULL);
}
#endif
#include "gdb_stat.h"
#include "inf-child.h"
#include "gdb/fileio.h"
+#include "agent.h"
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h> /* for MAXPATHLEN */
#endif
}
+static int
+inf_child_use_agent (int use)
+{
+ if (agent_loaded_p ())
+ {
+ use_agent = use;
+ return 1;
+ }
+ else
+ return 0;
+}
+
+static int
+inf_child_can_use_agent (void)
+{
+ return agent_loaded_p ();
+}
struct target_ops *
inf_child_target (void)
t->to_fileio_unlink = inf_child_fileio_unlink;
t->to_fileio_readlink = inf_child_fileio_readlink;
t->to_magic = OPS_MAGIC;
+ t->to_use_agent = inf_child_use_agent;
+ t->to_can_use_agent = inf_child_can_use_agent;
return t;
}
#include "linux-osdata.h"
#include "linux-tdep.h"
#include "symfile.h"
+#include "agent.h"
+#include "tracepoint.h"
#ifndef SPUFS_MAGIC
#define SPUFS_MAGIC 0x23c9b64e
offset, len);
}
+static void
+cleanup_target_stop (void *arg)
+{
+ ptid_t *ptid = (ptid_t *) arg;
+
+ gdb_assert (arg != NULL);
+
+ /* Unpause all */
+ target_resume (*ptid, 0, TARGET_SIGNAL_0);
+}
+
+static VEC(static_tracepoint_marker_p) *
+linux_child_static_tracepoint_markers_by_strid (const char *strid)
+{
+ char s[IPA_CMD_BUF_SIZE];
+ struct cleanup *old_chain;
+ int pid = ptid_get_pid (inferior_ptid);
+ VEC(static_tracepoint_marker_p) *markers = NULL;
+ struct static_tracepoint_marker *marker = NULL;
+ char *p = s;
+ ptid_t ptid = ptid_build (pid, 0, 0);
+
+ /* Pause all */
+ target_stop (ptid);
+
+ memcpy (s, "qTfSTM", sizeof ("qTfSTM"));
+ s[sizeof ("qTfSTM")] = 0;
+
+ agent_run_command (pid, s);
+
+ old_chain = make_cleanup (free_current_marker, &marker);
+ make_cleanup (cleanup_target_stop, &ptid);
+
+ while (*p++ == 'm')
+ {
+ if (marker == NULL)
+ marker = XCNEW (struct static_tracepoint_marker);
+
+ do
+ {
+ parse_static_tracepoint_marker_definition (p, &p, marker);
+
+ if (strid == NULL || strcmp (strid, marker->str_id) == 0)
+ {
+ VEC_safe_push (static_tracepoint_marker_p,
+ markers, marker);
+ marker = NULL;
+ }
+ else
+ {
+ release_static_tracepoint_marker (marker);
+ memset (marker, 0, sizeof (*marker));
+ }
+ }
+ while (*p++ == ','); /* comma-separated list */
+
+ memcpy (s, "qTsSTM", sizeof ("qTsSTM"));
+ s[sizeof ("qTsSTM")] = 0;
+ agent_run_command (pid, s);
+ p = s;
+ }
+
+ do_cleanups (old_chain);
+
+ return markers;
+}
+
/* Create a prototype generic GNU/Linux target. The client can override
it with local methods. */
super_xfer_partial = t->to_xfer_partial;
t->to_xfer_partial = linux_xfer_partial;
+
+ t->to_static_tracepoint_markers_by_strid
+ = linux_child_static_tracepoint_markers_by_strid;
}
struct target_ops *
return 0;
}
-static void
-free_current_marker (void *arg)
-{
- struct static_tracepoint_marker **marker_p = arg;
-
- if (*marker_p != NULL)
- {
- release_static_tracepoint_marker (*marker_p);
- xfree (*marker_p);
- }
- else
- *marker_p = NULL;
-}
-
static VEC(static_tracepoint_marker_p) *
remote_static_tracepoint_markers_by_strid (const char *strid)
{
+2012-03-03 Yao Qi <yao@codesourcery.com>
+
+ * gdb.trace/strace.exp: run strace_info_marker in linux native gdb.
+
2012-03-03 Jan Kratochvil <jan.kratochvil@redhat.com>
Setup KFAIL for PR server/13796.
return -1
}
-clean_restart $executable
-
-if ![runto_main] {
- fail "Can't run to main to check for trace support"
- return -1
-}
-
-if { ![gdb_target_supports_trace] } then {
- unsupported "Current target does not support trace"
- return -1;
-}
-
-gdb_load_shlibs $libipa
-
proc strace_info_marker { } { with_test_prefix "info_marker" {
global executable
global gdb_prompt
gdb_test "tfind" "Target failed to find requested trace frame\\..*"
}}
+clean_restart $executable
+
+if ![runto_main] {
+ fail "Can't run to main to check for trace support"
+ return -1
+}
+
+# Run it on native x86/x86_64 linux.
+if { ![is_remote target]
+ && ([istarget "x86_64-*-linux*"] || [istarget "i\[34567\]86-*-linux*"]) } {
+ strace_info_marker
+ return
+}
+
+if { ![gdb_target_supports_trace] } then {
+ unsupported "Current target does not support trace"
+ return -1;
+}
+
+gdb_load_shlibs $libipa
+
strace_info_marker
strace_probe_marker
tfile_ops.to_magic = OPS_MAGIC;
}
+void
+free_current_marker (void *arg)
+{
+ struct static_tracepoint_marker **marker_p = arg;
+
+ if (*marker_p != NULL)
+ {
+ release_static_tracepoint_marker (*marker_p);
+ xfree (*marker_p);
+ }
+ else
+ *marker_p = NULL;
+}
+
/* Given a line of text defining a static tracepoint marker, parse it
into a "static tracepoint marker" object. Throws an error is
parsing fails. If PP is non-null, it points to one past the end of
(char *line, char **pp,
struct static_tracepoint_marker *marker);
extern void release_static_tracepoint_marker (struct static_tracepoint_marker *);
+extern void free_current_marker (void *arg);
/* A hook used to notify the UI of tracepoint operations. */
projects / external / binutils.git / commitdiff