mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Optimise cookie tolder and entry node search by comparing lengths before strings.

This commit is contained in:
Michael Drake 2013-07-25 22:31:27 +01:00
parent 3f0e70706d
commit 44fa2a9b91
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
desktop/cookie_manager.c
View File

@ -68,6 +68,7 @@ struct cookie_manager_entry {
struct treeview_walk_ctx { struct treeview_walk_ctx {
const char *title; const char *title;
size_t title_len;
struct cookie_manager_folder *folder; struct cookie_manager_folder *folder;
struct cookie_manager_entry *entry; struct cookie_manager_entry *entry;
}; };
@ -80,7 +81,9 @@ static nserror cookie_manager_walk_cb(void *ctx, void *node_data,
if (type == TREE_NODE_ENTRY) { if (type == TREE_NODE_ENTRY) {
struct cookie_manager_entry *entry = node_data; struct cookie_manager_entry *entry = node_data;
if (strcmp(tw->title, entry->data[CM_NAME].value) == 0) { if (entry->data[CM_NAME].value_len == tw->title_len &&
strcmp(tw->title,
entry->data[CM_NAME].value) == 0) {
/* Found what we're looking for */ /* Found what we're looking for */
tw->entry = entry; tw->entry = entry;
*abort = true; *abort = true;
@ -89,7 +92,8 @@ static nserror cookie_manager_walk_cb(void *ctx, void *node_data,
} else if (type == TREE_NODE_FOLDER) { } else if (type == TREE_NODE_FOLDER) {
struct cookie_manager_folder *folder = node_data; struct cookie_manager_folder *folder = node_data;
if (strcmp(tw->title, folder->data.value) == 0) { if (folder->data.value_len == tw->title_len &&
strcmp(tw->title, folder->data.value) == 0) {
/* Found what we're looking for */ /* Found what we're looking for */
tw->folder = folder; tw->folder = folder;
*abort = true; *abort = true;
@ -103,15 +107,18 @@ static nserror cookie_manager_walk_cb(void *ctx, void *node_data,
* *
* \param root Search root node, or NULL to search from tree's root * \param root Search root node, or NULL to search from tree's root
* \param title ID of the node to look for * \param title ID of the node to look for
* \param title_len Byte length of title string
* \param found Updated to the matching node's cookie maanger entry * \param found Updated to the matching node's cookie maanger entry
* \return NSERROR_OK on success, appropriate error otherwise * \return NSERROR_OK on success, appropriate error otherwise
*/ */
static nserror cookie_manager_find_entry(treeview_node *root, static nserror cookie_manager_find_entry(treeview_node *root,
const char *title, struct cookie_manager_entry **found) const char *title, size_t title_len,
struct cookie_manager_entry **found)
{ {
nserror err; nserror err;
struct treeview_walk_ctx tw = { struct treeview_walk_ctx tw = {
.title = title, .title = title,
.title_len = title_len,
.folder = NULL, .folder = NULL,
.entry = NULL .entry = NULL
}; };
@ -130,15 +137,18 @@ static nserror cookie_manager_find_entry(treeview_node *root,
* *
* \param root Search root node, or NULL to search from tree's root * \param root Search root node, or NULL to search from tree's root
* \param title ID of the node to look for * \param title ID of the node to look for
* \param title_len Byte length of title string
* \param found Updated to the matching node's cookie maanger folder * \param found Updated to the matching node's cookie maanger folder
* \return NSERROR_OK on success, appropriate error otherwise * \return NSERROR_OK on success, appropriate error otherwise
*/ */
static nserror cookie_manager_find_folder(treeview_node *root, static nserror cookie_manager_find_folder(treeview_node *root,
const char *title, struct cookie_manager_folder **found) const char *title, size_t title_len,
struct cookie_manager_folder **found)
{ {
nserror err; nserror err;
struct treeview_walk_ctx tw = { struct treeview_walk_ctx tw = {
.title = title, .title = title,
.title_len = title_len,
.folder = NULL, .folder = NULL,
.entry = NULL .entry = NULL
}; };
@ -408,7 +418,8 @@ bool cookie_manager_add(const struct cookie_data *data)
if (cm_ctx.tree == NULL) if (cm_ctx.tree == NULL)
return true; return true;
err = cookie_manager_find_folder(NULL, data->domain, &parent); err = cookie_manager_find_folder(NULL, data->domain,
strlen(data->domain), &parent);
if (err != NSERROR_OK) { if (err != NSERROR_OK) {
return false; return false;
} }
@ -421,7 +432,8 @@ bool cookie_manager_add(const struct cookie_data *data)
} }
/* Create cookie node */ /* Create cookie node */
err = cookie_manager_find_entry(parent->folder, data->name, &cookie); err = cookie_manager_find_entry(parent->folder, data->name,
strlen(data->name), &cookie);
if (err != NSERROR_OK) if (err != NSERROR_OK)
return false; return false;
@ -450,13 +462,15 @@ void cookie_manager_remove(const struct cookie_data *data)
if (cm_ctx.tree == NULL) if (cm_ctx.tree == NULL)
return; return;
err = cookie_manager_find_folder(NULL, data->domain, &parent); err = cookie_manager_find_folder(NULL, data->domain,
strlen(data->domain), &parent);
if (err != NSERROR_OK || parent == NULL) { if (err != NSERROR_OK || parent == NULL) {
/* Nothing to delete */ /* Nothing to delete */
return; return;
} }
err = cookie_manager_find_entry(parent->folder, data->name, &cookie); err = cookie_manager_find_entry(parent->folder, data->name,
strlen(data->name), &cookie);
if (err != NSERROR_OK || cookie == NULL) { if (err != NSERROR_OK || cookie == NULL) {
/* Nothing to delete */ /* Nothing to delete */
return; return;