From: Willy Tarreau Date: Tue, 4 Jan 2011 13:33:13 +0000 (+0100) Subject: [OPTIM] ebtree: inline ebst_lookup_len and ebis_lookup_len X-Git-Tag: v1.5-dev8~328 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1ee956399267ad94c27efe674eed8c6fa656c51;p=thirdparty%2Fhaproxy.git [OPTIM] ebtree: inline ebst_lookup_len and ebis_lookup_len (from ebtree 6.0.5) Both of them are very short and rely on another non-inlined lookup function, so it's pointless to have them as pure functions, it wastes space. (cherry picked from commit 1e68d6fef815f759304d4cc0e65f957689e19a7a) --- diff --git a/ebtree/ebistree.c b/ebtree/ebistree.c index 1b8c912e2c..629889c5b6 100644 --- a/ebtree/ebistree.c +++ b/ebtree/ebistree.c @@ -1,7 +1,7 @@ /* * Elastic Binary Trees - exported functions for Indirect String data nodes. - * Version 6.0 - * (C) 2002-2010 - Willy Tarreau + * Version 6.0.5 + * (C) 2002-2011 - Willy Tarreau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,7 +21,6 @@ /* Consult ebistree.h for more details about those functions */ #include "ebistree.h" -#include "ebimtree.h" /* Find the first occurence of a zero-terminated string in the tree . * It's the caller's reponsibility to use this function only on trees which @@ -32,21 +31,6 @@ REGPRM2 struct ebpt_node *ebis_lookup(struct eb_root *root, const char *x) return __ebis_lookup(root, x); } -/* Find the first occurence of a length string in the tree . - * It's the caller's reponsibility to use this function only on trees which - * only contain zero-terminated strings, and that no null character is present - * in string in the first chars. If none can be found, return NULL. - */ -REGPRM3 struct ebpt_node *ebis_lookup_len(struct eb_root *root, const char *x, unsigned int len) -{ - struct ebpt_node *node; - - node = ebim_lookup(root, x, len); - if (!node || ((const char *)node->key)[len] != 0) - return NULL; - return node; -} - /* Insert ebpt_node into subtree starting at node root . Only * new->key needs be set with the zero-terminated string key. The ebpt_node is * returned. If root->b[EB_RGHT]==1, the tree may only contain unique keys. The diff --git a/ebtree/ebistree.h b/ebtree/ebistree.h index a82130aa36..1110eea3d4 100644 --- a/ebtree/ebistree.h +++ b/ebtree/ebistree.h @@ -1,7 +1,7 @@ /* * Elastic Binary Trees - macros to manipulate Indirect String data nodes. - * Version 6.0 - * (C) 2002-2010 - Willy Tarreau + * Version 6.0.5 + * (C) 2002-2011 - Willy Tarreau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,6 +23,7 @@ #include #include "ebtree.h" #include "ebpttree.h" +#include "ebimtree.h" /* These functions and macros rely on Pointer nodes and use the entry as * a pointer to an indirect key. Most operations are performed using ebpt_*. @@ -32,9 +33,24 @@ * in ebistree.c, which simply relies on their inline version. */ REGPRM2 struct ebpt_node *ebis_lookup(struct eb_root *root, const char *x); -REGPRM3 struct ebpt_node *ebis_lookup_len(struct eb_root *root, const char *x, unsigned int len); REGPRM2 struct ebpt_node *ebis_insert(struct eb_root *root, struct ebpt_node *new); +/* Find the first occurence of a length string in the tree . + * It's the caller's reponsibility to use this function only on trees which + * only contain zero-terminated strings, and that no null character is present + * in string in the first chars. If none can be found, return NULL. + */ +static forceinline struct ebpt_node * +ebis_lookup_len(struct eb_root *root, const char *x, unsigned int len) +{ + struct ebpt_node *node; + + node = ebim_lookup(root, x, len); + if (!node || ((const char *)node->key)[len] != 0) + return NULL; + return node; +} + /* Find the first occurence of a zero-terminated string in the tree . * It's the caller's reponsibility to use this function only on trees which * only contain zero-terminated strings. If none can be found, return NULL. diff --git a/ebtree/ebsttree.c b/ebtree/ebsttree.c index a98b0f33b8..08e9ceb1b6 100644 --- a/ebtree/ebsttree.c +++ b/ebtree/ebsttree.c @@ -1,7 +1,7 @@ /* * Elastic Binary Trees - exported functions for String data nodes. - * Version 6.0 - * (C) 2002-2010 - Willy Tarreau + * Version 6.0.5 + * (C) 2002-2011 - Willy Tarreau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,21 +31,6 @@ REGPRM2 struct ebmb_node *ebst_lookup(struct eb_root *root, const char *x) return __ebst_lookup(root, x); } -/* Find the first occurence of a length string in the tree . - * It's the caller's reponsibility to use this function only on trees which - * only contain zero-terminated strings, and that no null character is present - * in string in the first chars. If none can be found, return NULL. - */ -REGPRM3 struct ebmb_node *ebst_lookup_len(struct eb_root *root, const char *x, unsigned int len) -{ - struct ebmb_node *node; - - node = ebmb_lookup(root, x, len); - if (!node || node->key[len] != 0) - return NULL; - return node; -} - /* Insert ebmb_node into subtree starting at node root . Only * new->key needs be set with the zero-terminated string key. The ebmb_node is * returned. If root->b[EB_RGHT]==1, the tree may only contain unique keys. The diff --git a/ebtree/ebsttree.h b/ebtree/ebsttree.h index 5c52d6e94d..9c86f611e5 100644 --- a/ebtree/ebsttree.h +++ b/ebtree/ebsttree.h @@ -1,7 +1,7 @@ /* * Elastic Binary Trees - macros to manipulate String data nodes. - * Version 6.0 - * (C) 2002-2010 - Willy Tarreau + * Version 6.0.5 + * (C) 2002-2011 - Willy Tarreau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,9 +30,24 @@ * in ebsttree.c, which simply relies on their inline version. */ REGPRM2 struct ebmb_node *ebst_lookup(struct eb_root *root, const char *x); -REGPRM3 struct ebmb_node *ebst_lookup_len(struct eb_root *root, const char *x, unsigned int len); REGPRM2 struct ebmb_node *ebst_insert(struct eb_root *root, struct ebmb_node *new); +/* Find the first occurence of a length string in the tree . + * It's the caller's reponsibility to use this function only on trees which + * only contain zero-terminated strings, and that no null character is present + * in string in the first chars. If none can be found, return NULL. + */ +static forceinline struct ebmb_node * +ebst_lookup_len(struct eb_root *root, const char *x, unsigned int len) +{ + struct ebmb_node *node; + + node = ebmb_lookup(root, x, len); + if (!node || node->key[len] != 0) + return NULL; + return node; +} + /* Find the first occurence of a zero-terminated string in the tree . * It's the caller's reponsibility to use this function only on trees which * only contain zero-terminated strings. If none can be found, return NULL.