From: Jean-Philippe Andre <jp.andre@samsung.com>
Date: Thu, 22 Aug 2013 05:55:07 +0000 (+0900)
Subject: evas/cserve2: Add glyph shm names to Font_Data
X-Git-Tag: submit/devel/efl/20131029.075644~17^2~46
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc7b337fc065dc922a039897e22f570a26fbf4be;p=platform%2Fupstream%2Fefl.git

evas/cserve2: Add glyph shm names to Font_Data
---

diff --git a/src/bin/evas/evas_cserve2_cache.c b/src/bin/evas/evas_cserve2_cache.c
index 9a9b82e..a1cda8c 100644
--- a/src/bin/evas/evas_cserve2_cache.c
+++ b/src/bin/evas/evas_cserve2_cache.c
@@ -1974,10 +1974,13 @@ _glyphs_load_request_response(Glyphs_Request *req,
    Shared_Mempool *mempool = msg->mempool;
    unsigned int j;
    string_t shm_id = 0;
+   Font_Data *fd;
 
    if (!msg->nglyphs)
      return _glyphs_loaded_msg_create(req, size);
 
+   fd = _font_data_find(fe->font_data_id);
+
    DBG("Font memory usage [begin]: %d / %d", font_mem_usage, max_font_usage);
 
    if (!mempool)
@@ -1995,6 +1998,8 @@ _glyphs_load_request_response(Glyphs_Request *req,
                                                    _generation_id,
                                                    sizeof(Glyph_Data), 0);
         font_mem_usage += cserve2_shared_array_map_size_get(fe->glyph_datas);
+        fd->glyph_index_shm = cserve2_shared_string_add(
+                 cserve2_shared_array_name_get(fe->glyph_datas));
      }
 
    shm_id = cserve2_shared_string_add(cserve2_shared_mempool_name_get(mempool));
@@ -2058,6 +2063,9 @@ _glyphs_load_request_response(Glyphs_Request *req,
 #endif
 
    fe->mempool = mempool;
+   if (!fd->mempool_shm)
+     fd->mempool_shm = cserve2_shared_string_add(
+              cserve2_shared_mempool_name_get(mempool));
 
    DBG("Font memory usage [end]: %d / %d", font_mem_usage, max_font_usage);
    _font_lru_flush();
diff --git a/src/lib/evas/cserve2/evas_cs2.h b/src/lib/evas/cserve2/evas_cs2.h
index 2d3ad05..87633f0 100644
--- a/src/lib/evas/cserve2/evas_cs2.h
+++ b/src/lib/evas/cserve2/evas_cs2.h
@@ -351,6 +351,7 @@ struct _Font_Data {
    string_t name;
    string_t file;
    string_t glyph_index_shm;
+   string_t mempool_shm;
    uint32_t rend_flags;
    uint32_t size;
    uint32_t dpi;