falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid embedding struct mbuf in other structures 

struct mbuf uses a C99 open char array to allow inlining data. Inlining
this in another structure is however a GNU extension. The inlines used
so far in struct Slirp were actually only needed as head of struct
mbuf lists. This replaces these inline with mere struct quehead,
and use casts as appropriate.

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Samuel Thibault 2016-02-22 22:29:21 +01:00
parent c17c07231e
commit 67e3eee454
5 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
slirp/if.c
View File

@ -28,9 +28,9 @@ ifs_remque(struct mbuf *ifm)
void void
if_init(Slirp *slirp) if_init(Slirp *slirp)
{ {
slirp->if_fastq.ifq_next = slirp->if_fastq.ifq_prev = &slirp->if_fastq; slirp->if_fastq.qh_link = slirp->if_fastq.qh_rlink = &slirp->if_fastq;
slirp->if_batchq.ifq_next = slirp->if_batchq.ifq_prev = &slirp->if_batchq; slirp->if_batchq.qh_link = slirp->if_batchq.qh_rlink = &slirp->if_batchq;
slirp->next_m = &slirp->if_batchq; slirp->next_m = (struct mbuf *) &slirp->if_batchq;
} }
/* /*
@ -74,7 +74,8 @@ if_output(struct socket *so, struct mbuf *ifm)
* We mustn't put this packet back on the fastq (or we'll send it out of order) * We mustn't put this packet back on the fastq (or we'll send it out of order)
* XXX add cache here? * XXX add cache here?
*/ */
for (ifq = slirp->if_batchq.ifq_prev; ifq != &slirp->if_batchq; for (ifq = (struct mbuf *) slirp->if_batchq.qh_rlink;
(struct quehead *) ifq != &slirp->if_batchq;
ifq = ifq->ifq_prev) { ifq = ifq->ifq_prev) {
if (so == ifq->ifq_so) { if (so == ifq->ifq_so) {
/* A match! */ /* A match! */
@ -86,7 +87,7 @@ if_output(struct socket *so, struct mbuf *ifm)
/* No match, check which queue to put it on */ /* No match, check which queue to put it on */
if (so && (so->so_iptos & IPTOS_LOWDELAY)) { if (so && (so->so_iptos & IPTOS_LOWDELAY)) {
ifq = slirp->if_fastq.ifq_prev; ifq = (struct mbuf *) slirp->if_fastq.qh_rlink;
on_fastq = 1; on_fastq = 1;
/* /*
* Check if this packet is a part of the last * Check if this packet is a part of the last
@ -98,9 +99,9 @@ if_output(struct socket *so, struct mbuf *ifm)
goto diddit; goto diddit;
} }
} else { } else {
ifq = slirp->if_batchq.ifq_prev; ifq = (struct mbuf *) slirp->if_batchq.qh_rlink;
/* Set next_m if the queue was empty so far */ /* Set next_m if the queue was empty so far */
if (slirp->next_m == &slirp->if_batchq) { if ((struct quehead *) slirp->next_m == &slirp->if_batchq) {
slirp->next_m = ifm; slirp->next_m = ifm;
} }
} }
@ -166,10 +167,10 @@ void if_start(Slirp *slirp)
} }
slirp->if_start_busy = true; slirp->if_start_busy = true;
if (slirp->if_fastq.ifq_next != &slirp->if_fastq) { if (slirp->if_fastq.qh_link != &slirp->if_fastq) {
ifm_next = slirp->if_fastq.ifq_next; ifm_next = (struct mbuf *) slirp->if_fastq.qh_link;
next_from_batchq = false; next_from_batchq = false;
} else if (slirp->next_m != &slirp->if_batchq) { } else if ((struct quehead *) slirp->next_m != &slirp->if_batchq) {
/* Nothing on fastq, pick up from batchq via next_m */ /* Nothing on fastq, pick up from batchq via next_m */
ifm_next = slirp->next_m; ifm_next = slirp->next_m;
next_from_batchq = true; next_from_batchq = true;
@ -182,12 +183,12 @@ void if_start(Slirp *slirp)
from_batchq = next_from_batchq; from_batchq = next_from_batchq;
ifm_next = ifm->ifq_next; ifm_next = ifm->ifq_next;
if (ifm_next == &slirp->if_fastq) { if ((struct quehead *) ifm_next == &slirp->if_fastq) {
/* No more packets in fastq, switch to batchq */ /* No more packets in fastq, switch to batchq */
ifm_next = slirp->next_m; ifm_next = slirp->next_m;
next_from_batchq = true; next_from_batchq = true;
} }
if (ifm_next == &slirp->if_batchq) { if ((struct quehead *) ifm_next == &slirp->if_batchq) {
/* end of batchq */ /* end of batchq */
ifm_next = NULL; ifm_next = NULL;
} }
@ -218,7 +219,7 @@ void if_start(Slirp *slirp)
/* Next packet in fastq is from the same session */ /* Next packet in fastq is from the same session */
ifm_next = next; ifm_next = next;
next_from_batchq = false; next_from_batchq = false;
} else if (slirp->next_m == &slirp->if_batchq) { } else if ((struct quehead *) slirp->next_m == &slirp->if_batchq) {
/* Set next_m and ifm_next if the session packet is now the /* Set next_m and ifm_next if the session packet is now the
* only one on batchq */ * only one on batchq */
slirp->next_m = ifm_next = next; slirp->next_m = ifm_next = next;

19
slirp/mbuf.c
View File

@ -29,16 +29,16 @@
void void
m_init(Slirp *slirp) m_init(Slirp *slirp)
{ {
slirp->m_freelist.m_next = slirp->m_freelist.m_prev = &slirp->m_freelist; slirp->m_freelist.qh_link = slirp->m_freelist.qh_rlink = &slirp->m_freelist;
slirp->m_usedlist.m_next = slirp->m_usedlist.m_prev = &slirp->m_usedlist; slirp->m_usedlist.qh_link = slirp->m_usedlist.qh_rlink = &slirp->m_usedlist;
} }
void m_cleanup(Slirp *slirp) void m_cleanup(Slirp *slirp)
{ {
struct mbuf *m, *next; struct mbuf *m, *next;
m = slirp->m_usedlist.m_next; m = (struct mbuf *) slirp->m_usedlist.qh_link;
while (m != &slirp->m_usedlist) { while ((struct quehead *) m != &slirp->m_usedlist) {
next = m->m_next; next = m->m_next;
if (m->m_flags & M_EXT) { if (m->m_flags & M_EXT) {
free(m->m_ext); free(m->m_ext);
@ -46,8 +46,8 @@ void m_cleanup(Slirp *slirp)
free(m); free(m);
m = next; m = next;
} }
m = slirp->m_freelist.m_next; m = (struct mbuf *) slirp->m_freelist.qh_link;
while (m != &slirp->m_freelist) { while ((struct quehead *) m != &slirp->m_freelist) {
next = m->m_next; next = m->m_next;
free(m); free(m);
m = next; m = next;
@ -70,7 +70,7 @@ m_get(Slirp *slirp)
DEBUG_CALL("m_get"); DEBUG_CALL("m_get");
if (slirp->m_freelist.m_next == &slirp->m_freelist) { if (slirp->m_freelist.qh_link == &slirp->m_freelist) {
m = (struct mbuf *)malloc(SLIRP_MSIZE); m = (struct mbuf *)malloc(SLIRP_MSIZE);
if (m == NULL) goto end_error; if (m == NULL) goto end_error;
slirp->mbuf_alloced++; slirp->mbuf_alloced++;
@ -78,7 +78,7 @@ m_get(Slirp *slirp)
flags = M_DOFREE; flags = M_DOFREE;
m->slirp = slirp; m->slirp = slirp;
} else { } else {
m = slirp->m_freelist.m_next; m = (struct mbuf *) slirp->m_freelist.qh_link;
remque(m); remque(m);
} }
@ -225,7 +225,8 @@ dtom(Slirp *slirp, void *dat)
DEBUG_ARG("dat = %p", dat); DEBUG_ARG("dat = %p", dat);
/* bug corrected for M_EXT buffers */ /* bug corrected for M_EXT buffers */
for (m = slirp->m_usedlist.m_next; m != &slirp->m_usedlist; for (m = (struct mbuf *) slirp->m_usedlist.qh_link;
(struct quehead *) m != &slirp->m_usedlist;
m = m->m_next) { m = m->m_next) {
if (m->m_flags & M_EXT) { if (m->m_flags & M_EXT) {
if( (char *)dat>=m->m_ext && (char *)dat<(m->m_ext + m->m_size) ) if( (char *)dat>=m->m_ext && (char *)dat<(m->m_ext + m->m_size) )

5
slirp/misc.c
View File

@ -17,11 +17,6 @@
int slirp_debug = DBG_CALL|DBG_MISC|DBG_ERROR; int slirp_debug = DBG_CALL|DBG_MISC|DBG_ERROR;
#endif #endif
struct quehead {
struct quehead *qh_link;
struct quehead *qh_rlink;
};
inline void inline void
insque(void *a, void *b) insque(void *a, void *b)
{ {

5
slirp/misc.h
View File

@ -45,6 +45,11 @@ struct emu_t {
struct emu_t *next; struct emu_t *next;
}; };
struct slirp_quehead {
struct slirp_quehead *qh_link;
struct slirp_quehead *qh_rlink;
};
void slirp_insque(void *, void *); void slirp_insque(void *, void *);
void slirp_remque(void *); void slirp_remque(void *);
int add_exec(struct ex_list **, int, char *, struct in_addr, int); int add_exec(struct ex_list **, int, char *, struct in_addr, int);

8
slirp/slirp.h
View File

@ -82,6 +82,7 @@ void free(void *ptr);
have different prototypes. */ have different prototypes. */
#define insque slirp_insque #define insque slirp_insque
#define remque slirp_remque #define remque slirp_remque
#define quehead slirp_quehead
#ifdef HAVE_SYS_STROPTS_H #ifdef HAVE_SYS_STROPTS_H
#include <sys/stropts.h> #include <sys/stropts.h>
@ -197,12 +198,13 @@ struct Slirp {
struct ex_list *exec_list; struct ex_list *exec_list;
/* mbuf states */ /* mbuf states */
struct mbuf m_freelist, m_usedlist; struct quehead m_freelist;
struct quehead m_usedlist;
int mbuf_alloced; int mbuf_alloced;
/* if states */ /* if states */
struct mbuf if_fastq; /* fast queue (for interactive data) */ struct quehead if_fastq; /* fast queue (for interactive data) */
struct mbuf if_batchq; /* queue for non-interactive data */ struct quehead if_batchq; /* queue for non-interactive data */
struct mbuf *next_m; /* pointer to next mbuf to output */ struct mbuf *next_m; /* pointer to next mbuf to output */
bool if_start_busy; /* avoid if_start recursion */ bool if_start_busy; /* avoid if_start recursion */