[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/14] gdbstub: eliminate gdbserver_fd global
From: |
Alex Bennée |
Subject: |
[PULL 10/14] gdbstub: eliminate gdbserver_fd global |
Date: |
Wed, 6 May 2020 13:05:25 +0100 |
We don't really need to track this fd beyond the initial creation of
the socket. We already know if the system has been initialised by
virtue of the gdbserver_state so lets remove it. This makes the later
re-factoring easier.
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
diff --git a/gdbstub.c b/gdbstub.c
index 171e1509509..b5381aa5204 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -398,8 +398,6 @@ static void reset_gdbserver_state(void)
bool gdb_has_xml;
#ifdef CONFIG_USER_ONLY
-/* XXX: This is not thread safe. Do we care? */
-static int gdbserver_fd = -1;
static int get_char(void)
{
@@ -2964,7 +2962,7 @@ void gdb_exit(CPUArchState *env, int code)
return;
}
#ifdef CONFIG_USER_ONLY
- if (gdbserver_fd < 0 || gdbserver_state.fd < 0) {
+ if (gdbserver_state.fd < 0) {
return;
}
#endif
@@ -3011,7 +3009,7 @@ gdb_handlesig(CPUState *cpu, int sig)
char buf[256];
int n;
- if (gdbserver_fd < 0 || gdbserver_state.fd < 0) {
+ if (!gdbserver_state.init || gdbserver_state.fd < 0) {
return sig;
}
@@ -3060,7 +3058,7 @@ void gdb_signalled(CPUArchState *env, int sig)
{
char buf[4];
- if (gdbserver_fd < 0 || gdbserver_state.fd < 0) {
+ if (!gdbserver_state.init || gdbserver_state.fd < 0) {
return;
}
@@ -3068,7 +3066,7 @@ void gdb_signalled(CPUArchState *env, int sig)
put_packet(buf);
}
-static bool gdb_accept(void)
+static bool gdb_accept(int gdb_fd)
{
struct sockaddr_in sockaddr;
socklen_t len;
@@ -3076,7 +3074,7 @@ static bool gdb_accept(void)
for(;;) {
len = sizeof(sockaddr);
- fd = accept(gdbserver_fd, (struct sockaddr *)&sockaddr, &len);
+ fd = accept(gdb_fd, (struct sockaddr *)&sockaddr, &len);
if (fd < 0 && errno != EINTR) {
perror("accept");
return false;
@@ -3137,13 +3135,13 @@ static int gdbserver_open(int port)
int gdbserver_start(int port)
{
- gdbserver_fd = gdbserver_open(port);
- if (gdbserver_fd < 0)
+ int gdb_fd = gdbserver_open(port);
+ if (gdb_fd < 0) {
return -1;
+ }
/* accept connections */
- if (!gdb_accept()) {
- close(gdbserver_fd);
- gdbserver_fd = -1;
+ if (!gdb_accept(gdb_fd)) {
+ close(gdb_fd);
return -1;
}
return 0;
@@ -3152,7 +3150,7 @@ int gdbserver_start(int port)
/* Disable gdb stub for child processes. */
void gdbserver_fork(CPUState *cpu)
{
- if (gdbserver_fd < 0 || gdbserver_state.fd < 0) {
+ if (!gdbserver_state.init || gdbserver_state.fd < 0) {
return;
}
close(gdbserver_state.fd);
--
2.20.1
- [PULL 00/14] testing and gdbstub updates, Alex Bennée, 2020/05/06
- [PULL 02/14] .travis.yml: drop MacOSX, Alex Bennée, 2020/05/06
- [PULL 05/14] .travis.yml: reduce the load on [ppc64] GCC check-tcg, Alex Bennée, 2020/05/06
- [PULL 03/14] .cirrus.yml: bump FreeBSD to the current stable release, Alex Bennée, 2020/05/06
- [PULL 06/14] configure: favour gdb-multiarch if we have it, Alex Bennée, 2020/05/06
- [PULL 01/14] .travis.yml: show free disk space at end of run, Alex Bennée, 2020/05/06
- [PULL 04/14] .cirrus.yml: bootstrap pkg unconditionally, Alex Bennée, 2020/05/06
- [PULL 08/14] tests/tcg: better trap gdb failures, Alex Bennée, 2020/05/06
- [PULL 07/14] gdbstub: Introduce gdb_get_float64() to get 64-bit float registers, Alex Bennée, 2020/05/06
- [PULL 10/14] gdbstub: eliminate gdbserver_fd global,
Alex Bennée <=
- [PULL 09/14] tests/tcg: drop inferior.was_attached() test, Alex Bennée, 2020/05/06
- [PULL 11/14] gdbstub/linux-user: support debugging over a unix socket, Alex Bennée, 2020/05/06
- [PULL 12/14] tests/guest-debug: use the unix socket for linux-user tests, Alex Bennée, 2020/05/06
- [PULL 14/14] target/m68k: fix gdb for m68xxx, Alex Bennée, 2020/05/06
- [PULL 13/14] tests/tcg: add a multiarch linux-user gdb test, Alex Bennée, 2020/05/06
- Re: [PULL 00/14] testing and gdbstub updates, Peter Maydell, 2020/05/06