aboutsummaryrefslogtreecommitdiff
path: root/gdb/gdbserver
diff options
context:
space:
mode:
authorYao Qi <yao@codesourcery.com>2012-07-27 08:09:14 +0000
committerYao Qi <yao@codesourcery.com>2012-07-27 08:09:14 +0000
commit7255706c3e52f744398e01240567abd99c8ccf52 (patch)
tree464b514adcef97fcb15f131427684cace16b1449 /gdb/gdbserver
parentc71bb85d64f4ddcc7ae1c991e44ff3b48d2a5dc9 (diff)
downloadgdb-7255706c3e52f744398e01240567abd99c8ccf52.zip
gdb-7255706c3e52f744398e01240567abd99c8ccf52.tar.gz
gdb-7255706c3e52f744398e01240567abd99c8ccf52.tar.bz2
gdb/gdbserver/
PR remote/14161. * server.h: Declare gdb_agent_about_to_close. * target.c (kill_inferior): Include "agent.h". New. Send command 'kill'. * target.h (kill_inferior): Removed macro. * tracepoint.c (gdb_agent_about_to_close): New. (gdb_agent_helper_thread): Handle command 'close'. Wait endlessly until the inferior stops. Install gdb_agent_remove_socket to atexit hook. (agent_socket_name): New static variable. (gdb_agent_socket_init): Replace local variable 'name' with 'agent_socket_name'. (gdb_agent_remove_socket): New. gdb/doc/ * gdb.texinfo (IPA Protocol Commands): Document new command 'close'. gdb/testsuite/ KFAIL for PR remote/14161. * gdb.trace/strace.exp (strace_remove_socket): kfail for native. Cleanup socket files. (strace_info_marker): Detach inferior.
Diffstat (limited to 'gdb/gdbserver')
-rw-r--r--gdb/gdbserver/ChangeLog17
-rw-r--r--gdb/gdbserver/server.h1
-rw-r--r--gdb/gdbserver/target.c8
-rw-r--r--gdb/gdbserver/target.h3
-rw-r--r--gdb/gdbserver/tracepoint.c71
5 files changed, 93 insertions, 7 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index b615712..9875796 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,5 +1,22 @@
2012-07-27 Yao Qi <yao@codesourcery.com>
+ PR remote/14161.
+
+ * server.h: Declare gdb_agent_about_to_close.
+ * target.c (kill_inferior): Include "agent.h".
+ New. Send command 'kill'.
+ * target.h (kill_inferior): Removed macro.
+ * tracepoint.c (gdb_agent_about_to_close): New.
+ (gdb_agent_helper_thread): Handle command 'close'.
+ Wait endlessly until the inferior stops.
+ Install gdb_agent_remove_socket to atexit hook.
+ (agent_socket_name): New static variable.
+ (gdb_agent_socket_init): Replace local variable 'name' with
+ 'agent_socket_name'.
+ (gdb_agent_remove_socket): New.
+
+2012-07-27 Yao Qi <yao@codesourcery.com>
+
* server.c (process_point_options): Stop at 'X' when parsing.
2012-07-19 Michael Eager <eager@eagercon.com>
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index 02dfa29..752bc3b 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -467,6 +467,7 @@ void stop_tracing (void);
int claim_trampoline_space (ULONGEST used, CORE_ADDR *trampoline);
int have_fast_tracepoint_trampoline_buffer (char *msgbuf);
+void gdb_agent_about_to_close (int pid);
#endif
struct traceframe;
diff --git a/gdb/gdbserver/target.c b/gdb/gdbserver/target.c
index 7539476..e8b2b08 100644
--- a/gdb/gdbserver/target.c
+++ b/gdb/gdbserver/target.c
@@ -182,3 +182,11 @@ target_waitstatus_to_string (const struct target_waitstatus *ws)
return buf;
}
+
+int
+kill_inferior (int pid)
+{
+ gdb_agent_about_to_close (pid);
+
+ return (*the_target->kill) (pid);
+}
diff --git a/gdb/gdbserver/target.h b/gdb/gdbserver/target.h
index 0cf5687..9f96e04 100644
--- a/gdb/gdbserver/target.h
+++ b/gdb/gdbserver/target.h
@@ -409,8 +409,7 @@ void set_target_ops (struct target_ops *);
#define myattach(pid) \
(*the_target->attach) (pid)
-#define kill_inferior(pid) \
- (*the_target->kill) (pid)
+int kill_inferior (int);
#define detach_inferior(pid) \
(*the_target->detach) (pid)
diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c
index f103dfc..7ad77f0 100644
--- a/gdb/gdbserver/tracepoint.c
+++ b/gdb/gdbserver/tracepoint.c
@@ -3923,6 +3923,38 @@ cmd_qtstmat (char *packet)
run_inferior_command (packet, strlen (packet) + 1);
}
+/* Sent the agent a command to close it. */
+
+void
+gdb_agent_about_to_close (int pid)
+{
+ char buf[IPA_CMD_BUF_SIZE];
+
+ if (!maybe_write_ipa_not_loaded (buf))
+ {
+ struct thread_info *save_inferior;
+ struct inferior_list_entry *inf = all_threads.head;
+
+ save_inferior = current_inferior;
+
+ /* Find a certain thread which belongs to process PID. */
+ while (inf != NULL)
+ {
+ if (ptid_get_pid (inf->id) == pid)
+ break;
+ inf = inf->next;
+ }
+
+ current_inferior = (struct thread_info *) inf;
+
+ strcpy (buf, "close");
+
+ run_inferior_command (buf, strlen (buf) + 1);
+
+ current_inferior = save_inferior;
+ }
+}
+
/* Return the minimum instruction size needed for fast tracepoints as a
hexadecimal number. */
@@ -6748,13 +6780,14 @@ init_named_socket (const char *name)
return fd;
}
+static char agent_socket_name[UNIX_PATH_MAX];
+
static int
gdb_agent_socket_init (void)
{
int result, fd;
- char name[UNIX_PATH_MAX];
- result = xsnprintf (name, UNIX_PATH_MAX, "%s/gdb_ust%d",
+ result = xsnprintf (agent_socket_name, UNIX_PATH_MAX, "%s/gdb_ust%d",
SOCK_DIR, getpid ());
if (result >= UNIX_PATH_MAX)
{
@@ -6762,11 +6795,11 @@ gdb_agent_socket_init (void)
return -1;
}
- fd = init_named_socket (name);
+ fd = init_named_socket (agent_socket_name);
if (fd < 0)
warning ("Error initializing named socket (%s) for communication with the "
"ust helper thread. Check that directory exists and that it "
- "is writable.", name);
+ "is writable.", agent_socket_name);
return fd;
}
@@ -6995,6 +7028,13 @@ gdb_ust_init (void)
#endif /* HAVE_UST */
#include <sys/syscall.h>
+#include <stdlib.h>
+
+static void
+gdb_agent_remove_socket (void)
+{
+ unlink (agent_socket_name);
+}
/* Helper thread of agent. */
@@ -7003,6 +7043,8 @@ gdb_agent_helper_thread (void *arg)
{
int listen_fd;
+ atexit (gdb_agent_remove_socket);
+
while (1)
{
listen_fd = gdb_agent_socket_init ();
@@ -7023,6 +7065,7 @@ gdb_agent_helper_thread (void *arg)
int fd;
char buf[1];
int ret;
+ int stop_loop = 0;
tmp = sizeof (sockaddr);
@@ -7055,8 +7098,12 @@ gdb_agent_helper_thread (void *arg)
if (cmd_buf[0])
{
+ if (strncmp ("close", cmd_buf, 5) == 0)
+ {
+ stop_loop = 1;
+ }
#ifdef HAVE_UST
- if (strcmp ("qTfSTM", cmd_buf) == 0)
+ else if (strcmp ("qTfSTM", cmd_buf) == 0)
{
cmd_qtfstm (cmd_buf);
}
@@ -7088,6 +7135,20 @@ gdb_agent_helper_thread (void *arg)
/* Fix compiler's warning: ignoring return value of 'write'. */
ret = write (fd, buf, 1);
close (fd);
+
+ if (stop_loop)
+ {
+ close (listen_fd);
+ unlink (agent_socket_name);
+
+ /* Sleep endlessly to wait the whole inferior stops. This
+ thread can not exit because GDB or GDBserver may still need
+ 'current_inferior' (representing this thread) to access
+ inferior memory. Otherwise, this thread exits earlier than
+ other threads, and 'current_inferior' is set to NULL. */
+ while (1)
+ sleep (10);
+ }
}
}