enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

evas/cserve2: Change request list to inlist. 

Inlist remove operations are faster if the element is known.



SVN revision: 71609
This commit is contained in:
Rafael Antognolli 2012-05-31 21:34:54 +00:00
parent 7455170dbb
commit 9ce49329f8
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
legacy/evas/src/bin/evas_cserve2_requests.c
View File

@ -61,6 +61,7 @@ static struct _Worker
struct _Font_Request struct _Font_Request
{ {
EINA_INLIST;
Font_Request_Type type; Font_Request_Type type;
void *data; void *data;
void *msg; void *msg;
@ -79,8 +80,8 @@ typedef struct _Waiter Waiter;
struct _Request_Queue struct _Request_Queue
{ {
Eina_List *waiting; Eina_Inlist *waiting;
Eina_List *processing; Eina_Inlist *processing;
}; };
typedef struct _Request_Queue Request_Queue; typedef struct _Request_Queue Request_Queue;
@ -105,11 +106,10 @@ Font_Request *
cserve2_request_add(Font_Request_Type type, unsigned int rid, Client *client, Font_Request_Funcs *funcs, void *data) cserve2_request_add(Font_Request_Type type, unsigned int rid, Client *client, Font_Request_Funcs *funcs, void *data)
{ {
Font_Request *req, *r; Font_Request *req, *r;
Eina_List *l;
req = NULL; req = NULL;
EINA_LIST_FOREACH(requests[type].processing, l, r) EINA_INLIST_FOREACH(requests[type].processing, r)
{ {
if (r->data == data) if (r->data == data)
continue; continue;
@ -120,7 +120,7 @@ cserve2_request_add(Font_Request_Type type, unsigned int rid, Client *client, Fo
if (!req) if (!req)
{ {
EINA_LIST_FOREACH(requests[type].waiting, l, r) EINA_INLIST_FOREACH(requests[type].waiting, r)
{ {
if (r->data != data) if (r->data != data)
continue; continue;
@ -137,8 +137,8 @@ cserve2_request_add(Font_Request_Type type, unsigned int rid, Client *client, Fo
req->data = data; req->data = data;
req->waiters = NULL; req->waiters = NULL;
req->processing = EINA_FALSE; req->processing = EINA_FALSE;
requests[type].waiting = eina_list_append(requests[type].waiting, requests[type].waiting = eina_inlist_append(requests[type].waiting,
req); EINA_INLIST_GET(req));
} }
_request_waiter_add(req, client, rid); _request_waiter_add(req, client, rid);
@ -169,8 +169,8 @@ cserve2_request_cancel(Font_Request *req, Client *client, Error_Type err)
// so we need a flag or something else to make things still load. // so we need a flag or something else to make things still load.
if (!req->waiters) if (!req->waiters)
{ {
Eina_List **reqlist = &requests[req->type].waiting; Eina_Inlist **reqlist = &requests[req->type].waiting;
*reqlist = eina_list_remove(*reqlist, req); *reqlist = eina_inlist_remove(*reqlist, EINA_INLIST_GET(req));
// TODO: If the request is being processed, it can't be deleted. Must // TODO: If the request is being processed, it can't be deleted. Must
// be marked as delete_me instead. // be marked as delete_me instead.
req->funcs->msg_free(req->msg); req->funcs->msg_free(req->msg);
@ -195,8 +195,8 @@ cserve2_request_cancel_all(Font_Request *req, Error_Type err)
free(w); free(w);
} }
requests[req->type].waiting = eina_list_remove(requests[req->type].waiting, requests[req->type].waiting = eina_inlist_remove(
req); requests[req->type].waiting, EINA_INLIST_GET(req));
req->funcs->msg_free(req->msg); req->funcs->msg_free(req->msg);
free(req); free(req);
} }
@ -227,8 +227,8 @@ _cserve2_request_failed(Font_Request *req, Error_Type type)
} }
req->funcs->msg_free(req->msg); req->funcs->msg_free(req->msg);
requests[req->type].processing = eina_list_remove( requests[req->type].processing = eina_inlist_remove(
requests[req->type].processing, req); requests[req->type].processing, EINA_INLIST_GET(req));
free(req); free(req);
} }
@ -256,8 +256,8 @@ _slave_read_cb(Slave *s __UNUSED__, Slave_Command cmd, void *msg, void *data)
// FIXME: We shouldn't free this message directly, it must be freed by a // FIXME: We shouldn't free this message directly, it must be freed by a
// callback. // callback.
free(msg); free(msg);
requests[req->type].processing = eina_list_remove( requests[req->type].processing = eina_inlist_remove(
requests[req->type].processing, req); requests[req->type].processing, EINA_INLIST_GET(req));
free(req); free(req);
sw->data = NULL; sw->data = NULL;
@ -391,12 +391,13 @@ cserve2_requests_process(void)
(eina_list_count(*working) < max_workers)) (eina_list_count(*working) < max_workers))
{ {
Slave_Worker *sw; Slave_Worker *sw;
Font_Request *req = eina_list_data_get(requests[rtype].waiting); Font_Request *req = EINA_INLIST_CONTAINER_GET(
requests[rtype].waiting, Font_Request);
requests[rtype].waiting = eina_list_remove_list( requests[rtype].waiting = eina_inlist_remove(
requests[rtype].waiting, requests[rtype].waiting); requests[rtype].waiting, requests[rtype].waiting);
requests[rtype].processing = eina_list_append( requests[rtype].processing = eina_inlist_append(
requests[rtype].processing, req); requests[rtype].processing, EINA_INLIST_GET(req));
if (!(*idle)) if (!(*idle))
sw = _slave_for_request_create(type); sw = _slave_for_request_create(type);