summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/bin/evas/evas_cserve2_cache.c8
-rw-r--r--src/lib/evas/cserve2/evas_cs2.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/src/bin/evas/evas_cserve2_cache.c b/src/bin/evas/evas_cserve2_cache.c
index 9a9b82e0aa..a1cda8c78c 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,
1974 Shared_Mempool *mempool = msg->mempool; 1974 Shared_Mempool *mempool = msg->mempool;
1975 unsigned int j; 1975 unsigned int j;
1976 string_t shm_id = 0; 1976 string_t shm_id = 0;
1977 Font_Data *fd;
1977 1978
1978 if (!msg->nglyphs) 1979 if (!msg->nglyphs)
1979 return _glyphs_loaded_msg_create(req, size); 1980 return _glyphs_loaded_msg_create(req, size);
1980 1981
1982 fd = _font_data_find(fe->font_data_id);
1983
1981 DBG("Font memory usage [begin]: %d / %d", font_mem_usage, max_font_usage); 1984 DBG("Font memory usage [begin]: %d / %d", font_mem_usage, max_font_usage);
1982 1985
1983 if (!mempool) 1986 if (!mempool)
@@ -1995,6 +1998,8 @@ _glyphs_load_request_response(Glyphs_Request *req,
1995 _generation_id, 1998 _generation_id,
1996 sizeof(Glyph_Data), 0); 1999 sizeof(Glyph_Data), 0);
1997 font_mem_usage += cserve2_shared_array_map_size_get(fe->glyph_datas); 2000 font_mem_usage += cserve2_shared_array_map_size_get(fe->glyph_datas);
2001 fd->glyph_index_shm = cserve2_shared_string_add(
2002 cserve2_shared_array_name_get(fe->glyph_datas));
1998 } 2003 }
1999 2004
2000 shm_id = cserve2_shared_string_add(cserve2_shared_mempool_name_get(mempool)); 2005 shm_id = cserve2_shared_string_add(cserve2_shared_mempool_name_get(mempool));
@@ -2058,6 +2063,9 @@ _glyphs_load_request_response(Glyphs_Request *req,
2058#endif 2063#endif
2059 2064
2060 fe->mempool = mempool; 2065 fe->mempool = mempool;
2066 if (!fd->mempool_shm)
2067 fd->mempool_shm = cserve2_shared_string_add(
2068 cserve2_shared_mempool_name_get(mempool));
2061 2069
2062 DBG("Font memory usage [end]: %d / %d", font_mem_usage, max_font_usage); 2070 DBG("Font memory usage [end]: %d / %d", font_mem_usage, max_font_usage);
2063 _font_lru_flush(); 2071 _font_lru_flush();
diff --git a/src/lib/evas/cserve2/evas_cs2.h b/src/lib/evas/cserve2/evas_cs2.h
index 2d3ad05b12..87633f00ec 100644
--- a/src/lib/evas/cserve2/evas_cs2.h
+++ b/src/lib/evas/cserve2/evas_cs2.h
@@ -351,6 +351,7 @@ struct _Font_Data {
351 string_t name; 351 string_t name;
352 string_t file; 352 string_t file;
353 string_t glyph_index_shm; 353 string_t glyph_index_shm;
354 string_t mempool_shm;
354 uint32_t rend_flags; 355 uint32_t rend_flags;
355 uint32_t size; 356 uint32_t size;
356 uint32_t dpi; 357 uint32_t dpi;