Menu
▾
▴
Re: [E-devel] E SVN: cedric IN trunk/evas: . src/bin src/lib src/lib/canvas src/lib/cserve src/lib/engines/common src/lib/engines/common_16 src/lib/include src/modules/engines/cairo_x11 src/modules/engines/direct3d src/modules/engines/directfb src/modules/engines/fb src/modules/engines/gl_glew src/modules/engines/gl_x11 src/modules/engines/quartz src/modules/engines/software_16 src/modules/engines/software_16_sdl src/modules/engines/software_16_wince src/modules/engines/software_ddraw src/modules/engines/software_gdi src/modules/engines/software_sdl src/modules/engines/software_x11 src/modules/loaders/tiff src/modules/loaders/xpm
I'm not able to compile evas with -fvisibility=hidden:
evas_cserve_main.o: In function `main':
evas_cserve_main.c:(.text+0x4b7a): undefined reference to
`_evas_log_dom_global'
On Mon, 2009-09-21 at 09:08 -0700, Enlightenment SVN wrote:
> Log:
> * evas: Use eina_log.
>
> Patch from Matthieu.
>
> Author: cedric
> Date: 2009-09-21 09:08:51 -0700 (Mon, 21 Sep 2009)
> New Revision: 42598
>
> Modified:
> trunk/evas/AUTHORS trunk/evas/src/bin/evas_cserve_main.c trunk/evas/src/bin/evas_cserve_tool.c trunk/evas/src/lib/canvas/evas_events.c trunk/evas/src/lib/canvas/evas_font_dir.c trunk/evas/src/lib/canvas/evas_main.c trunk/evas/src/lib/canvas/evas_object_box.c trunk/evas/src/lib/canvas/evas_object_image.c trunk/evas/src/lib/canvas/evas_object_smart.c trunk/evas/src/lib/canvas/evas_object_table.c trunk/evas/src/lib/canvas/evas_render.c trunk/evas/src/lib/canvas/evas_smart.c trunk/evas/src/lib/canvas/evas_stack.c trunk/evas/src/lib/cserve/evas_cs_client.c trunk/evas/src/lib/cserve/evas_cs_server.c trunk/evas/src/lib/engines/common/evas_convert_main.c trunk/evas/src/lib/engines/common/evas_convert_rgb_16.c trunk/evas/src/lib/engines/common/evas_cpu.c trunk/evas/src/lib/engines/common/evas_font_draw.c trunk/evas/src/lib/engines/common/evas_font_main.c trunk/evas/src/lib/engines/common/evas_font_query.c trunk/evas/src/lib/engines/common/evas_image_main.c trunk/evas/src/lib/engines/common/evas_image_scalecache.c trunk/evas/src/lib/engines/common/evas_op_add_main_.c trunk/evas/src/lib/engines/common/evas_pipe.c trunk/evas/src/lib/engines/common/evas_tiler.c trunk/evas/src/lib/engines/common_16/evas_soft16_image_scaled_sampled.c trunk/evas/src/lib/engines/common_16/evas_soft16_image_unscaled.c trunk/evas/src/lib/engines/common_16/evas_soft16_main.c trunk/evas/src/lib/engines/common_16/evas_soft16_rectangle.c trunk/evas/src/lib/include/evas_common.h trunk/evas/src/lib/main.c trunk/evas/src/modules/engines/cairo_x11/evas_engine.c trunk/evas/src/modules/engines/direct3d/evas_engine.h trunk/evas/src/modules/engines/directfb/evas_engine.c trunk/evas/src/modules/engines/fb/evas_fb_main.c trunk/evas/src/modules/engines/fb/evas_outbuf.c trunk/evas/src/modules/engines/gl_glew/evas_glew_main.c trunk/evas/src/modules/engines/gl_x11/evas_engine.c trunk/evas/src/modules/engines/quartz/evas_engine.c trunk/evas/src/modules/engines/software_16/evas_engine.c trunk/evas/src/modules/engines/software_16_sdl/evas_engine.c trunk/evas/src/modules/engines/software_16_wince/evas_wince_ddraw_buffer.cpp trunk/evas/src/modules/engines/software_16_wince/evas_wince_fb_buffer.c trunk/evas/src/modules/engines/software_16_wince/evas_wince_gapi_buffer.c trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c trunk/evas/src/modules/engines/software_ddraw/evas_outbuf.c trunk/evas/src/modules/engines/software_gdi/evas_gdi_main.c trunk/evas/src/modules/engines/software_gdi/evas_outbuf.c trunk/evas/src/modules/engines/software_sdl/evas_engine.c trunk/evas/src/modules/engines/software_x11/evas_xcb_outbuf.c trunk/evas/src/modules/loaders/tiff/evas_image_load_tiff.c trunk/evas/src/modules/loaders/xpm/evas_image_load_xpm.c
>
> Modified: trunk/evas/AUTHORS
> ===================================================================
> --- trunk/evas/AUTHORS 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/AUTHORS 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -15,3 +15,4 @@
> Vincent Torri <vtorri at univ-evry dot fr>
> Tim Horton <hor...@gm...>
> Tom Hacohen <to...@st...>
> +Mathieu Taillefumier <mat...@fr...>
>
> Modified: trunk/evas/src/bin/evas_cserve_main.c
> ===================================================================
> --- trunk/evas/src/bin/evas_cserve_main.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/bin/evas_cserve_main.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -17,7 +17,18 @@
> #include "evas_cs.h"
>
> #define D(...) EINA_LOG_DBG(__VA_ARGS__)
> -
> +#ifdef ERR
> +#undef ERR
> +#endif
> +#define ERR(...) EINA_LOG_DOM_ERR(_evas_cserve_bin_log_dom, __VA_ARGS__)
> +#ifdef DBG
> +#undef DBG
> +#endif
> +#define DBG(...) EINA_LOG_DOM_DBG(_evas_cserve_bin_log_dom, __VA_ARGS__)
> +#ifdef CSERVE_BIN_DEFAULT_COLOR
> +#undef CSERVE_BIN_DEFAULT_COLOR
> +#endif
> +#define CSERVE_BIN_DEFAULT_COLOR "\033[36m"
> // fixme:'s
> //
> // preload - make it work (both)
> @@ -102,7 +113,7 @@
> static int cache_item_timeout = -1;
> static int cache_item_timeout_check = -1;
> static Mem *stat_mem = NULL;
> -
> +static int _evas_cserve_bin_log_dom = -1;
> static int stat_mem_num = 0;
> static Eina_List *stat_mems = NULL;
>
> @@ -468,16 +479,16 @@
> int err = 0;
> double t;
>
> - D("... stat %s", file);
> + DBG("... stat %s", file);
> ret = stat(file, &st);
> if (ret < 0) return NULL;
> - D("... load header");
> + DBG("... load header");
> t = get_time();
> ie = evas_cache_image_request(cache, file, key, load_opts, &err);
> t = get_time() - t;
> - D("... header done");
> + DBG("... header done");
> if (!ie) return NULL;
> - D("... ie->cache = %p", ie->cache);
> + DBG("... ie->cache = %p", ie->cache);
> img = (Img *)ie;
> img->stats.load1 = t;
> img->key = eina_stringshare_add(bufkey);
> @@ -528,10 +539,10 @@
> {
> if (img->incache > 0)
> {
> - printf("EEEEEEEEEEEEEEEEK!\n");
> - printf("EEEEEEEEEEEEEEEEK! %p '%s' still in cache\n",
> + ERR("EEEEEEEEEEEEEEEEK!");
> + ERR("EEEEEEEEEEEEEEEEK! %p '%s' still in cache",
> img, img->file.file);
> - printf("EEEEEEEEEEEEEEEEK!\n");
> + ERR("EEEEEEEEEEEEEEEEK!");
> return;
> }
> stats_lifetime_update(img);
> @@ -555,7 +566,7 @@
> static void
> cache_clean(void)
> {
> - D("... cache clean!!! do");
> + DBG("... cache clean!!! do");
> LKL(cache_lock);
> while ((cache_usage > ((cache_max_usage + cache_max_adjust) * 1024)) &&
> (cache_images))
> @@ -563,13 +574,13 @@
> Img *img;
> Eina_List *l;
>
> - D("... clean loop %i > %i", cache_usage, (cache_max_usage + cache_max_adjust) * 1024);
> + DBG("... clean loop %i > %i", cache_usage, (cache_max_usage + cache_max_adjust) * 1024);
> l = eina_list_last(cache_images); // THREAD: called from thread. happens to be safe as it uses no unlocked shared resources
> if (!l) break;
> img = l->data;
> if (!img) break;
> LKL(img->lock);
> - D("... REMOVE %p '%s'", img, img->file.file);
> + DBG("... REMOVE %p '%s'", img, img->file.file);
> #ifdef BUILD_PTHREAD
> img->killme = 1;
> img->useless = 1;
> @@ -580,7 +591,7 @@
> cache_images = eina_list_remove_list(cache_images, l); // FIXME: called from thread
> img->incache--;
> cache_usage -= img->usage;
> - D("... IMG FREE %p", img);
> + DBG("... IMG FREE %p", img);
> img_free(img);
> #endif
> }
> @@ -636,10 +647,10 @@
>
> if (cache_max_adjust < -cache_max_usage)
> cache_max_adjust = -cache_max_usage;
> - D("... cache_max_adjust = %i", cache_max_adjust);
> + DBG("... cache_max_adjust = %i", cache_max_adjust);
> if (pval != cache_max_adjust)
> {
> - D("... cache clean");
> + DBG("... cache clean");
> // FIXME lock problem
> cache_clean();
> }
> @@ -651,23 +662,23 @@
> eina_hash_del(active_images, img->key, img);
> if (img->dead)
> {
> - D("... img %p '%s' dead", img , img->file.file);
> + DBG("... img %p '%s' dead", img , img->file.file);
> img_free(img);
> return;
> }
> if ((cache_usage + img->usage) > ((cache_max_usage + cache_max_adjust) * 1024))
> {
> - D("... img %p '%s' too big for cache", img , img->file.file);
> + DBG("... img %p '%s' too big for cache", img , img->file.file);
> img_free(img);
> return;
> }
> - D("... img %p '%s' cached += %i", img , img->file.file, img->usage);
> + DBG("... img %p '%s' cached += %i", img , img->file.file, img->usage);
> if (img->incache > 0)
> {
> - printf("EEEEEEEEEEEEEEEEK!\n");
> - printf("EEEEEEEEEEEEEEEEK! %p '%s' already in cache\n",
> + ERR("EEEEEEEEEEEEEEEEK!");
> + ERR("EEEEEEEEEEEEEEEEK! %p '%s' already in cache",
> img, img->file.file);
> - printf("EEEEEEEEEEEEEEEEK!\n");
> + ERR("EEEEEEEEEEEEEEEEK!");
> return;
> }
> LKL(cache_lock);
> @@ -729,8 +740,8 @@
> Eina_List *l, *l_next;
>
> if (!file) return NULL;
> - D("... img_load '%s'", file);
> - if (key) D("... ... key '%s'", key);
> + DBG("... img_load '%s'", file);
> + if (key) DBG("... ... key '%s'", key);
> if (key)
> snprintf(buf, sizeof(buf), "%s///::/%s/\001/%i/%1.8f/%ix%i",
> file, key,
> @@ -743,16 +754,16 @@
> load_opts->scale_down_by,
> load_opts->dpi,
> load_opts->w, load_opts->h);
> - D("... find '%s'", buf);
> + DBG("... find '%s'", buf);
> img = eina_hash_find(active_images, buf);
> if ((img) && (img_ok(img)))
> {
> - D("... found!");
> + DBG("... found!");
> img->stats.load1saved++;
> img->ref++;
> - D("... sats update");
> + DBG("... stats update");
> stats_update();
> - D("... return %p", img);
> + DBG("... return %p", img);
> return img;
> }
>
> @@ -765,7 +776,7 @@
> LKL(img->lock);
> if (img_ok(img))
> {
> - D("... found cached");
> + DBG("... found cached");
> cache_images = eina_list_remove_list(cache_images, l);
> img->incache--;
> cache_usage -= img->usage;
> @@ -773,9 +784,9 @@
> img->stats.load1saved++;
> img->ref++;
> eina_hash_direct_add(active_images, img->key, img);
> - D("... sats update");
> + DBG("... sats update");
> stats_update();
> - D("... return %p", img);
> + DBG("... return %p", img);
> LKU(img->lock);
> LKU(cache_lock);
> return img;
> @@ -784,7 +795,7 @@
> }
> }
> LKU(cache_lock);
> - D("... ned new img");
> + DBG("... ned new img");
> return img_new(file, key, load_opts, buf);
> }
>
> @@ -793,17 +804,17 @@
> {
> if (img->ref == 0)
> {
> - printf("EEEEEEEEEEEEEEEEK!\n");
> - printf("EEEEEEEEEEEEEEEEK! %p '%s' already @ ref 0\n",
> + ERR("EEEEEEEEEEEEEEEEK!");
> + ERR("EEEEEEEEEEEEEEEEK! %p '%s' already @ ref 0",
> img, img->file.file);
> - printf("EEEEEEEEEEEEEEEEK!\n");
> + ERR("EEEEEEEEEEEEEEEEK!");
> return;
> }
> img->ref--;
> - D("... img ref-- = %i", img->ref);
> + DBG("... img ref-- = %i", img->ref);
> if (img->ref == 0)
> {
> - D("... img cache %p '%s'", img, img->file.file);
> + DBG("... img cache %p '%s'", img, img->file.file);
> img_cache(img);
> }
> }
> @@ -811,12 +822,12 @@
> static void
> img_unloaddata(Img *img)
> {
> - D("img_unloaddata() %p '%s'", img, img->file.file);
> + DBG("img_unloaddata() %p '%s'", img, img->file.file);
> if ((img->dref <= 0) && (img->useless) && (img->mem))
> {
> Image_Entry *ie = (Image_Entry *)img;
>
> - D("... really do forced unload");
> + DBG("... really do forced unload");
> if (!img->active) cache_usage -= img->usage;
> img->usage -=
> (4096 * (((img->image.w * img->image.h * sizeof(DATA32)) + 4095) / 4096)) +
> @@ -827,7 +838,7 @@
> img->mem = NULL;
> img->image.data = NULL;
> img->dref = 0;
> - D("... done");
> + DBG("... done");
>
> ie->flags.loaded = 0;
> ie->allocated.w = 0;
> @@ -838,7 +849,7 @@
> static void
> img_useless(Img *img)
> {
> - D("img_useless() %p", img);
> + DBG("img_useless() %p", img);
> img->useless = 1;
> if (img->dref <= 0) img_unloaddata(img);
> }
> @@ -846,7 +857,7 @@
> static void
> img_forcedunload(Img *img)
> {
> - D("img_forcedunload() %p", img);
> + DBG("img_forcedunload() %p", img);
> img->dead = 1;
> img_unload(img);
> }
> @@ -854,7 +865,7 @@
> static void
> img_preload(Img *img)
> {
> - D("img_preload() %p", img);
> + DBG("img_preload() %p", img);
> }
>
> static void
> @@ -864,12 +875,12 @@
> Img *img;
>
> images = data;
> - D("... CLIENT DEL %i", c->pid);
> + DBG("... CLIENT DEL %i", c->pid);
> EINA_LIST_FREE(images, img)
> {
> - D("... unloaddata img %p", img);
> + DBG("... unloaddata img %p", img);
> img_unloaddata(img);
> - D("... unload img %p", img);
> + DBG("... unload img %p", img);
> img_unload(img);
> }
> }
> @@ -903,7 +914,7 @@
> msg.mem.id = img->mem->id;
> msg.mem.offset = img->mem->offset;
> msg.mem.size = img->mem->size;
> - D("... reply");
> + DBG("... reply");
> evas_cserve_client_send(c, OP_LOADDATA, sizeof(msg), (unsigned char *)(&msg));
> LKU(c->lock);
> return NULL;
> @@ -919,7 +930,7 @@
> else
> msg.mem.id = msg.mem.offset = msg.mem.size = 0;
> LKU(img->lock);
> - D("... reply");
> + DBG("... reply");
> evas_cserve_client_send(c, OP_LOADDATA, sizeof(msg), (unsigned char *)(&msg));
> LKU(c->lock);
> return NULL;
> @@ -930,7 +941,7 @@
> message(void *fdata, Server *s, Client *c, int opcode, int size, unsigned char *data)
> {
> t_now = time(NULL);
> - D("message @ %i...", (int)t_now);
> + DBG("message @ %i...", (int)t_now);
> switch (opcode)
> {
> case OP_INIT:
> @@ -950,8 +961,8 @@
> }
> c->func = client_del;
> c->data = NULL;
> - D("OP_INIT %i", c->pid);
> - D("... reply");
> + DBG("OP_INIT %i", c->pid);
> + DBG("... reply");
> evas_cserve_client_send(c, OP_INIT, sizeof(msg), (unsigned char *)(&msg));
> }
> break;
> @@ -963,7 +974,7 @@
> RGBA_Image_Loadopts lopt = {0, 0.0, 0, 0, 0, 0, 0, 0};
> char *file = NULL, *key = NULL;
>
> - D("OP_LOAD %i", c->pid);
> + DBG("OP_LOAD %i", c->pid);
> rep = (Op_Load *)data;
> file = data + sizeof(Op_Load);
> key = file + strlen(file) + 1;
> @@ -976,17 +987,17 @@
> lopt.region.y = rep->lopt.region.y;
> lopt.region.w = rep->lopt.region.w;
> lopt.region.h = rep->lopt.region.h;
> - D("... img_load '%s'", file);
> - if (key) D("'%s'", key);
> - else D(" '%s'", NULL);
> - D(" lopt { %i %1.1f %i %i { %i %i %i %i}}",
> + DBG("... img_load '%s'", file);
> + if (key) DBG("'%s'", key);
> + else DBG(" '%s'", NULL);
> + DBG(" lopt { %i %1.1f %i %i { %i %i %i %i}}",
> lopt.scale_down_by, lopt.dpi, lopt.w, lopt.h,
> lopt.region.x, lopt.region.y, lopt.region.w, lopt.region.h);
> img = img_load(file, key, &lopt);
> - D("... img_load = %p", img);
> + DBG("... img_load = %p", img);
> if (img)
> {
> - D("... add image to client list");
> + DBG("... add image to client list");
> if (c->client_main)
> c->client_main->data = eina_list_append(c->client_main->data, img);
> else
> @@ -1010,7 +1021,7 @@
> msg.image.h = img->image.h;
> msg.image.alpha = img->image.alpha;
> }
> - D("... reply");
> + DBG("... reply");
> evas_cserve_client_send(c, OP_LOAD, sizeof(msg), (unsigned char *)(&msg));
> }
> break;
> @@ -1019,19 +1030,19 @@
> Op_Unload *rep;
> Img *img;
>
> - D("OP_UNLOAD %i", c->pid);
> + DBG("OP_UNLOAD %i", c->pid);
> rep = (Op_Unload *)data;
> img = rep->handle;
> if ((img) && (rep->server_id == server_id))
> {
> Eina_Bool doflush = 0;
>
> - D("... remove %p from list", img);
> + DBG("... remove %p from list", img);
> if (c->client_main)
> c->client_main->data = eina_list_remove(c->client_main->data, img);
> else
> c->data = eina_list_remove(c->data, img);
> - D("... unload %p", img);
> + DBG("... unload %p", img);
> LKL(img->lock);
> img->ref++;
> img_unload(img);
> @@ -1050,14 +1061,14 @@
> Op_Loaddata_Reply msg;
> Img *img;
>
> - D("OP_LOADDATA %i", c->pid);
> + DBG("OP_LOADDATA %i", c->pid);
> rep = (Op_Loaddata *)data;
> img = rep->handle;
> if ((img) && (rep->server_id == server_id))
> {
> if (img->mem)
> {
> - D("... load saved - cached %p", img);
> + DBG("... load saved - cached %p", img);
> img->stats.load2saved++;
> stats_update();
> memset(&msg, 0, sizeof(msg));
> @@ -1069,7 +1080,7 @@
> }
> else
> msg.mem.id = msg.mem.offset = msg.mem.size = 0;
> - D("... reply");
> + DBG("... reply");
> evas_cserve_client_send(c, OP_LOADDATA, sizeof(msg), (unsigned char *)(&msg));
> }
> else
> @@ -1079,7 +1090,7 @@
> pthread_attr_t attr;
> Load_Inf *li;
>
> - D("... load data %p", img);
> + DBG("... load data %p", img);
> pthread_attr_init(&attr);
> li = calloc(1, sizeof(Load_Inf));
> if (li)
> @@ -1106,7 +1117,7 @@
> }
> else
> msg.mem.id = msg.mem.offset = msg.mem.size = 0;
> - D("... reply");
> + DBG("... reply");
> evas_cserve_client_send(c, OP_LOADDATA, sizeof(msg), (unsigned char *)(&msg));
> #endif
> }
> @@ -1123,16 +1134,16 @@
> Op_Unloaddata *rep;
> Img *img;
>
> - D("OP_UNLOADDATA %i", c->pid);
> + DBG("OP_UNLOADDATA %i", c->pid);
> rep = (Op_Unloaddata *)data;
> img = rep->handle;
> if ((img) && (rep->server_id == server_id))
> {
> - D("... dref--");
> + DBG("... dref--");
> LKL(img->lock);
> img->dref--;
> if (img->dref < 0) img->dref = 0;
> - D("... unload data %p '%s'", img, img->file.file);
> + DBG("... unload data %p '%s'", img, img->file.file);
> img_unloaddata(img);
> LKU(img->lock);
> }
> @@ -1143,16 +1154,16 @@
> Op_Unloaddata *rep;
> Img *img;
>
> - D("OP_USELESSDATA %i", c->pid);
> + DBG("OP_USELESSDATA %i", c->pid);
> rep = (Op_Unloaddata *)data;
> img = rep->handle;
> if ((img) && (rep->server_id == server_id))
> {
> - D("... dref--");
> + DBG("... dref--");
> LKL(img->lock);
> img->dref--;
> if (img->dref < 0) img->dref = 0;
> - D("... useless %p", img);
> + DBG("... useless %p", img);
> img_useless(img);
> LKU(img->lock);
> }
> @@ -1163,7 +1174,7 @@
> Op_Preload *rep;
> Img *img;
>
> - D("OP_PRELOAD %i", c->pid);
> + DBG("OP_PRELOAD %i", c->pid);
> rep = (Op_Preload *)data;
> img = rep->handle;
> if ((img) && (rep->server_id == server_id))
> @@ -1183,7 +1194,7 @@
> Op_Forcedunload *rep;
> Img *img;
>
> - D("OP_FORCEDUNLOAD %i", c->pid);
> + DBG("OP_FORCEDUNLOAD %i", c->pid);
> rep = (Op_Forcedunload *)data;
> img = rep->handle;
> if ((img) && (rep->server_id == server_id))
> @@ -1191,12 +1202,12 @@
> Eina_Bool doflush = 0;
>
> LKL(img->lock);
> - D("remove %p from list", img);
> + DBG("remove %p from list", img);
> if (c->client_main)
> c->client_main->data = eina_list_remove(c->client_main->data, img);
> else
> c->data = eina_list_remove(c->data, img);
> - D("... forced unload now");
> + DBG("... forced unload now");
> img->ref++;
> img_forcedunload(img);
> img->ref--;
> @@ -1212,11 +1223,11 @@
> {
> Op_Getconfig_Reply msg;
>
> - D("OP_GETCONFIG %i", c->pid);
> + DBG("OP_GETCONFIG %i", c->pid);
> msg.cache_max_usage = cache_max_usage;
> msg.cache_item_timeout = cache_item_timeout;
> msg.cache_item_timeout_check = cache_item_timeout_check;
> - D("... reply");
> + DBG("... reply");
> evas_cserve_client_send(c, OP_GETCONFIG, sizeof(msg), (unsigned char *)(&msg));
> }
> break;
> @@ -1224,14 +1235,14 @@
> {
> Op_Setconfig *rep;
>
> - D("OP_SETCONFIG %i", c->pid);
> + DBG("OP_SETCONFIG %i", c->pid);
> rep = (Op_Setconfig *)data;
> cache_max_usage = rep->cache_max_usage;
> cache_item_timeout = rep->cache_item_timeout;
> cache_item_timeout_check = rep->cache_item_timeout_check;
> - D("... cache timeout");
> + DBG("... cache timeout");
> cache_timeout(t_now);
> - D("... cache clean");
> + DBG("... cache clean");
> cache_clean();
> }
> break;
> @@ -1239,7 +1250,7 @@
> {
> Op_Getstats_Reply msg;
>
> - D("OP_GETSTATS %i", c->pid);
> + DBG("OP_GETSTATS %i", c->pid);
> stats_calc();
> msg.saved_memory = saved_memory;
> msg.wasted_memory = (real_memory - alloced_memory);
> @@ -1247,7 +1258,7 @@
> msg.wasted_memory_peak = (real_memory_peak - alloced_memory_peak);
> msg.saved_time_image_header_load = saved_load_lifetime + saved_load_time;
> msg.saved_time_image_data_load = saved_loaddata_lifetime + saved_loaddata_time;
> - D("... reply");
> + DBG("... reply");
> evas_cserve_client_send(c, OP_GETSTATS, sizeof(msg), (unsigned char *)(&msg));
> }
> break;
> @@ -1258,19 +1269,19 @@
> Eina_List *imgs = NULL, *l;
> Img *img;
>
> - D("OP_GETINFO %i", c->pid);
> + DBG("OP_GETINFO %i", c->pid);
> len = sizeof(Op_Getinfo_Reply);
> - D("... foreach");
> + DBG("... foreach");
> if (active_images)
> eina_hash_foreach(active_images, getinfo_hash_image_cb, &imgs);
> - D("... walk foreach list output");
> + DBG("... walk foreach list output");
> LKL(cache_lock);
> EINA_LIST_FOREACH(cache_images, l, img)
> {
> imgs = eina_list_append(imgs, img);
> }
> LKU(cache_lock);
> - D("... walk image cache");
> + DBG("... walk image cache");
> EINA_LIST_FOREACH(imgs, l, img)
> {
> len += sizeof(Op_Getinfo_Item);
> @@ -1279,13 +1290,13 @@
> if (img->file.key) len += strlen(img->file.key);
> len++;
> }
> - D("... malloc msg");
> + DBG("... malloc msg");
> msg = malloc(len);
> if (msg)
> {
> unsigned char *p;
>
> - D("... init msg");
> + DBG("... init msg");
> memset(msg, 0, len);
> p = (unsigned char *)msg;
> msg->active.mem_total = 0;
> @@ -1293,13 +1304,13 @@
> msg->cached.mem_total = 0;
> msg->cached.count = 0;
> p += sizeof(Op_Getinfo_Reply);
> - D("... walk all imgs");
> + DBG("... walk all imgs");
> EINA_LIST_FOREACH(imgs, l, img)
> {
> Op_Getinfo_Item *itt, it;
>
> LKL(img->lock);
> - D("... img %p", img);
> + DBG("... img %p", img);
> memset(&it, 0, sizeof(Op_Getinfo_Item));
> itt = (Op_Getinfo_Item *)p;
> it.file_key_size = 0;
> @@ -1349,33 +1360,33 @@
> }
> it.dead = img->dead;
> it.useless = img->useless;
> - D("... memcpy %p %p %i ",
> + DBG("... memcpy %p %p %i ",
> itt, &it, sizeof(Op_Getinfo_Item));
> memcpy(itt, &it, sizeof(Op_Getinfo_Item));
> - D("... memcpy done n", img);
> + DBG("... memcpy done n", img);
> p += sizeof(Op_Getinfo_Item) + it.file_key_size;
> LKU(img->lock);
> }
> - D("... walk all imgs done");
> + DBG("... walk all imgs done");
> msg->active.mem_total =
> (msg->active.mem_total + 1023) / 1024;
> msg->cached.mem_total =
> (msg->cached.mem_total + 1023) / 1024;
> - D("... reply");
> + DBG("... reply");
> evas_cserve_client_send(c, OP_GETINFO, len, msg);
> free(msg);
> }
> else
> {
> - D("... reply empty");
> + DBG("... reply empty");
> evas_cserve_client_send(c, OP_GETINFO, 0, NULL);
> }
> - D("... free imgs list");
> + DBG("... free imgs list");
> if (imgs) eina_list_free(imgs);
> }
> break;
> default:
> - D("OP_... UNKNOWN??? %i opcode: %i", c->pid, opcode);
> + DBG("OP_... UNKNOWN??? %i opcode: %i", c->pid, opcode);
> break;
> }
> return 0;
> @@ -1500,59 +1511,65 @@
>
> unsetenv("EVAS_CSERVE");
>
> - D("eina init...");
> + DBG("eina init...");
> eina_init();
> - D("evas init...");
> + _evas_cserve_bin_log_dom = eina_log_domain_register("Evas_cserve_bin", CSERVE_BIN_DEFAULT_COLOR);
> + if(_evas_cserve_bin_log_dom < 0) {
> + DBG("Problem with eina_log : impossible to create a log domain");
> + eina_shutdown();
> + exit(1);
> + }
> +
> + DBG("evas init...");
> evas_init();
> -
> - D("img init...");
> + DBG("img init...");
> img_init();
> - D("signal init...");
> + DBG("signal init...");
> signal_init();
> - D("cserve add...");
> + DBG("cserve add...");
> s = evas_cserve_server_add();
> if (!s)
> {
> - printf("ERROR: server socket init fail. abort.");
> + ERR("ERROR: server socket init fail. abort.");
> goto error;
> }
> - D("mem open (status)...");
> + DBG("mem open (status)...");
> stat_mem = evas_cserve_mem_open(0, 0, "status", sizeof(int), 0);
> if (stat_mem)
> {
> - printf("WARNING: previous evas_cserve left garbage. cleaning up.");
> + WRN("WARNING: previous evas_cserve left garbage. cleaning up.");
> stat_clean(stat_mem);
> evas_cserve_mem_close(stat_mem);
> stat_mem = NULL;
> }
> - D("mem new (status)...");
> + DBG("mem new (status)...");
> stat_mem = evas_cserve_mem_new(sizeof(int), "status");
> if (!stat_mem)
> {
> - printf("ERROR: cannot create status shmseg. abort.");
> + ERR("ERROR: cannot create status shmseg. abort.");
> goto error;
> }
> - D("init status...");
> + DBG("init status...");
> if (!stat_init(stat_mem))
> {
> - printf("ERROR: cannot init status shmseg. abort.");
> + ERR("cannot init status shmseg. abort.");
> evas_cserve_mem_free(stat_mem);
> stat_mem = NULL;
> goto error;
> }
>
> - D("cset server message handler...");
> + DBG("cset server message handler...");
> evas_cserve_server_message_handler_set(s, message, NULL);
> last_check = time(NULL);
> t_next = 0;
> if (cache_item_timeout_check > 0) t_next = cache_item_timeout_check;
> - D("LOOP!!! ...");
> + DBG("LOOP!!! ...");
> for (;;)
> {
> /* fixme: timeout 0 only her - future use timeouts for timed
> * housekeping */
> if (exit_flag) break;
> - D("wait for messages...");
> + DBG("wait for messages...");
> evas_cserve_server_wait(s, t_next * 1000000);
> if (exit_flag) break;
> t = time(NULL);
> @@ -1560,20 +1577,20 @@
> if ((cache_item_timeout_check > 0) &&
> ((t_next) >= cache_item_timeout_check))
> {
> - D("check timeout of items...");
> + DBG("check timeout of items...");
> t_next = cache_item_timeout_check;
>
> last_check = t;
> - D("cache timeout...");
> + DBG("cache timeout...");
> cache_timeout(t);
> - D("meminfo check...");
> + DBG("meminfo check...");
> meminfo_check();
> - D("mem cache adjust...");
> + DBG("mem cache adjust...");
> mem_cache_adjust();
> }
> if ((t_next <= 0) && (cache_item_timeout_check > 0))
> t_next = 1;
> - D("sleep for %isec...", t_next);
> + DBG("sleep for %isec...", t_next);
>
> LKL(strshr_freeme_lock);
> if (strshr_freeme_count > 0)
> @@ -1608,40 +1625,41 @@
> cache_images = eina_list_remove(cache_images, img);
> img->incache--;
> cache_usage -= img->usage;
> - D("... IMG FREE %p", img);
> + DBG("... IMG FREE %p", img);
> img_free(img);
> }
> cache_cleanme = 0;
> }
> LKU(cache_lock);
> }
> - D("end loop...");
> + DBG("end loop...");
> error:
> - D("cleanup...");
> + DBG("cleanup...");
> if (stat_mem)
> {
> - D("clean mem stat...");
> + DBG("clean mem stat...");
> stat_clean(stat_mem);
> }
> - D("signal shutdown...");
> + DBG("signal shutdown...");
> signal_shutdown();
> - D("img shutdown...");
> + DBG("img shutdown...");
> img_shutdown();
> if (stat_mem)
> {
> - D("free stat mem...");
> + DBG("free stat mem...");
> evas_cserve_mem_free(stat_mem);
> stat_mem = NULL;
> }
> if (s)
> {
> - D("del server...");
> + DBG("del server...");
> evas_cserve_server_del(s);
> }
> - D("evas shutdown...");
> + DBG("evas shutdown...");
> evas_shutdown();
> - D("eina shutdown...");
> + eina_log_domain_unregister(_evas_cserve_bin_log_dom);
> + DBG("eina shutdown...");
> eina_shutdown();
> - D("exit..");
> + DBG("exit..");
> return 0;
> }
>
> Modified: trunk/evas/src/bin/evas_cserve_tool.c
> ===================================================================
> --- trunk/evas/src/bin/evas_cserve_tool.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/bin/evas_cserve_tool.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -4,6 +4,8 @@
>
> #include "evas_cs.h"
>
> +int _cserve_tool_log_dom = -1;
> +
> int
> main(int argc, char **argv)
> {
>
> Modified: trunk/evas/src/lib/canvas/evas_events.c
> ===================================================================
> --- trunk/evas/src/lib/canvas/evas_events.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/canvas/evas_events.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -398,13 +398,13 @@
>
> if (e->pointer.mouse_grabbed < 0)
> {
> - fprintf(stderr, "BUG? e->pointer.mouse_grabbed (=%d) < 0!\n",
> - e->pointer.mouse_grabbed);
> + ERROR("BUG? e->pointer.mouse_grabbed (=%d) < 0!",
> + e->pointer.mouse_grabbed);
> }
>
> if ((e->pointer.button == 0) && (e->pointer.mouse_grabbed != 0))
> {
> - printf("restore to 0 grabs (from %i)\n", e->pointer.mouse_grabbed);
> + INFO("restore to 0 grabs (from %i)", e->pointer.mouse_grabbed);
> e->pointer.mouse_grabbed = 0;
> }
> _evas_unwalk(e);
>
> Modified: trunk/evas/src/lib/canvas/evas_font_dir.c
> ===================================================================
> --- trunk/evas/src/lib/canvas/evas_font_dir.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/canvas/evas_font_dir.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -394,7 +394,7 @@
> set = FcFontSort(NULL, p_nm, FcTrue, NULL, &res);
> if (!set)
> {
> - fprintf(stderr, "ERROR: no fontconfig font matches '%s'. It was the last resource, no font found!\n", name);
> + ERROR("No fontconfig font matches '%s'. It was the last resource, no font found!", name);
> goto fc_end;
> }
>
>
> Modified: trunk/evas/src/lib/canvas/evas_main.c
> ===================================================================
> --- trunk/evas/src/lib/canvas/evas_main.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/canvas/evas_main.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -3,7 +3,7 @@
> #include "evas_cs.h"
>
> static int initcount = 0;
> -
> +int _evas_log_dom_global = -1;
> /**
> * Initialize Evas
> *
> @@ -22,6 +22,13 @@
> {
> if (!eina_init())
> return 0;
> + _evas_log_dom_global = eina_log_domain_register("evas_main",EVAS_DEFAULT_LOG_COLOR);
> + if(_evas_log_dom_global < 0)
> + {
> + fprintf(stderr,"Error: Evas could not create a default log domain\n");
> + eina_shutdown();
> + return 0;
> + }
> evas_module_init();
> #ifdef BUILD_ASYNC_EVENTS
> if (!evas_async_events_init())
> @@ -36,6 +43,7 @@
> #ifdef BUILD_ASYNC_EVENTS
> shutdown_module:
> evas_module_shutdown();
> + eina_log_domain_unregister(_evas_log_dom_global);
> eina_shutdown();
>
> return 0;
> @@ -69,6 +77,7 @@
> evas_font_dir_cache_free();
> evas_common_shutdown();
> evas_module_shutdown();
> + eina_log_domain_unregister(_evas_log_dom_global);
> eina_shutdown();
> }
> return initcount;
> @@ -477,7 +486,7 @@
> if (h <= 0) return;
> if ((x != 0) || (y != 0))
> {
> - printf("EVAS: compat error. viewport x,y != 0,0 not supported\n");
> + ERROR("EVAS: compat error. viewport x,y != 0,0 not supported");
> x = 0;
> y = 0;
> }
>
> Modified: trunk/evas/src/lib/canvas/evas_object_box.c
> ===================================================================
> --- trunk/evas/src/lib/canvas/evas_object_box.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/canvas/evas_object_box.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -32,8 +32,8 @@
> EVAS_OBJECT_BOX_DATA_GET(o, ptr); \
> if (!ptr) \
> { \
> - fprintf(stderr, "CRITICAL: no widget data for object %p (%s)\n", \
> - o, evas_object_type_get(o)); \
> + CRITICAL("no widget data for object %p (%s)", \
> + o, evas_object_type_get(o)); \
> fflush(stderr); \
> abort(); \
> return; \
> @@ -43,7 +43,7 @@
> EVAS_OBJECT_BOX_DATA_GET(o, ptr); \
> if (!ptr) \
> { \
> - fprintf(stderr, "CRITICAL: no widget data for object %p (%s)\n", \
> + CRITICAL("no widget data for object %p (%s)", \
> o, evas_object_type_get(o)); \
> fflush(stderr); \
> abort(); \
> @@ -355,7 +355,7 @@
> node = eina_list_nth_list(priv->children, pos);
> if (!node)
> {
> - fprintf(stderr, "ERROR: no item to be removed at position %d\n", pos);
> + ERROR("ERROR: no item to be removed at position %d\n", pos);
> return NULL;
> }
>
> @@ -451,7 +451,7 @@
> if (priv->layout.cb)
> priv->layout.cb(o, priv, priv->layout.data);
> else
> - fprintf(stderr, "ERROR: no layout function set for %p box.\n", o);
> + ERROR("No layout function set for %p box.", o);
> }
>
> static Evas_Smart *
>
> Modified: trunk/evas/src/lib/canvas/evas_object_image.c
> ===================================================================
> --- trunk/evas/src/lib/canvas/evas_object_image.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/canvas/evas_object_image.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -2496,9 +2496,8 @@
>
> if ((o->cur.fill.w < 1) || (o->cur.fill.h < 1))
> {
> - fprintf(stderr,
> - "ERROR: evas image: %p has invalid fill size: %dx%d. Ignored\n",
> - obj, o->cur.fill.w, o->cur.fill.h);
> + ERROR("evas image: %p has invalid fill size: %dx%d. Ignored",
> + obj, o->cur.fill.w, o->cur.fill.h);
> return;
> }
>
>
> Modified: trunk/evas/src/lib/canvas/evas_object_smart.c
> ===================================================================
> --- trunk/evas/src/lib/canvas/evas_object_smart.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/canvas/evas_object_smart.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -174,20 +174,20 @@
>
> if (obj->delete_me)
> {
> - printf("EVAS ERROR: Adding deleted object %p to smart obj %p\n", obj, smart_obj);
> + ERROR("Adding deleted object %p to smart obj %p", obj, smart_obj);
> abort();
> return;
> }
> if (smart_obj->delete_me)
> {
> - printf("EVAS ERROR: Adding object %p to deleted smart obj %p\n", obj, smart_obj);
> + ERROR("Adding object %p to deleted smart obj %p", obj, smart_obj);
> abort();
> return;
> }
> if (obj->layer && smart_obj->layer
> && obj->layer->evas != smart_obj->layer->evas)
> {
> - printf("EVAS ERROR: Adding object %p from Evas (%p) from another Evas (%p)\n", obj, obj->layer->evas, smart_obj->layer->evas);
> + ERROR("EVAS ERROR: Adding object %p from Evas (%p) from another Evas (%p)", obj, obj->layer->evas, smart_obj->layer->evas);
> abort();
> return;
> }
>
> Modified: trunk/evas/src/lib/canvas/evas_object_table.c
> ===================================================================
> --- trunk/evas/src/lib/canvas/evas_object_table.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/canvas/evas_object_table.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -91,9 +91,8 @@
> EVAS_OBJECT_TABLE_DATA_GET(o, ptr); \
> if (!ptr) \
> { \
> - fprintf(stderr, "CRITICAL: no widget data for object %p (%s)\n", \
> + CRITICAL("CRITICAL: no widget data for object %p (%s)", \
> o, evas_object_type_get(o)); \
> - fflush(stderr); \
> abort(); \
> return; \
> }
> @@ -102,9 +101,8 @@
> EVAS_OBJECT_TABLE_DATA_GET(o, ptr); \
> if (!ptr) \
> { \
> - fprintf(stderr, "CRITICAL: no widget data for object %p (%s)\n", \
> + CRITICAL("No widget data for object %p (%s)", \
> o, evas_object_type_get(o)); \
> - fflush(stderr); \
> abort(); \
> return val; \
> }
> @@ -170,9 +168,8 @@
> cache = malloc(size);
> if (!cache)
> {
> - fprintf(stderr,
> - "ERROR: could not allocate table cache %dx%d (%d bytes): %s\n",
> - cols, rows, size, strerror(errno));
> + ERROR("Could not allocate table cache %dx%d (%d bytes): %s",
> + cols, rows, size, strerror(errno));
> return NULL;
> }
>
> @@ -319,8 +316,7 @@
> /* } */
> /* else if (min < 1) */
> /* { */
> -/* fprintf(stderr, */
> -/* "WARNING: child %p [%s, %s] has no minimum width " */
> +/* WARN("Child %p [%s, %s] has no minimum width " */
> /* "and no %s expand (weight is not > 0.0). " */
> /* "Assuming weight > 0.0\n", */
> /* child, evas_object_type_get(child), evas_object_name_get(child), */
> @@ -419,16 +415,14 @@
> {
> if (o_minw < 1)
> {
> - fputs("ERROR: homogeneous table based on item size but no "
> - "horizontal mininum size specified! Using expand.\n",
> - stderr);
> + ERROR("homogeneous table based on item size but no "
> + "horizontal mininum size specified! Using expand.");
> expand_h = 1;
> }
> if (o_minh < 1)
> {
> - fputs("ERROR: homogeneous table based on item size but no "
> - "vertical mininum size specified! Using expand.\n",
> - stderr);
> + ERROR("homogeneous table based on item size but no "
> + "vertical mininum size specified! Using expand.");
> expand_v = 1;
> }
> }
> @@ -730,9 +724,8 @@
> cols = malloc(size);
> if (!cols)
> {
> - fprintf(stderr,
> - "ERROR: could not allocate temp columns (%d bytes): %s\n",
> - size, strerror(errno));
> + ERROR("Could not allocate temp columns (%d bytes): %s",
> + size, strerror(errno));
> return;
> }
> memcpy(cols, c->sizes.h, size);
> @@ -754,8 +747,7 @@
> rows = malloc(size);
> if (!rows)
> {
> - fprintf(stderr,
> - "ERROR: could not allocate temp rows (%d bytes): %s\n",
> + ERROR("could not allocate temp rows (%d bytes): %s",
> size, strerror(errno));
> goto end;
> }
> @@ -812,7 +804,7 @@
> priv = calloc(1, sizeof(*priv));
> if (!priv)
> {
> - fputs("ERROR: could not allocate object private data.\n", stderr);
> + ERROR("could not allocate object private data.");
> return;
> }
> evas_object_smart_data_set(o, priv);
> @@ -870,8 +862,8 @@
>
> if ((priv->size.cols < 1) || (priv->size.rows < 1))
> {
> - fprintf(stderr, "DBG: nothing to do: cols=%d, rows=%d\n",
> - priv->size.cols, priv->size.rows);
> + DEBUG("Nothing to do: cols=%d, rows=%d",
> + priv->size.cols, priv->size.rows);
> return;
> }
>
> @@ -1103,27 +1095,26 @@
>
> if (rowspan < 1)
> {
> - fputs("ERROR: rowspan < 1\n", stderr);
> + ERROR("rowspan < 1");
> return EINA_FALSE;
> }
> if (colspan < 1)
> {
> - fputs("ERROR: colspan < 1\n", stderr);
> + ERROR("colspan < 1");
> return EINA_FALSE;
> }
>
> opt = _evas_object_table_option_get(child);
> if (opt)
> {
> - fputs("ERROR: cannot add object that is already part of a table!\n",
> - stderr);
> + ERROR("cannot add object that is already part of a table!");
> return EINA_FALSE;
> }
>
> opt = malloc(sizeof(*opt));
> if (!opt)
> {
> - fputs("ERROR: could not allocate table option data.\n", stderr);
> + ERROR("could not allocate table option data.");
> return EINA_FALSE;
> }
>
> @@ -1226,14 +1217,14 @@
>
> if (o != evas_object_smart_parent_get(child))
> {
> - fputs("ERROR: cannot unpack child from incorrect table!\n", stderr);
> + ERROR("cannot unpack child from incorrect table!");
> return EINA_FALSE;
> }
>
> opt = _evas_object_table_option_del(child);
> if (!opt)
> {
> - fputs("ERROR: cannot unpack child with no packing option!\n", stderr);
> + ERROR("cannot unpack child with no packing option!");
> return EINA_FALSE;
> }
>
>
> Modified: trunk/evas/src/lib/canvas/evas_render.c
> ===================================================================
> --- trunk/evas/src/lib/canvas/evas_render.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/canvas/evas_render.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -404,7 +404,7 @@
> }
> if ((e->output.w != e->viewport.w) || (e->output.h != e->viewport.h))
> {
> - printf("EVAS: error: viewport size != output size!\n");
> + ERROR("viewport size != output size!");
> }
> /* phase 5. add obscures */
> EINA_LIST_FOREACH(e->obscures, ll, r)
>
> Modified: trunk/evas/src/lib/canvas/evas_smart.c
> ===================================================================
> --- trunk/evas/src/lib/canvas/evas_smart.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/canvas/evas_smart.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -65,8 +65,8 @@
> Evas_Smart *s;
> Evas_Smart_Class *sc;
>
> - printf("----- WARNING. evas_smart_new() will be deprecated and removed soon\n"
> - "----- Please use evas_smart_class_new() instead\n");
> + WARN("----- WARNING. evas_smart_new() will be deprecated and removed soon"
> + "----- Please use evas_smart_class_new() instead");
>
> if (!name) return NULL;
>
>
> Modified: trunk/evas/src/lib/canvas/evas_stack.c
> ===================================================================
> --- trunk/evas/src/lib/canvas/evas_stack.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/canvas/evas_stack.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -187,7 +187,7 @@
> {
> if (obj->smart.parent != above->smart.parent)
> {
> -// printf("BITCH! evas_object_stack_above(), %p not inside same smart as %p!\n", obj, above);
> +// ERROR("BITCH! evas_object_stack_above(), %p not inside same smart as %p!", obj, above);
> return;
> }
> evas_object_smart_member_stack_above(obj, above);
> @@ -275,7 +275,7 @@
> {
> if (obj->smart.parent != below->smart.parent)
> {
> -// printf("BITCH! evas_object_stack_below(), %p not inside same smart as %p!\n", obj, below);
> +// ERROR("BITCH! evas_object_stack_below(), %p not inside same smart as %p!", obj, below);
> return;
> }
> evas_object_smart_member_stack_below(obj, below);
>
> Modified: trunk/evas/src/lib/cserve/evas_cs_client.c
> ===================================================================
> --- trunk/evas/src/lib/cserve/evas_cs_client.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/cserve/evas_cs_client.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -145,8 +145,8 @@
> if ((*size < 0) || (*size > (1024 * 1024))) return NULL;
> if (ints[2] != (s->ch[channel].req_from + 1))
> {
> - printf("EEK! sequence number mismatch from serer with pid: %i\n"
> - "---- num %i is not 1 more than %i\n"
> + ERROR("EEK! sequence number mismatch from serer with pid: %i\n"
> + "---- num %i is not 1 more than %i"
> ,
> s->pid, ints[2], s->ch[channel].req_from);
> return NULL;
>
> Modified: trunk/evas/src/lib/cserve/evas_cs_server.c
> ===================================================================
> --- trunk/evas/src/lib/cserve/evas_cs_server.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/cserve/evas_cs_server.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -225,8 +225,8 @@
> data = c->inbuf + (sizeof(int) * 3);
> if (ints[2] != (c->req_from + 1))
> {
> - printf("EEK! sequence number mismatch from client with pid: %i\n"
> - "---- num %i is not 1 more than %i\n"
> + ERROR("EEK! sequence number mismatch from client with pid: %i\n"
> + "---- num %i is not 1 more than %i"
> ,
> c->pid, ints[2], c->req_from);
> return 0;
>
> Modified: trunk/evas/src/lib/engines/common/evas_convert_main.c
> ===================================================================
> --- trunk/evas/src/lib/engines/common/evas_convert_main.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/engines/common/evas_convert_main.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -591,7 +591,7 @@
> }
> #endif
> }
> - printf("depth = %i mode = %i\n", depth, pal_mode);
> + INFO("depth = %i mode = %i", depth, pal_mode);
> if (depth == 8)
> {
> #ifdef BUILD_CONVERT_8_RGB_332
>
> Modified: trunk/evas/src/lib/engines/common/evas_convert_rgb_16.c
> ===================================================================
> --- trunk/evas/src/lib/engines/common/evas_convert_rgb_16.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/engines/common/evas_convert_rgb_16.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -715,7 +715,7 @@
>
> dst_ptr = (DATA16 *)dst;
>
> - fprintf(stderr, "evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_180\n");
> + ERROR("evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_180");
>
> CONVERT_LOOP_START_ROT_180();
>
>
> Modified: trunk/evas/src/lib/engines/common/evas_cpu.c
> ===================================================================
> --- trunk/evas/src/lib/engines/common/evas_cpu.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/engines/common/evas_cpu.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -3,7 +3,6 @@
> */
>
> #include "evas_common.h"
> -
> #if defined BUILD_MMX || defined BUILD_SSE
> #include "evas_mmx.h"
> #endif
> @@ -222,7 +221,7 @@
> if (cpu_feature_mask & CPU_FEATURE_MMX2) do_sse = 1;
> if (cpu_feature_mask & CPU_FEATURE_SSE) do_sse = 1;
> }
> -// printf("%i %i %i\n", do_mmx, do_sse, do_sse2);
> +// INFO("%i %i %i", do_mmx, do_sse, do_sse2);
> *mmx = do_mmx;
> *sse = do_sse;
> *sse2 = do_sse2;
>
> Modified: trunk/evas/src/lib/engines/common/evas_font_draw.c
> ===================================================================
> --- trunk/evas/src/lib/engines/common/evas_font_draw.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/engines/common/evas_font_draw.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -8,6 +8,7 @@
>
>
> #include "evas_common.h"
> +#include "evas_private.h"
> #include "evas_blend_private.h"
>
> #include "evas_intl_utils.h" /*defines INTERNATIONAL_SUPPORT if possible */
>
> Modified: trunk/evas/src/lib/engines/common/evas_font_main.c
> ===================================================================
> --- trunk/evas/src/lib/engines/common/evas_font_main.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/engines/common/evas_font_main.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -3,7 +3,7 @@
> */
>
> #include "evas_common.h"
> -
> +#include "evas_private.h"
> FT_Library evas_ft_lib = 0;
> static int initialised = 0;
>
>
> Modified: trunk/evas/src/lib/engines/common/evas_font_query.c
> ===================================================================
> --- trunk/evas/src/lib/engines/common/evas_font_query.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/engines/common/evas_font_query.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -147,11 +147,11 @@
> fg = evas_common_font_int_cache_glyph_get(fi, index);
> if (!fg) return 0;
> /*
> - printf("fg->glyph_out->left = %i\n"
> + INFO("fg->glyph_out->left = %i\n"
> "fi->src->ft.face->glyph->bitmap_left = %i\n"
> "fi->src->ft.face->glyph->metrics.horiBearingX = %i\n"
> "fi->src->ft.face->glyph->metrics.horiBearingY = %i\n"
> - "fi->src->ft.face->glyph->metrics.horiAdvance = %i\n"
> + "fi->src->ft.face->glyph->metrics.horiAdvance = %i"
> ,
> (int)fg->glyph_out->left,
> (int)fi->src->ft.face->glyph->bitmap_left,
>
> Modified: trunk/evas/src/lib/engines/common/evas_image_main.c
> ===================================================================
> --- trunk/evas/src/lib/engines/common/evas_image_main.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/engines/common/evas_image_main.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -53,7 +53,7 @@
> static void
> _evas_common_rgba_image_debug(const char* context, Image_Entry *eim)
> {
> - fprintf(stderr, "%p = [%s] {%s,%s} %i [%i|%i]\n", eim, context, eim->file, eim->key, eim->references, eim->w, eim->h);
> + DEBUG("%p = [%s] {%s,%s} %i [%i|%i]", eim, context, eim->file, eim->key, eim->references, eim->w, eim->h);
> }
>
> static const Evas_Cache_Image_Func _evas_common_image_func =
> @@ -83,7 +83,7 @@
> if (!eci)
> eci = evas_cache_image_init(&_evas_common_image_func);
> reference++;
> -//// printf("REF++=%i\n", reference);
> +//// ERROR("REF++=%i", reference);
>
> #ifdef BUILD_LOADER_EET
> eet_init();
>
> Modified: trunk/evas/src/lib/engines/common/evas_image_scalecache.c
> ===================================================================
> --- trunk/evas/src/lib/engines/common/evas_image_scalecache.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/engines/common/evas_image_scalecache.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -118,7 +118,7 @@
> im->cache.list = eina_list_remove(im->cache.list, sci);
> if (sci->im)
> {
> -// printf(" 0- %i\n", sci->dst_w * sci->dst_h * 4);
> +// INFO(" 0- %i", sci->dst_w * sci->dst_h * 4);
> LKL(cache_lock);
> evas_common_rgba_image_free(&sci->im->cache_entry);
> if (!sci->forced_unload)
> @@ -185,7 +185,7 @@
> if (sci->usage_count > im->cache.newest_usage_count)
> im->cache.newest_usage_count = sci->usage_count;
> }
> -// printf("_sci_fix_newest! -> %i\n", im->cache.newest_usage);
> +// INFO("_sci_fix_newest! -> %i", im->cache.newest_usage);
> }
>
> static Scaleitem *
> @@ -233,7 +233,7 @@
> cache_size -= sci->dst_w * sci->dst_h * 4;
> else
> cache_size -= sci->size_adjust;
> -// printf(" 1- %i\n", sci->dst_w * sci->dst_h * 4);
> +// INFO(" 1- %i", sci->dst_w * sci->dst_h * 4);
> cache_list = eina_inlist_remove(cache_list, (Eina_Inlist *)sci);
> }
> if (max_scale_items < 1) return NULL;
> @@ -291,11 +291,11 @@
> cache_size -= sci->dst_w * sci->dst_h * 4;
> else
> cache_size -= sci->size_adjust;
> -// printf(" 2- %i\n", sci->dst_w * sci->dst_h * 4);
> +// INFO(" 2- %i", sci->dst_w * sci->dst_h * 4);
> cache_list = eina_inlist_remove(cache_list, (Eina_Inlist *)sci);
> memset(sci, 0, sizeof(Eina_Inlist));
> }
> -// printf("FLUSH %i > %i\n", cache_size, max_cache_size);
> +// INFO("FLUSH %i > %i", cache_size, max_cache_size);
> }
> }
> #endif
> @@ -385,7 +385,7 @@
> LKU(im->cache.lock);
> return;
> }
> -// printf("%10i | %4i %4i %4ix%4i -> %4i %4i %4ix%4i | %i\n",
> +// INFO("%10i | %4i %4i %4ix%4i -> %4i %4i %4ix%4i | %i",
> // (int)use_counter,
> // src_region_x, src_region_y, src_region_w, src_region_h,
> // dst_region_x, dst_region_y, dst_region_w, dst_region_h,
> @@ -413,12 +413,12 @@
> LKU(cache_lock);
> if (sci->usage > im->cache.newest_usage)
> im->cache.newest_usage = sci->usage;
> -// printf("newset? %p %i > %i\n", im,
> +// INFO("newset? %p %i > %i", im,
> // (int)sci->usage,
> // (int)im->cache.newest_usage);
> if (sci->usage_count > im->cache.newest_usage_count)
> im->cache.newest_usage_count = sci->usage_count;
> -// printf(" -------------- used %8i#, %8i@\n", (int)sci->usage, (int)sci->usage_count);
> +// INFO(" -------------- used %8i#, %8i@", (int)sci->usage, (int)sci->usage_count);
> LKU(im->cache.lock);
> #endif
> }
> @@ -449,7 +449,7 @@
> i++;
> if (i > 2000)
> {
> - printf("p: %6i, h: %6i, m: %6i, n: %6i\n",
> + INFO("p: %6i, h: %6i, m: %6i, n: %6i",
> pops, hits, misses, noscales);
> i = 0;
> }
> @@ -552,7 +552,7 @@
> }
> if (sci->populate_me)
> {
> -// printf("##! populate!\n");
> +// INFO("##! populate!");
> sci->im = evas_common_image_new
> (dst_region_w, dst_region_h, im->cache_entry.flags.alpha);
> if (sci->im)
> @@ -625,7 +625,7 @@
> {
> cache_size += sci->dst_w * sci->dst_h * 4;
> }
> -// printf(" + %i @ flop: %i (%ix%i)\n",
> +// INFO(" + %i @ flop: %i (%ix%i)",
> // sci->dst_w * sci->dst_h * 4, sci->flop,
> // sci->dst_w, sci->dst_h);
> cache_list = eina_inlist_append(cache_list, (Eina_Inlist *)sci);
> @@ -645,7 +645,7 @@
> {
> if (sci->flop > 0) sci->flop -= FLOP_DEL;
> }
> -// printf("use cached!\n");
> +// INFO("use cached!");
> evas_common_scale_rgba_in_to_out_clip_sample
> (sci->im, dst, dc,
> 0, 0,
> @@ -653,7 +653,7 @@
> dst_region_x, dst_region_y,
> dst_region_w, dst_region_h);
> // hits++;
> -// printf("check %p %i < %i\n",
> +// INFO("check %p %i < %i",
> // im,
> // (int)im->cache.orig_usage,
> // (int)im->cache.newest_usage);
>
> Modified: trunk/evas/src/lib/engines/common/evas_op_add_main_.c
> ===================================================================
> --- trunk/evas/src/lib/engines/common/evas_op_add_main_.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/engines/common/evas_op_add_main_.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -3,7 +3,6 @@
> */
>
> #include "evas_common.h"
> -
> static RGBA_Gfx_Func op_add_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST];
> static RGBA_Gfx_Pt_Func op_add_pt_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST];
>
>
> Modified: trunk/evas/src/lib/engines/common/evas_pipe.c
> ===================================================================
> --- trunk/evas/src/lib/engines/common/evas_pipe.c 2009-09-21 15:50:52 UTC (rev 42597)
> +++ trunk/evas/src/lib/engines/common/evas_pipe.c 2009-09-21 16:08:51 UTC (rev 42598)
> @@ -73,7 +73,7 @@
> {
> Thinfo *thinfo;
>
> -// printf("TH [...........\n");
> +// INFO("TH [...........");
> thinfo = data;
> for (;;)
> {
> @@ -81,13 +81,13 @@
> RGBA_Pipe *p;
>
> /* wait for start signal */
> -// printf(" TH %i START...\n", thinfo->thread_num);
> +// INFO(" TH %i START...", thinfo->thread_num);
> pthread_barrier_wait(&(thinfo->barrier[0]));
> info = thinfo->info;
> // if (info)
> // {
> // thinfo->info = NULL;
> -// printf(" TH %i GO\n", thinfo->thread_num);
> +// INFO(" TH %i GO", thinfo->thread_num);
> EINA_INLIST_FOREACH(EINA_INLIST_GET(info->im->pipe), p)
> {
> int i;
> @@ -100,7 +100,7 @@
> }
> free(info);
> // }
> -// printf(" TH %i DONE\n", thinfo->thread_num);
> +// INFO(" TH %i DONE", thinfo->thread_num);
> /* send finished signal */
> pthread_barrier_wait(&(thinfo->barrier[1]));
> }
>
> Modified: trunk/evas/src/lib/engines/common/evas_tiler.c
> ===================================================...
[truncated message content] |