From d5f1b1bbe0a881f66b6bb6951fa54e553002c24d Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 5 Jun 2009 12:06:05 +0200 Subject: *: add FAST_FUNC to function ptrs where it makes sense function old new delta evalcommand 1195 1209 +14 testcmd - 10 +10 printfcmd - 10 +10 echocmd - 10 +10 func_exec 270 276 +6 echo_dg 104 109 +5 store_nlmsg 85 89 +4 pseudo_exec_argv 195 198 +3 dotcmd 287 290 +3 machtime_stream 29 31 +2 discard_stream 24 26 +2 argstr 1299 1301 +2 killcmd 108 109 +1 evalfor 226 227 +1 daytime_stream 43 44 +1 run_list 2544 2543 -1 lookupvar 62 61 -1 ipaddr_modify 1310 1309 -1 ... parse_stream 2254 2245 -9 evalpipe 356 347 -9 collect_if 210 197 -13 read_opt 869 851 -18 handle_dollar 681 658 -23 print_addrinfo 1342 1303 -39 iterate_on_dir 156 59 -97 print_route 1709 1609 -100 ------------------------------------------------------------------------------ (add/remove: 3/0 grow/shrink: 12/130 up/down: 74/-767) Total: -693 bytes text data bss dec hex filename 841748 467 7872 850087 cf8a7 busybox_old 841061 467 7872 849400 cf5f8 busybox_unstripped Signed-off-by: Denys Vlasenko --- networking/libiproute/ipaddress.c | 7 +++---- networking/libiproute/iproute.c | 2 +- networking/libiproute/iprule.c | 2 +- networking/libiproute/libnetlink.c | 12 ++++++------ networking/libiproute/libnetlink.h | 10 +++++----- networking/libiproute/ll_map.c | 12 ++++++------ networking/libiproute/ll_map.h | 12 ++++++------ 7 files changed, 28 insertions(+), 29 deletions(-) (limited to 'networking/libiproute') diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c index 644874f..d042af0 100644 --- a/networking/libiproute/ipaddress.c +++ b/networking/libiproute/ipaddress.c @@ -196,7 +196,7 @@ static int flush_update(void) return 0; } -static int print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM, +static int FAST_FUNC print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM, struct nlmsghdr *n, void *arg UNUSED_PARAM) { struct ifaddrmsg *ifa = NLMSG_DATA(n); @@ -349,8 +349,7 @@ static int print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM, } -struct nlmsg_list -{ +struct nlmsg_list { struct nlmsg_list *next; struct nlmsghdr h; }; @@ -377,7 +376,7 @@ static int print_selected_addrinfo(int ifindex, struct nlmsg_list *ainfo) } -static int store_nlmsg(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) +static int FAST_FUNC store_nlmsg(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) { struct nlmsg_list **linfo = (struct nlmsg_list**)arg; struct nlmsg_list *h; diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c index 3785952..ac7eec5 100644 --- a/networking/libiproute/iproute.c +++ b/networking/libiproute/iproute.c @@ -78,7 +78,7 @@ static unsigned get_hz(void) return hz_internal; } -static int print_route(const struct sockaddr_nl *who UNUSED_PARAM, +static int FAST_FUNC print_route(const struct sockaddr_nl *who UNUSED_PARAM, struct nlmsghdr *n, void *arg UNUSED_PARAM) { struct rtmsg *r = NLMSG_DATA(n); diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c index 6c90c6d..bec530d 100644 --- a/networking/libiproute/iprule.c +++ b/networking/libiproute/iprule.c @@ -40,7 +40,7 @@ static void usage(void) } */ -static int print_rule(const struct sockaddr_nl *who UNUSED_PARAM, +static int FAST_FUNC print_rule(const struct sockaddr_nl *who UNUSED_PARAM, struct nlmsghdr *n, void *arg UNUSED_PARAM) { struct rtmsg *r = NLMSG_DATA(n); diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c index 7ad2de9..b4cc8df 100644 --- a/networking/libiproute/libnetlink.c +++ b/networking/libiproute/libnetlink.c @@ -104,7 +104,7 @@ int FAST_FUNC rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, in } static int rtnl_dump_filter(struct rtnl_handle *rth, - int (*filter)(const struct sockaddr_nl *, struct nlmsghdr *n, void *), + int (*filter)(const struct sockaddr_nl *, struct nlmsghdr *n, void *) FAST_FUNC, void *arg1/*, int (*junk)(struct sockaddr_nl *, struct nlmsghdr *n, void *), void *arg2*/) @@ -196,7 +196,7 @@ static int rtnl_dump_filter(struct rtnl_handle *rth, } int FAST_FUNC xrtnl_dump_filter(struct rtnl_handle *rth, - int (*filter)(const struct sockaddr_nl *, struct nlmsghdr *, void *), + int (*filter)(const struct sockaddr_nl *, struct nlmsghdr *, void *) FAST_FUNC, void *arg1) { int ret = rtnl_dump_filter(rth, filter, arg1/*, NULL, NULL*/); @@ -206,10 +206,10 @@ int FAST_FUNC xrtnl_dump_filter(struct rtnl_handle *rth, } int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, - pid_t peer, unsigned groups, - struct nlmsghdr *answer, - int (*junk)(struct sockaddr_nl *, struct nlmsghdr *, void *), - void *jarg) + pid_t peer, unsigned groups, + struct nlmsghdr *answer, + int (*junk)(struct sockaddr_nl *, struct nlmsghdr *, void *), + void *jarg) { /* bbox doesn't use parameters no. 3, 4, 6, 7, they are stubbed out */ #define peer 0 diff --git a/networking/libiproute/libnetlink.h b/networking/libiproute/libnetlink.h index 11a4a10..41ecfa6 100644 --- a/networking/libiproute/libnetlink.h +++ b/networking/libiproute/libnetlink.h @@ -23,16 +23,16 @@ extern void rtnl_close(struct rtnl_handle *rth) FAST_FUNC; extern int xrtnl_wilddump_request(struct rtnl_handle *rth, int fam, int type) FAST_FUNC; extern int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len) FAST_FUNC; extern int xrtnl_dump_filter(struct rtnl_handle *rth, - int (*filter)(const struct sockaddr_nl*, struct nlmsghdr *n, void*), - void *arg1) FAST_FUNC; + int (*filter)(const struct sockaddr_nl*, struct nlmsghdr *n, void*) FAST_FUNC, + void *arg1) FAST_FUNC; /* bbox doesn't use parameters no. 3, 4, 6, 7, stub them out */ #define rtnl_talk(rtnl, n, peer, groups, answer, junk, jarg) \ rtnl_talk(rtnl, n, answer) extern int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer, - unsigned groups, struct nlmsghdr *answer, - int (*junk)(struct sockaddr_nl *,struct nlmsghdr *n, void *), - void *jarg) FAST_FUNC; + unsigned groups, struct nlmsghdr *answer, + int (*junk)(struct sockaddr_nl *,struct nlmsghdr *n, void *), + void *jarg) FAST_FUNC; extern int rtnl_send(struct rtnl_handle *rth, char *buf, int) FAST_FUNC; diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c index 951496f..62528cc 100644 --- a/networking/libiproute/ll_map.c +++ b/networking/libiproute/ll_map.c @@ -39,7 +39,7 @@ static struct idxmap *find_by_index(int idx) return NULL; } -int ll_remember_index(const struct sockaddr_nl *who UNUSED_PARAM, +int FAST_FUNC ll_remember_index(const struct sockaddr_nl *who UNUSED_PARAM, struct nlmsghdr *n, void *arg UNUSED_PARAM) { @@ -86,7 +86,7 @@ int ll_remember_index(const struct sockaddr_nl *who UNUSED_PARAM, return 0; } -const char *ll_idx_n2a(int idx, char *buf) +const char FAST_FUNC *ll_idx_n2a(int idx, char *buf) { struct idxmap *im; @@ -100,7 +100,7 @@ const char *ll_idx_n2a(int idx, char *buf) } -const char *ll_index_to_name(int idx) +const char FAST_FUNC *ll_index_to_name(int idx) { static char nbuf[16]; @@ -121,7 +121,7 @@ int ll_index_to_type(int idx) } #endif -unsigned ll_index_to_flags(int idx) +unsigned FAST_FUNC ll_index_to_flags(int idx) { struct idxmap *im; @@ -133,7 +133,7 @@ unsigned ll_index_to_flags(int idx) return 0; } -int xll_name_to_index(const char *name) +int FAST_FUNC xll_name_to_index(const char *name) { int ret = 0; int sock_fd; @@ -192,7 +192,7 @@ int xll_name_to_index(const char *name) return ret; } -int ll_init_map(struct rtnl_handle *rth) +int FAST_FUNC ll_init_map(struct rtnl_handle *rth) { xrtnl_wilddump_request(rth, AF_UNSPEC, RTM_GETLINK); xrtnl_dump_filter(rth, ll_remember_index, &idxmap); diff --git a/networking/libiproute/ll_map.h b/networking/libiproute/ll_map.h index b183cd6..c5d3834 100644 --- a/networking/libiproute/ll_map.h +++ b/networking/libiproute/ll_map.h @@ -4,13 +4,13 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN -int ll_remember_index(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg); -int ll_init_map(struct rtnl_handle *rth); -int xll_name_to_index(const char *name); -const char *ll_index_to_name(int idx); -const char *ll_idx_n2a(int idx, char *buf); +int ll_remember_index(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) FAST_FUNC; +int ll_init_map(struct rtnl_handle *rth) FAST_FUNC; +int xll_name_to_index(const char *name) FAST_FUNC; +const char *ll_index_to_name(int idx) FAST_FUNC; +const char *ll_idx_n2a(int idx, char *buf) FAST_FUNC; /* int ll_index_to_type(int idx); */ -unsigned ll_index_to_flags(int idx); +unsigned ll_index_to_flags(int idx) FAST_FUNC; POP_SAVED_FUNCTION_VISIBILITY -- cgit v1.1