From 25a84c46729699668725da1214f7f8c829b1498e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Bollo?= Date: Mon, 27 Mar 2017 14:48:53 +0200 Subject: [PATCH] Speed up accesses to session's cookies MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Minor improvement to speed up refactored contextes. Change-Id: I45c1c4b0cecec52d10c2b7c5cd8e738fd75b25d6 Signed-off-by: José Bollo --- src/afb-session.c | 49 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/src/afb-session.c b/src/afb-session.c index 13b9505e..07092cea 100644 --- a/src/afb-session.c +++ b/src/afb-session.c @@ -31,6 +31,9 @@ #include "afb-session.h" #include "verbose.h" +#define COOKEYCOUNT 8 +#define COOKEYMASK (COOKEYCOUNT - 1) + #define NOW (time(NULL)) struct cookie @@ -50,7 +53,7 @@ struct afb_session time_t access; char uuid[37]; // long term authentication of remote client char token[37]; // short term authentication of remote client - struct cookie *cookies; + struct cookie *cookies[COOKEYCOUNT]; }; // Session UUID are store in a simple array [for 10 sessions this should be enough] @@ -63,6 +66,18 @@ static struct { char initok[37]; } sessions; +/** + * Get the index of the 'key' in the cookies array. + * @param key the key to scan + * @return the index of the list for key within cookies + */ +static int cookeyidx(const void *key) +{ + intptr_t x = (intptr_t)key; + unsigned r = (unsigned)((x >> 5) ^ (x >> 15)); + return r & COOKEYMASK; +} + /* generate a uuid */ static void new_uuid(char uuid[37]) { @@ -74,16 +89,20 @@ static void new_uuid(char uuid[37]) // Free context [XXXX Should be protected again memory abort XXXX] static void free_data (struct afb_session *session) { - struct cookie *cookie; + int idx; + struct cookie *cookie, *next; // free cookies - cookie = session->cookies; - while (cookie != NULL) { - session->cookies = cookie->next; - if (cookie->value != NULL && cookie->freecb != NULL) - cookie->freecb(cookie->value); - free(cookie); - cookie = session->cookies; + for (idx = 0 ; idx < COOKEYCOUNT ; idx++) { + cookie = session->cookies[idx]; + session->cookies[idx] = NULL; + while (cookie != NULL) { + next = cookie->next; + if (cookie->value != NULL && cookie->freecb != NULL) + cookie->freecb(cookie->value); + free(cookie); + cookie = next; + } } } @@ -379,8 +398,10 @@ void afb_session_set_LOA (struct afb_session *session, unsigned loa) void *afb_session_get_cookie(struct afb_session *session, const void *key) { struct cookie *cookie; + int idx; - cookie = session->cookies; + idx = cookeyidx(key); + cookie = session->cookies[idx]; while(cookie != NULL) { if (cookie->key == key) return cookie->value; @@ -392,9 +413,11 @@ void *afb_session_get_cookie(struct afb_session *session, const void *key) int afb_session_set_cookie(struct afb_session *session, const void *key, void *value, void (*freecb)(void*)) { struct cookie *cookie; + int idx; /* search for a replacement */ - cookie = session->cookies; + idx = cookeyidx(key); + cookie = session->cookies[idx]; while(cookie != NULL) { if (cookie->key == key) { if (cookie->value != NULL && cookie->value != value && cookie->freecb != NULL) @@ -416,8 +439,8 @@ int afb_session_set_cookie(struct afb_session *session, const void *key, void *v cookie->key = key; cookie->value = value; cookie->freecb = freecb; - cookie->next = session->cookies; - session->cookies = cookie; + cookie->next = session->cookies[idx]; + session->cookies[idx] = cookie; return 0; } -- 2.16.6