mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

slirp: Use monotonic clock if available (v2)

Browse Source 
Calling gettimeofday() to compute a time interval can cause problems if
the system clock jumps forwards or backwards; replace updtime() with
qemu_get_clock(rt_clock), which calls clock_gettime(CLOCK_MONOTONIC) if
it is available.

Also remove some useless macros.

Signed-off-by: Ed Swierk <eswierk@aristanetworks.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Ed Swierk 2009-07-23 14:13:34 -07:00 committed by Anthony Liguori
parent 97df1ee542
commit aaf10d9d2e
3 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
slirp/slirp.c
View File

@ -22,6 +22,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu-timer.h"
#include "qemu-char.h" #include "qemu-char.h"
#include "slirp.h" #include "slirp.h"
#include "hw/hw.h" #include "hw/hw.h"
@ -244,29 +245,6 @@ void slirp_cleanup(Slirp *slirp)
#define CONN_CANFRCV(so) (((so)->so_state & (SS_FCANTRCVMORE|SS_ISFCONNECTED)) == SS_ISFCONNECTED) #define CONN_CANFRCV(so) (((so)->so_state & (SS_FCANTRCVMORE|SS_ISFCONNECTED)) == SS_ISFCONNECTED)
#define UPD_NFDS(x) if (nfds < (x)) nfds = (x) #define UPD_NFDS(x) if (nfds < (x)) nfds = (x)
/*
* curtime kept to an accuracy of 1ms
*/
#ifdef _WIN32
static void updtime(void)
{
struct _timeb tb;
_ftime(&tb);
curtime = tb.time * 1000 + tb.millitm;
}
#else
static void updtime(void)
{
struct timeval tv;
gettimeofday(&tv, NULL);
curtime = tv.tv_sec * 1000 + tv.tv_usec / 1000;
}
#endif
void slirp_select_fill(int *pnfds, void slirp_select_fill(int *pnfds,
fd_set *readfds, fd_set *writefds, fd_set *xfds) fd_set *readfds, fd_set *writefds, fd_set *xfds)
{ {
@ -405,8 +383,7 @@ void slirp_select_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds,
global_writefds = writefds; global_writefds = writefds;
global_xfds = xfds; global_xfds = xfds;
/* Update time */ curtime = qemu_get_clock(rt_clock);
updtime();
TAILQ_FOREACH(slirp, &slirp_instances, entry) { TAILQ_FOREACH(slirp, &slirp_instances, entry) {
/* /*

4
slirp/slirp.h
View File

@ -108,10 +108,6 @@ typedef unsigned char u_int8_t;
#include <arpa/inet.h> #include <arpa/inet.h>
#endif #endif
#ifdef GETTIMEOFDAY_ONE_ARG
#define gettimeofday(x, y) gettimeofday(x)
#endif
/* Systems lacking strdup() definition in <string.h>. */ /* Systems lacking strdup() definition in <string.h>. */
#if defined(ultrix) #if defined(ultrix)
char *strdup(const char *); char *strdup(const char *);

3
slirp/slirp_config.h
View File

@ -187,9 +187,6 @@
#define NO_UNIX_SOCKETS #define NO_UNIX_SOCKETS
#endif #endif
/* Define if gettimeofday only takes one argument */
#undef GETTIMEOFDAY_ONE_ARG
/* Define if you have revoke() */ /* Define if you have revoke() */
#undef HAVE_REVOKE #undef HAVE_REVOKE