enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

Reimplement filereg as a hash instead of a list, providing a minor speedup. 

SVN revision: 31448
This commit is contained in:
Christopher Michael 2007-08-21 22:35:45 +00:00
parent b0d4ef2ea9
commit 03d9e3610a
1 changed files with 52 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
src/bin/e_filereg.c
View File

@ -8,108 +8,92 @@
* currently being used by E in core components should be registered * currently being used by E in core components should be registered
* here and will be protected as best as E can. :) * here and will be protected as best as E can. :)
*/ */
static Evas_Hash *_e_filereg = NULL;
/* Local subsystem globals */
static Evas_List *_e_filereg = NULL;
typedef struct _Filereg_Item Filereg_Item; typedef struct _Filereg_Item Filereg_Item;
struct _Filereg_Item struct _Filereg_Item
{ {
char * path; const char *path;
int ref_count; int ref_count;
}; };
static Evas_Bool _filereg_hash_cb_free(Evas_Hash *hash __UNUSED__,
const char *key __UNUSED__,
void *data, void *fdata __UNUSED__);
/* Externally accessible functions */ /* Externally accessible functions */
EAPI int EAPI int
e_filereg_init(void) e_filereg_init(void)
{ {
return 1; return 1;
} }
EAPI int EAPI int
e_filereg_shutdown(void) e_filereg_shutdown(void)
{ {
Evas_List * ll; evas_hash_foreach(_e_filereg, _filereg_hash_cb_free, NULL);
Filereg_Item * item; evas_hash_free(_e_filereg);
_e_filereg = NULL;
/* Delete all strings in the hash */
for (ll = _e_filereg; ll; ll = ll->next)
{
item = ll->data;
E_FREE(item->path);
E_FREE(item);
}
_e_filereg = evas_list_free(_e_filereg);
return 1; return 1;
} }
EAPI int EAPI int
e_filereg_register(const char * path) e_filereg_register(const char *path)
{ {
Evas_List * ll; Filereg_Item *fi = NULL;
Filereg_Item * item;
fi = evas_hash_find(_e_filereg, path);
for (ll = _e_filereg; ll; ll = ll->next) if (fi)
{ {
item = ll->data; fi->ref_count++;
if (!strcmp(item->path, path)) return 1;
{
/* File already registered, increment ref. count */
item->ref_count++;
return 1;
}
} }
fi = E_NEW(Filereg_Item, 1);
/* Doesn't exist so add to list. */ if (!fi) return 0;
item = E_NEW(Filereg_Item, 1); fi->path = evas_stringshare_add(path);
if (!item) return 0; fi->ref_count = 1;
_e_filereg = evas_hash_add(_e_filereg, path, fi);
item->path = strdup(path);
item->ref_count = 1;
_e_filereg = evas_list_append(_e_filereg, item);
return 1; return 1;
} }
EAPI void EAPI void
e_filereg_deregister(const char * path) e_filereg_deregister(const char *path)
{ {
Evas_List * ll; Filereg_Item *fi = NULL;
Filereg_Item * item;
fi = evas_hash_find(_e_filereg, path);
for (ll = _e_filereg; ll; ll = ll->next) if (fi)
{ {
item = ll->data; fi->ref_count--;
if (!strcmp(item->path, path)) if (fi->ref_count == 0)
{ {
item->ref_count--; _e_filereg = evas_hash_del(_e_filereg, path, fi);
if (item->ref_count == 0) if (fi->path) evas_stringshare_del(fi->path);
{ E_FREE(fi);
_e_filereg = evas_list_remove_list(_e_filereg, ll);
E_FREE(item->path);
E_FREE(item);
}
return;
} }
} }
} }
EAPI Evas_Bool EAPI Evas_Bool
e_filereg_file_protected(const char * path) e_filereg_file_protected(const char *path)
{ {
Evas_List * ll; Filereg_Item *fi = NULL;
Filereg_Item * item;
fi = evas_hash_find(_e_filereg, path);
for (ll = _e_filereg; ll; ll = ll->next) if (!fi) return 0;
{ else return 1;
item = ll->data;
if (!strcmp(item->path, path))
return 1;
}
return 0;
} }
/* Private Functions */
static Evas_Bool
_filereg_hash_cb_free(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
void *data, void *fdata __UNUSED__)
{
Filereg_Item *fi;
fi = data;
if (!fi) return 1;
if (fi->path) evas_stringshare_del(fi->path);
E_FREE(fi);
return 1;
}