d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Should use the non-locking versions of the ifqueue macros to

Browse Source 
fiddle around with private queues, because their mutex is not
needed. All this processing should be protected by the netgraph
locking.
This commit is contained in:
Hartmut Brandt 2004-01-26 14:46:35 +00:00
parent b1b70498ba
commit 81a4ef8131
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=125031
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/netgraph/ng_source.c
View File

@ -396,7 +396,7 @@ ng_source_rcvdata(hook_p hook, item_p item)
/* enque packet */
/* XXX should we check IF_QFULL() ? */
IF_ENQUEUE(&sc->snd_queue, m);
_IF_ENQUEUE(&sc->snd_queue, m);
sc->queueOctets += m->m_pkthdr.len;
return (0);
@ -539,7 +539,7 @@ ng_source_clr_data (sc_p sc)
struct mbuf *m;
for (;;) {
IF_DEQUEUE(&sc->snd_queue, m);
_IF_DEQUEUE(&sc->snd_queue, m);
if (m == NULL)
break;
NG_FREE_M(m);
@ -633,7 +633,7 @@ ng_source_send (sc_p sc, int tosend, int *sent_p)
bzero (&tmp_queue, sizeof (tmp_queue));
for (sent = 0; error == 0 && sent < tosend; ++sent) {
s = splnet();
IF_DEQUEUE(&sc->snd_queue, m);
_IF_DEQUEUE(&sc->snd_queue, m);
splx(s);
if (m == NULL)
break;
@ -642,7 +642,7 @@ ng_source_send (sc_p sc, int tosend, int *sent_p)
m2 = m_copypacket(m, M_DONTWAIT);
if (m2 == NULL) {
s = splnet();
IF_PREPEND(&sc->snd_queue, m);
_IF_PREPEND(&sc->snd_queue, m);
splx(s);
error = ENOBUFS;
break;
@ -650,17 +650,17 @@ ng_source_send (sc_p sc, int tosend, int *sent_p)
/* re-enqueue the original packet for us */
s = splnet();
IF_ENQUEUE(&sc->snd_queue, m);
_IF_ENQUEUE(&sc->snd_queue, m);
splx(s);
/* queue the copy for sending at smplimp */
IF_ENQUEUE(&tmp_queue, m2);
_IF_ENQUEUE(&tmp_queue, m2);
}
sent = 0;
s = splimp();
for (;;) {
IF_DEQUEUE(&tmp_queue, m2);
_IF_DEQUEUE(&tmp_queue, m2);
if (m2 == NULL)
break;
if (error == 0) {