Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change if_slowtimo_ch to a pointer 

One benefit to do so is to reduce memory used for struct callout;
we can avoid to allocate struct callout for interfaces that don't
use callout.

Requested by uebayasi@.
This commit is contained in:
ozaki-r 2014-11-26 09:38:42 +00:00
parent 3f6a7c52ac
commit e45b80861c
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/net/if.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if.c,v 1.296 2014/11/26 07:43:04 ozaki-r Exp $ */
/* $NetBSD: if.c,v 1.297 2014/11/26 09:38:42 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@ -90,7 +90,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.296 2014/11/26 07:43:04 ozaki-r Exp $");
__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.297 2014/11/26 09:38:42 ozaki-r Exp $");
#include "opt_inet.h"
@ -635,8 +635,10 @@ if_attach(ifnet_t *ifp)
rt_ifannouncemsg(ifp, IFAN_ARRIVAL);
if (ifp->if_slowtimo != NULL) {
callout_init(&ifp->if_slowtimo_ch, 0);
callout_setfunc(&ifp->if_slowtimo_ch, if_slowtimo, ifp);
ifp->if_slowtimo_ch =
kmem_zalloc(sizeof(*ifp->if_slowtimo_ch), KM_SLEEP);
callout_init(ifp->if_slowtimo_ch, 0);
callout_setfunc(ifp->if_slowtimo_ch, if_slowtimo, ifp);
if_slowtimo(ifp);
}
}
@ -739,8 +741,9 @@ if_detach(struct ifnet *ifp)
s = splnet();
if (ifp->if_slowtimo != NULL) {
callout_halt(&ifp->if_slowtimo_ch, NULL);
callout_destroy(&ifp->if_slowtimo_ch);
callout_halt(ifp->if_slowtimo_ch, NULL);
callout_destroy(ifp->if_slowtimo_ch);
kmem_free(ifp->if_slowtimo_ch, sizeof(*ifp->if_slowtimo_ch));
}
/*
@ -1516,7 +1519,7 @@ if_slowtimo(void *arg)
(*ifp->if_slowtimo)(ifp);
splx(s);
callout_schedule(&ifp->if_slowtimo_ch, hz / IFNET_SLOWHZ);
callout_schedule(ifp->if_slowtimo_ch, hz / IFNET_SLOWHZ);
}
/*

5
sys/net/if.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if.h,v 1.178 2014/11/26 07:43:04 ozaki-r Exp $ */
/* $NetBSD: if.h,v 1.179 2014/11/26 09:38:42 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@ -245,6 +245,7 @@ TAILQ_HEAD(ifnet_head, ifnet); /* the actual queue head */
struct bridge_softc;
struct bridge_iflist;
struct callout;
typedef struct ifnet {
void *if_softc; /* lower-level data for this if */
@ -344,7 +345,7 @@ typedef struct ifnet {
int (*if_setflags)(struct ifnet *, const short);
struct ifnet_lock *if_ioctl_lock;
#ifdef _KERNEL /* XXX kvm(3) */
callout_t if_slowtimo_ch;
struct callout *if_slowtimo_ch;
#endif
} ifnet_t;