sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set the accepted to socket to be blocking as that is what the code expects. 

This is necessary on OSX (and probably BSDs) where they default to non blocking which causes recv() to return -1 with errno set to EAGAIN.
This commit is contained in:
Daniel O'Connor 2019-10-14 10:14:25 +10:30 committed by UweBonnes
parent 4a8cba0e9c
commit 0aedff6623
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/platforms/pc/gdb_if.c
View File

@ -98,14 +98,18 @@ unsigned char gdb_if_getchar(void)
{
unsigned char ret;
int i = 0;
#if defined(_WIN32) || defined(__CYGWIN__)
unsigned long opt;
#else
int flags;
#endif
while(i <= 0) {
if(gdb_if_conn <= 0) {
#if defined(_WIN32) || defined(__CYGWIN__)
unsigned long opt = 1;
opt = 1;
ioctlsocket(gdb_if_serv, FIONBIO, &opt);
#else
int flags = fcntl(gdb_if_serv, F_GETFL);
flags = fcntl(gdb_if_serv, F_GETFL);
fcntl(gdb_if_serv, F_SETFL, flags | O_NONBLOCK);
#endif
while(1) {
@ -115,12 +119,12 @@ unsigned char gdb_if_getchar(void)
SET_IDLE_STATE(1);
platform_delay(100);
} else {
DEBUG("error when accepting connection");
DEBUG("error when accepting connection: %s", strerror(errno));
exit(1);
}
} else {
#if defined(_WIN32) || defined(__CYGWIN__)
unsigned long opt = 0;
opt = 0;
ioctlsocket(gdb_if_serv, FIONBIO, &opt);
#else
fcntl(gdb_if_serv, F_SETFL, flags);
@ -129,11 +133,18 @@ unsigned char gdb_if_getchar(void)
}
}
DEBUG("Got connection\n");
#if defined(_WIN32) || defined(__CYGWIN__)
opt = 0;
ioctlsocket(gdb_if_conn, FIONBIO, &opt);
#else
flags = fcntl(gdb_if_conn, F_GETFL);
fcntl(gdb_if_conn, F_SETFL, flags & ~O_NONBLOCK);
#endif
}
i = recv(gdb_if_conn, (void*)&ret, 1, 0);
if(i <= 0) {
gdb_if_conn = -1;
DEBUG("Dropped broken connection\n");
DEBUG("Dropped broken connection: %s\n", strerror(errno));
/* Return '+' in case we were waiting for an ACK */
return '+';
}