Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SITL: prevent a fd leak in GPS code

This commit is contained in:
Andrew Tridgell 2012-09-17 14:44:27 +10:00
parent 4d4a95501f
commit 78a95290a3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/Desktop/support/sitl_gps.cpp
View File

@ -37,7 +37,7 @@ static uint8_t gps_delay;
// state of GPS emulation
static struct {
/* pipe emulating UBLOX GPS serial stream */
int gps_fd;
int gps_fd, client_fd;
uint32_t last_update; // milliseconds
} gps_state;
@ -55,12 +55,16 @@ ssize_t sitl_gps_read(int fd, void *buf, size_t count)
int sitl_gps_pipe(void)
{
int fd[2];
if (gps_state.client_fd != 0) {
return gps_state.client_fd;
}
pipe(fd);
gps_state.gps_fd = fd[1];
gps_state.gps_fd = fd[1];
gps_state.client_fd = fd[0];
gps_state.last_update = millis();
set_nonblocking(gps_state.gps_fd);
set_nonblocking(fd[0]);
return fd[0];
return gps_state.client_fd;
}