xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2025-02-02 02:04:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

slirp: make timeout local

Browse Source 
Each slirp has its own time to caculate timeout.

Signed-off-by: Liu Ping Fan <pingfank@linux.vnet.ibm.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Liu Ping Fan 2013-08-25 10:01:19 +08:00 committed by Jan Kiszka
parent 2d1fe1873a
commit fe0ff43c9d
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
slirp/slirp.c
View File

@ -40,8 +40,6 @@ static const uint8_t special_ethaddr[ETH_ALEN] = {
static const uint8_t zero_ethaddr[ETH_ALEN] = { 0, 0, 0, 0, 0, 0 }; static const uint8_t zero_ethaddr[ETH_ALEN] = { 0, 0, 0, 0, 0, 0 };
u_int curtime; u_int curtime;
static u_int time_fasttimo, last_slowtimo;
static int do_slowtimo;
static QTAILQ_HEAD(slirp_instances, Slirp) slirp_instances = static QTAILQ_HEAD(slirp_instances, Slirp) slirp_instances =
QTAILQ_HEAD_INITIALIZER(slirp_instances); QTAILQ_HEAD_INITIALIZER(slirp_instances);
@ -278,14 +276,13 @@ void slirp_pollfds_fill(GArray *pollfds)
/* /*
* First, TCP sockets * First, TCP sockets
*/ */
do_slowtimo = 0;
QTAILQ_FOREACH(slirp, &slirp_instances, entry) { QTAILQ_FOREACH(slirp, &slirp_instances, entry) {
/* /*
* *_slowtimo needs calling if there are IP fragments * *_slowtimo needs calling if there are IP fragments
* in the fragment queue, or there are TCP connections active * in the fragment queue, or there are TCP connections active
*/ */
do_slowtimo |= ((slirp->tcb.so_next != &slirp->tcb) || slirp->do_slowtimo = ((slirp->tcb.so_next != &slirp->tcb) ||
(&slirp->ipq.ip_link != slirp->ipq.ip_link.next)); (&slirp->ipq.ip_link != slirp->ipq.ip_link.next));
for (so = slirp->tcb.so_next; so != &slirp->tcb; for (so = slirp->tcb.so_next; so != &slirp->tcb;
@ -299,8 +296,9 @@ void slirp_pollfds_fill(GArray *pollfds)
/* /*
* See if we need a tcp_fasttimo * See if we need a tcp_fasttimo
*/ */
if (time_fasttimo == 0 && so->so_tcpcb->t_flags & TF_DELACK) { if (slirp->time_fasttimo == 0 &&
time_fasttimo = curtime; /* Flag when we want a fasttimo */ so->so_tcpcb->t_flags & TF_DELACK) {
slirp->time_fasttimo = curtime; /* Flag when want a fasttimo */
} }
/* /*
@ -381,7 +379,7 @@ void slirp_pollfds_fill(GArray *pollfds)
udp_detach(so); udp_detach(so);
continue; continue;
} else { } else {
do_slowtimo = 1; /* Let socket expire */ slirp->do_slowtimo = true; /* Let socket expire */
} }
} }
@ -422,7 +420,7 @@ void slirp_pollfds_fill(GArray *pollfds)
icmp_detach(so); icmp_detach(so);
continue; continue;
} else { } else {
do_slowtimo = 1; /* Let socket expire */ slirp->do_slowtimo = true; /* Let socket expire */
} }
} }
@ -454,14 +452,14 @@ void slirp_pollfds_poll(GArray *pollfds, int select_error)
/* /*
* See if anything has timed out * See if anything has timed out
*/ */
if (time_fasttimo && ((curtime - time_fasttimo) >= 2)) { if (slirp->time_fasttimo && ((curtime - slirp->time_fasttimo) >= 2)) {
tcp_fasttimo(slirp); tcp_fasttimo(slirp);
time_fasttimo = 0; slirp->time_fasttimo = 0;
} }
if (do_slowtimo && ((curtime - last_slowtimo) >= 499)) { if (slirp->do_slowtimo && ((curtime - slirp->last_slowtimo) >= 499)) {
ip_slowtimo(slirp); ip_slowtimo(slirp);
tcp_slowtimo(slirp); tcp_slowtimo(slirp);
last_slowtimo = curtime; slirp->last_slowtimo = curtime;
} }
/* /*

3
slirp/slirp.h
View File

@ -203,6 +203,9 @@ bool arp_table_search(Slirp *slirp, uint32_t ip_addr,
struct Slirp { struct Slirp {
QTAILQ_ENTRY(Slirp) entry; QTAILQ_ENTRY(Slirp) entry;
u_int time_fasttimo;
u_int last_slowtimo;
bool do_slowtimo;
/* virtual network configuration */ /* virtual network configuration */
struct in_addr vnetwork_addr; struct in_addr vnetwork_addr;