evas/cserve2: Adding font requests manipulation.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@71600 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 49ec10b..32108d9 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -65,6 +65,7 @@ evas_cserve2_slaves.c \
 evas_cserve2_messages.c \
 evas_cserve2_shm.c \
 evas_cserve2_cache.c \
+evas_cserve2_requests.c \
 evas_cserve2_main_loop_linux.c
 
 evas_cserve2_LDADD = \

diff --git a/src/bin/evas_cserve2.h b/src/bin/evas_cserve2.h
index f7becaa..cdfe857 100644 (file)
--- a/src/bin/evas_cserve2.h
+++ b/src/bin/evas_cserve2.h
@@ -113,6 +113,25 @@ typedef struct _Slave_Msg_Image_Opened Slave_Msg_Image_Opened;
 typedef struct _Slave_Msg_Image_Load Slave_Msg_Image_Load;
 typedef struct _Slave_Msg_Image_Loaded Slave_Msg_Image_Loaded;
 
+typedef void *(*Font_Request_Msg_Create)(Client *c, void *data, int *size);
+typedef void (*Font_Request_Response)(Client *c, void *data, void *resp);
+typedef void (*Font_Request_Error)(Client *c, void *data, Error_Type error);
+
+struct _Font_Request_Funcs {
+   Font_Request_Msg_Create msg_create;
+   Font_Request_Response response;
+   Font_Request_Error error;
+};
+
+typedef struct _Font_Request Font_Request;
+typedef struct _Font_Request_Funcs Font_Request_Funcs;
+
+typedef enum {
+   CSERVE2_REQ_FONT_LOAD = 0,
+   CSERVE2_REQ_FONT_GLYPHS_LOAD,
+   CSERVE2_REQ_LAST
+} Font_Request_Type;
+
 typedef void (*Fd_Watch_Cb)(int fd, Fd_Flags flags, void *data);
 typedef void (*Timeout_Cb)(void); /* void* for compat? */
 typedef void (*Main_Loop_Child_Dead_Cb)(int pid, int status); /* void* for compat? */
@@ -179,6 +198,13 @@ void cserve2_cache_image_unload(Client *client, unsigned int client_image_id);
 
 int cserve2_cache_font_load(Client *client, const char *name, unsigned int namelen, unsigned int rend_flags, unsigned int hint, unsigned int size, unsigned int dpi, unsigned int rid);
 
+
+Font_Request *cserve2_request_add(Font_Request_Type type, unsigned int rid, Client *client, Font_Request_Funcs *funcs, void *data);
+void cserve2_request_cancel(Font_Request *req, Client *client, Error_Type err);
+void cserve2_request_cancel_all(Font_Request *req, Error_Type err);
+void cserve2_requests_init(void);
+void cserve2_requests_shutdown(void);
+
 void cserve2_cache_requests_process(void);
 void cserve2_cache_requests_response(Slave_Command type, void *msg, void *data);
 

diff --git a/src/bin/evas_cserve2_main.c b/src/bin/evas_cserve2_main.c
index 26ccc67..0d8f4df 100644 (file)
--- a/src/bin/evas_cserve2_main.c
+++ b/src/bin/evas_cserve2_main.c
@@ -481,6 +481,8 @@ main(int argc __UNUSED__, const char *argv[] __UNUSED__)
         goto error;
      }
 
+   cserve2_requests_init();
+
    cserve2_cache_init();
 
    _clients_setup();
@@ -493,6 +495,8 @@ main(int argc __UNUSED__, const char *argv[] __UNUSED__)
 
    cserve2_cache_shutdown();
 
+   cserve2_requests_shutdown();
+
    _slaves_restart();
    cserve2_slaves_shutdown();
 

diff --git a/src/bin/evas_cserve2_requests.c b/src/bin/evas_cserve2_requests.c
new file mode 100644 (file)
index 0000000..ddfa3f8
--- /dev/null
+++ b/src/bin/evas_cserve2_requests.c
@@ -0,0 +1,130 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "evas_cserve2.h"
+
+struct _Font_Request {
+   Font_Request_Type type;
+   void *data;
+   Eina_List *waiters;
+   Eina_Bool processing;
+   Font_Request_Funcs *funcs;
+};
+
+struct _Waiter {
+   unsigned int rid;
+   Client *client;
+};
+
+typedef struct _Waiter Waiter;
+
+static Eina_List **requests = NULL;
+
+static void
+_request_waiter_add(Font_Request *req, Client *client, unsigned int rid)
+{
+   Waiter *w = malloc(sizeof(*w));
+
+   DBG("Add waiter to request. Client: %d, rid: %d", client->id, rid);
+
+   w->client = client;
+   w->rid = rid;
+
+   req->waiters = eina_list_append(req->waiters, w);
+}
+
+Font_Request *
+cserve2_request_add(Font_Request_Type type, unsigned int rid, Client *client, Font_Request_Funcs *funcs, void *data)
+{
+   Font_Request *req, *r;
+   Eina_List *l;
+
+   req = NULL;
+   EINA_LIST_FOREACH(requests[type], l, r)
+     {
+        if (r->data != data)
+          continue;
+
+        req = r;
+        break;
+     }
+
+   if (!req)
+     {
+        DBG("Add request for rid: %d", rid);
+        req = malloc(sizeof(*req));
+        req->data = data;
+        req->waiters = NULL;
+        req->processing = EINA_FALSE;
+        requests[type] = eina_list_append(requests[type], req);
+     }
+
+   _request_waiter_add(req, client, rid);
+
+   return req;
+}
+
+void
+cserve2_request_cancel(Font_Request *req, Client *client, Error_Type err)
+{
+   Eina_List *l, *l_next;
+   Waiter *w;
+
+   EINA_LIST_FOREACH_SAFE(req->waiters, l, l_next, w)
+     {
+        if (w->client->id == client->id)
+          {
+             DBG("Removing answer from waiter client: %d, rid: %d",
+                 client->id, w->rid);
+             if (req->funcs && req->funcs->error)
+               req->funcs->error(client, req->data, err);
+             req->waiters = eina_list_remove_list(req->waiters, l);
+             free(w);
+          }
+     }
+
+   // TODO: When we have speculative preload, there may be no waiters,
+   // so we need a flag or something else to make things still load.
+   if (!req->waiters)
+     {
+        Eina_List **reqlist = &requests[req->type];
+        *reqlist = eina_list_remove(*reqlist, req);
+        free(req);
+     }
+
+}
+
+void
+cserve2_request_cancel_all(Font_Request *req, Error_Type err)
+{
+   Waiter *w;
+
+   DBG("Removing all answers.");
+
+   EINA_LIST_FREE(req->waiters, w)
+     {
+        DBG("Removing answer from waiter client: %d, rid: %d",
+            w->client->id, w->rid);
+        if (req->funcs && req->funcs->error)
+          req->funcs->error(w->client, req->data, err);
+        free(w);
+     }
+
+   requests[req->type] = eina_list_remove(requests[req->type], req);
+   free(req);
+}
+
+void
+cserve2_requests_init(void)
+{
+   DBG("Initializing requests.");
+   requests = calloc(CSERVE2_REQ_LAST, sizeof(Eina_List *));
+}
+
+void
+cserve2_requests_shutdown(void)
+{
+   DBG("Shutting down requests.");
+   free(requests);
+}