Lil' refactor on CServe2's cache. More to come when the last book of 'A Song of Ice and Fire' is published.
SVN revision: 71356
This commit is contained in:
parent
4a7a18a35c
commit
02be0a3382
|
@ -172,9 +172,6 @@ void cserve2_cache_image_preload(Client *client, unsigned int client_image_id, u
|
||||||
void cserve2_cache_image_unload(Client *client, unsigned int client_image_id);
|
void cserve2_cache_image_unload(Client *client, unsigned int client_image_id);
|
||||||
|
|
||||||
void cserve2_cache_requests_process(void);
|
void cserve2_cache_requests_process(void);
|
||||||
|
void cserve2_cache_requests_response(Slave_Command type, void *msg, void *data);
|
||||||
void cserve2_cache_request_opened(Slave_Msg_Image_Opened *resp, void *data);
|
|
||||||
void cserve2_cache_request_loaded(Slave_Msg_Image_Loaded *resp, void *data);
|
|
||||||
void cserve2_cache_request_failed(void *data, Error_Type error);
|
|
||||||
|
|
||||||
#endif /* _EVAS_CSERVE2_H */
|
#endif /* _EVAS_CSERVE2_H */
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -87,20 +87,12 @@ _slave_dead_cb(Slave_Proc *s __UNUSED__, void *data)
|
||||||
|
|
||||||
slaves_working = eina_inlist_remove(slaves_working, EINA_INLIST_GET(sw));
|
slaves_working = eina_inlist_remove(slaves_working, EINA_INLIST_GET(sw));
|
||||||
if (!sw->done)
|
if (!sw->done)
|
||||||
cserve2_cache_request_failed(sw->data, CSERVE2_LOADER_DIED);
|
cserve2_cache_requests_response(ERROR, (Error_Type[]){ CSERVE2_LOADER_DIED }, sw->data);
|
||||||
if (sw->ret)
|
if (sw->ret)
|
||||||
eina_binbuf_free(sw->ret);
|
eina_binbuf_free(sw->ret);
|
||||||
free(sw);
|
free(sw);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
_slave_read_error(Slave_Worker *sw, void *msg)
|
|
||||||
{
|
|
||||||
Error_Type *error = msg;
|
|
||||||
|
|
||||||
cserve2_cache_request_failed(sw->data, *error);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_slave_read_cb(Slave_Proc *s __UNUSED__, Slave_Command cmd, void *msg, void *data)
|
_slave_read_cb(Slave_Proc *s __UNUSED__, Slave_Command cmd, void *msg, void *data)
|
||||||
{
|
{
|
||||||
|
@ -110,19 +102,15 @@ _slave_read_cb(Slave_Proc *s __UNUSED__, Slave_Command cmd, void *msg, void *dat
|
||||||
switch (cmd)
|
switch (cmd)
|
||||||
{
|
{
|
||||||
case IMAGE_OPEN:
|
case IMAGE_OPEN:
|
||||||
cserve2_cache_request_opened(msg, sw->data);
|
|
||||||
sw->done = EINA_TRUE;
|
|
||||||
break;
|
|
||||||
case IMAGE_LOAD:
|
case IMAGE_LOAD:
|
||||||
cserve2_cache_request_loaded(msg, sw->data);
|
|
||||||
sw->done = EINA_TRUE;
|
sw->done = EINA_TRUE;
|
||||||
break;
|
break;
|
||||||
case ERROR:
|
case ERROR:
|
||||||
_slave_read_error(sw, msg);
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
ERR("Unrecognized command received from slave: %d", cmd);
|
ERR("Unrecognized command received from slave: %d", cmd);
|
||||||
}
|
}
|
||||||
|
cserve2_cache_requests_response(cmd, msg, sw->data);
|
||||||
free(msg);
|
free(msg);
|
||||||
|
|
||||||
// slave finishes its work, put it back to idle list
|
// slave finishes its work, put it back to idle list
|
||||||
|
@ -175,7 +163,7 @@ cserve2_slave_cmd_dispatch(void *data, Slave_Command cmd, const void *msg, int s
|
||||||
if (!sw->slave)
|
if (!sw->slave)
|
||||||
{
|
{
|
||||||
ERR("Could not launch slave process");
|
ERR("Could not launch slave process");
|
||||||
cserve2_cache_request_failed(data, CSERVE2_LOADER_EXEC_ERR);
|
cserve2_cache_requests_response(ERROR, (Error_Type[]){ CSERVE2_LOADER_EXEC_ERR }, sw->data);
|
||||||
free(sw);
|
free(sw);
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue