proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-11 18:48:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: Modify pim_sock_read to read 3 times before yielding

Browse Source 
Modify pim_sock_read to read up to 3 packets before yielding
the cpu to something else.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2016-11-17 10:50:05 -05:00
parent 5441e69048
commit db48bcb23e
1 changed files with 52 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
pimd/pim_pim.c
View File

@ -289,51 +289,73 @@ static int pim_sock_read(struct thread *t)
int len; int len;
ifindex_t ifindex = -1; ifindex_t ifindex = -1;
int result = -1; /* defaults to bad */ int result = -1; /* defaults to bad */
static long long count = 0;
int cont = 1;
ifp = THREAD_ARG(t); ifp = THREAD_ARG(t);
fd = THREAD_FD(t); fd = THREAD_FD(t);
pim_ifp = ifp->info; pim_ifp = ifp->info;
len = pim_socket_recvfromto(fd, buf, sizeof(buf), while (cont)
&from, &fromlen, {
&to, &tolen, len = pim_socket_recvfromto(fd, buf, sizeof(buf),
&ifindex); &from, &fromlen,
&to, &tolen,
&ifindex);
if (len < 0)
{
if (errno == EINTR)
continue;
if (errno == EWOULDBLOCK || errno == EAGAIN)
{
cont = 0;
break;
}
if (PIM_DEBUG_PIM_PACKETS)
zlog_debug ("Received errno: %d %s", errno, safe_strerror (errno));
goto done;
}
#ifdef PIM_CHECK_RECV_IFINDEX_SANITY #ifdef PIM_CHECK_RECV_IFINDEX_SANITY
/* ifindex sanity check */ /* ifindex sanity check */
if (ifindex != (int) ifp->ifindex) { if (ifindex != (int) ifp->ifindex) {
char from_str[INET_ADDRSTRLEN]; char from_str[INET_ADDRSTRLEN];
char to_str[INET_ADDRSTRLEN]; char to_str[INET_ADDRSTRLEN];
struct interface *recv_ifp; struct interface *recv_ifp;
if (!inet_ntop(AF_INET, &from.sin_addr, from_str , sizeof(from_str))) if (!inet_ntop(AF_INET, &from.sin_addr, from_str , sizeof(from_str)))
sprintf(from_str, "<from?>"); sprintf(from_str, "<from?>");
if (!inet_ntop(AF_INET, &to.sin_addr, to_str , sizeof(to_str))) if (!inet_ntop(AF_INET, &to.sin_addr, to_str , sizeof(to_str)))
sprintf(to_str, "<to?>"); sprintf(to_str, "<to?>");
recv_ifp = if_lookup_by_index(ifindex); recv_ifp = if_lookup_by_index(ifindex);
if (recv_ifp) { if (recv_ifp) {
zassert(ifindex == (int) recv_ifp->ifindex); zassert(ifindex == (int) recv_ifp->ifindex);
} }
#ifdef PIM_REPORT_RECV_IFINDEX_MISMATCH #ifdef PIM_REPORT_RECV_IFINDEX_MISMATCH
zlog_warn("Interface mismatch: recv PIM pkt from %s to %s on fd=%d: recv_ifindex=%d (%s) sock_ifindex=%d (%s)", zlog_warn("Interface mismatch: recv PIM pkt from %s to %s on fd=%d: recv_ifindex=%d (%s) sock_ifindex=%d (%s)",
from_str, to_str, fd, from_str, to_str, fd,
ifindex, recv_ifp ? recv_ifp->name : "<if-notfound>", ifindex, recv_ifp ? recv_ifp->name : "<if-notfound>",
ifp->ifindex, ifp->name); ifp->ifindex, ifp->name);
#endif #endif
goto done; goto done;
} }
#endif #endif
int fail = pim_pim_packet(ifp, buf, len); int fail = pim_pim_packet(ifp, buf, len);
if (fail) { if (fail) {
if (PIM_DEBUG_PIM_PACKETS) if (PIM_DEBUG_PIM_PACKETS)
zlog_debug("%s: pim_pim_packet() return=%d", zlog_debug("%s: pim_pim_packet() return=%d",
__PRETTY_FUNCTION__, fail); __PRETTY_FUNCTION__, fail);
goto done; goto done;
} }
count++;
if (count % 3 == 0)
cont = 0;
}
result = 0; /* good */ result = 0; /* good */