forked from enlightenment/efl
use eina_log more effectively: replace all printfs with appropriate log functions and use EINA_LOG_ERR instead of ERR when log dom fails to init
SVN revision: 57858
This commit is contained in:
parent
eacea7d679
commit
96be628d43
|
@ -77,3 +77,7 @@
|
||||||
* Delay cache recreation with a timer
|
* Delay cache recreation with a timer
|
||||||
* Move desktop cache to efreet_cache.c, and cache all requests which
|
* Move desktop cache to efreet_cache.c, and cache all requests which
|
||||||
hit the eet cache
|
hit the eet cache
|
||||||
|
|
||||||
|
2011-03-18 Mike Blumenkrantz
|
||||||
|
|
||||||
|
* Use eina_log more effectively
|
||||||
|
|
|
@ -16,7 +16,8 @@
|
||||||
#include <Ecore.h>
|
#include <Ecore.h>
|
||||||
#include <Ecore_File.h>
|
#include <Ecore_File.h>
|
||||||
|
|
||||||
#define EFREET_MODULE_LOG_DOM /* no logging in this file */
|
#define EFREET_MODULE_LOG_DOM _efreet_icon_cache_log_dom
|
||||||
|
static int _efreet_icon_cache_log_dom = -1;
|
||||||
|
|
||||||
#include "Efreet.h"
|
#include "Efreet.h"
|
||||||
#include "efreet_private.h"
|
#include "efreet_private.h"
|
||||||
|
@ -34,7 +35,6 @@ static Eina_Array *exts = NULL;
|
||||||
static Eina_Array *extra_dirs = NULL;
|
static Eina_Array *extra_dirs = NULL;
|
||||||
static Eina_Array *strs = NULL;
|
static Eina_Array *strs = NULL;
|
||||||
static Eina_Hash *icon_themes = NULL;
|
static Eina_Hash *icon_themes = NULL;
|
||||||
static int verbose = 0;
|
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
cache_directory_find(Eina_Hash *dirs, const char *dir)
|
cache_directory_find(Eina_Hash *dirs, const char *dir)
|
||||||
|
@ -305,8 +305,8 @@ cache_scan(Efreet_Icon_Theme *theme, Eina_Hash *themes, Eina_Hash *icons, Eina_H
|
||||||
Efreet_Icon_Theme *inherit;
|
Efreet_Icon_Theme *inherit;
|
||||||
|
|
||||||
inherit = eina_hash_find(icon_themes, name);
|
inherit = eina_hash_find(icon_themes, name);
|
||||||
if (!inherit && verbose)
|
if (!inherit)
|
||||||
fprintf(stderr, "Theme `%s` not found for `%s`.\n",
|
INF("Theme `%s` not found for `%s`.",
|
||||||
name, theme->name.internal);
|
name, theme->name.internal);
|
||||||
if (!cache_scan(inherit, themes, icons, dirs, changed)) return EINA_FALSE;
|
if (!cache_scan(inherit, themes, icons, dirs, changed)) return EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
@ -336,8 +336,8 @@ check_changed(Efreet_Cache_Icon_Theme *theme)
|
||||||
Efreet_Cache_Icon_Theme *inherit;
|
Efreet_Cache_Icon_Theme *inherit;
|
||||||
|
|
||||||
inherit = eina_hash_find(icon_themes, name);
|
inherit = eina_hash_find(icon_themes, name);
|
||||||
if (!inherit && verbose)
|
if (!inherit)
|
||||||
fprintf(stderr, "Theme `%s` not found for `%s`.\n",
|
INF("Theme `%s` not found for `%s`.",
|
||||||
name, theme->theme.name.internal);
|
name, theme->theme.name.internal);
|
||||||
if (check_changed(inherit)) return EINA_TRUE;
|
if (check_changed(inherit)) return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
@ -627,7 +627,7 @@ cache_lock_file(void)
|
||||||
fl.l_whence = SEEK_SET;
|
fl.l_whence = SEEK_SET;
|
||||||
if (fcntl(lockfd, F_SETLK, &fl) < 0)
|
if (fcntl(lockfd, F_SETLK, &fl) < 0)
|
||||||
{
|
{
|
||||||
if (verbose) printf("LOCKED! You may want to delete %s if this persists\n", file);
|
WRN("LOCKED! You may want to delete %s if this persists", file);
|
||||||
close(lockfd);
|
close(lockfd);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
@ -680,13 +680,23 @@ main(int argc, char **argv)
|
||||||
|
|
||||||
/* init external subsystems */
|
/* init external subsystems */
|
||||||
if (!eina_init()) return -1;
|
if (!eina_init()) return -1;
|
||||||
|
_efreet_icon_cache_log_dom = eina_log_domain_register
|
||||||
|
("efreet_icon_cache", EFREET_DEFAULT_LOG_COLOR);
|
||||||
|
if (_efreet_icon_cache_log_dom < 0)
|
||||||
|
{
|
||||||
|
EINA_LOG_ERR("Efreet: Could not create a log domain for efreet_icon_cache.");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
eina_log_domain_level_set("efreet_icon_cache", EINA_LOG_LEVEL_ERR);
|
||||||
|
|
||||||
exts = eina_array_new(10);
|
exts = eina_array_new(10);
|
||||||
extra_dirs = eina_array_new(10);
|
extra_dirs = eina_array_new(10);
|
||||||
|
|
||||||
for (i = 1; i < argc; i++)
|
for (i = 1; i < argc; i++)
|
||||||
{
|
{
|
||||||
if (!strcmp(argv[i], "-v")) verbose = 1;
|
if (!strcmp(argv[i], "-v"))
|
||||||
|
eina_log_domain_level_set("efreet_icon_cache", EINA_LOG_LEVEL_DBG);
|
||||||
else if ((!strcmp(argv[i], "-h")) ||
|
else if ((!strcmp(argv[i], "-h")) ||
|
||||||
(!strcmp(argv[i], "-help")) ||
|
(!strcmp(argv[i], "-help")) ||
|
||||||
(!strcmp(argv[i], "--h")) ||
|
(!strcmp(argv[i], "--h")) ||
|
||||||
|
@ -711,7 +721,7 @@ main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
if (exts->count == 0)
|
if (exts->count == 0)
|
||||||
{
|
{
|
||||||
printf("Error: Need to pass extensions to icon cache create process\n");
|
ERR("Error: Need to pass extensions to icon cache create process");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -743,6 +753,7 @@ main(int argc, char **argv)
|
||||||
|
|
||||||
icon_themes = eina_hash_string_superfast_new(EINA_FREE_CB(icon_theme_free));
|
icon_themes = eina_hash_string_superfast_new(EINA_FREE_CB(icon_theme_free));
|
||||||
|
|
||||||
|
INF("opening theme cache");
|
||||||
/* open theme file */
|
/* open theme file */
|
||||||
theme_ef = eet_open(efreet_icon_theme_cache_file(), EET_FILE_MODE_READ_WRITE);
|
theme_ef = eet_open(efreet_icon_theme_cache_file(), EET_FILE_MODE_READ_WRITE);
|
||||||
if (!theme_ef) goto on_error_efreet;
|
if (!theme_ef) goto on_error_efreet;
|
||||||
|
@ -778,6 +789,7 @@ main(int argc, char **argv)
|
||||||
free(keys);
|
free(keys);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
INF("scan for themes");
|
||||||
/* scan themes */
|
/* scan themes */
|
||||||
cache_theme_scan(efreet_icon_deprecated_user_dir_get());
|
cache_theme_scan(efreet_icon_deprecated_user_dir_get());
|
||||||
cache_theme_scan(efreet_icon_user_dir_get());
|
cache_theme_scan(efreet_icon_user_dir_get());
|
||||||
|
@ -809,10 +821,12 @@ main(int argc, char **argv)
|
||||||
#ifndef STRICT_SPEC
|
#ifndef STRICT_SPEC
|
||||||
if (!theme->theme.name.name) continue;
|
if (!theme->theme.name.name) continue;
|
||||||
#endif
|
#endif
|
||||||
|
INF("scan theme %s", theme->theme.name.name);
|
||||||
|
|
||||||
changed = EINA_FALSE;
|
changed = EINA_FALSE;
|
||||||
themes = eina_hash_string_superfast_new(NULL);
|
themes = eina_hash_string_superfast_new(NULL);
|
||||||
|
|
||||||
|
INF("open icon file");
|
||||||
/* open icon file */
|
/* open icon file */
|
||||||
icon_ef = eet_open(efreet_icon_cache_file(theme->theme.name.internal), EET_FILE_MODE_READ_WRITE);
|
icon_ef = eet_open(efreet_icon_cache_file(theme->theme.name.internal), EET_FILE_MODE_READ_WRITE);
|
||||||
if (!icon_ef) goto on_error_efreet;
|
if (!icon_ef) goto on_error_efreet;
|
||||||
|
@ -862,10 +876,10 @@ main(int argc, char **argv)
|
||||||
if (!theme->dirs)
|
if (!theme->dirs)
|
||||||
theme->dirs = eina_hash_string_superfast_new(NULL);
|
theme->dirs = eina_hash_string_superfast_new(NULL);
|
||||||
|
|
||||||
|
INF("scan icons\n");
|
||||||
if (cache_scan(&(theme->theme), themes, icons, theme->dirs, &changed))
|
if (cache_scan(&(theme->theme), themes, icons, theme->dirs, &changed))
|
||||||
{
|
{
|
||||||
if (verbose)
|
INF("generated: '%s' %i (%i)",
|
||||||
fprintf(stderr, "generated: '%s' %i (%i)\n",
|
|
||||||
theme->theme.name.internal,
|
theme->theme.name.internal,
|
||||||
changed,
|
changed,
|
||||||
eina_hash_population(icons));
|
eina_hash_population(icons));
|
||||||
|
@ -886,8 +900,8 @@ main(int argc, char **argv)
|
||||||
|
|
||||||
if (changed)
|
if (changed)
|
||||||
{
|
{
|
||||||
if (theme->changed && verbose)
|
if (theme->changed)
|
||||||
fprintf(stderr, "theme change: %s %lld\n", theme->theme.name.internal, theme->last_cache_check);
|
INF("theme change: %s %lld", theme->theme.name.internal, theme->last_cache_check);
|
||||||
eet_data_write(theme_ef, theme_edd, theme->theme.name.internal, theme, 1);
|
eet_data_write(theme_ef, theme_edd, theme->theme.name.internal, theme, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -901,6 +915,7 @@ main(int argc, char **argv)
|
||||||
|
|
||||||
changed = EINA_FALSE;
|
changed = EINA_FALSE;
|
||||||
|
|
||||||
|
INF("open fallback file");
|
||||||
/* open icon file */
|
/* open icon file */
|
||||||
icon_ef = eet_open(efreet_icon_cache_file(EFREET_CACHE_ICON_FALLBACK), EET_FILE_MODE_READ_WRITE);
|
icon_ef = eet_open(efreet_icon_cache_file(EFREET_CACHE_ICON_FALLBACK), EET_FILE_MODE_READ_WRITE);
|
||||||
if (!icon_ef) goto on_error_efreet;
|
if (!icon_ef) goto on_error_efreet;
|
||||||
|
@ -950,11 +965,11 @@ main(int argc, char **argv)
|
||||||
if (!theme->dirs)
|
if (!theme->dirs)
|
||||||
theme->dirs = eina_hash_string_superfast_new(NULL);
|
theme->dirs = eina_hash_string_superfast_new(NULL);
|
||||||
|
|
||||||
|
INF("scan fallback icons");
|
||||||
/* Save fallback in the right part */
|
/* Save fallback in the right part */
|
||||||
if (cache_fallback_scan(icons, theme->dirs, &changed))
|
if (cache_fallback_scan(icons, theme->dirs, &changed))
|
||||||
{
|
{
|
||||||
if (verbose)
|
WRN("generated: fallback %i (%i)", changed, eina_hash_population(icons));
|
||||||
fprintf(stderr, "generated: fallback %i (%i)\n", changed, eina_hash_population(icons));
|
|
||||||
if (changed)
|
if (changed)
|
||||||
{
|
{
|
||||||
Eina_Iterator *icons_it;
|
Eina_Iterator *icons_it;
|
||||||
|
@ -997,6 +1012,7 @@ main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
INF("done");
|
||||||
on_error_efreet:
|
on_error_efreet:
|
||||||
efreet_shutdown();
|
efreet_shutdown();
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,7 @@ efreet_base_init(void)
|
||||||
("efreet_base", EFREET_DEFAULT_LOG_COLOR);
|
("efreet_base", EFREET_DEFAULT_LOG_COLOR);
|
||||||
if (_efreet_base_log_dom < 0)
|
if (_efreet_base_log_dom < 0)
|
||||||
{
|
{
|
||||||
ERR("Efreet: Could not create a log domain for efreet_base.\n");
|
EINA_LOG_ERR("Efreet: Could not create a log domain for efreet_base.\n");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
|
|
|
@ -1262,7 +1262,7 @@ desktop_cache_update_free(void *data, void *ev)
|
||||||
EINA_ITERATOR_FOREACH(it, tuple)
|
EINA_ITERATOR_FOREACH(it, tuple)
|
||||||
{
|
{
|
||||||
if (tuple->data == NON_EXISTING) continue;
|
if (tuple->data == NON_EXISTING) continue;
|
||||||
printf("Efreet: %d:%s still in cache on cache close!\n",
|
ERR("Efreet: %d:%s still in cache on cache close!",
|
||||||
((Efreet_Desktop *)tuple->data)->ref, (char *)tuple->key);
|
((Efreet_Desktop *)tuple->data)->ref, (char *)tuple->key);
|
||||||
dangling++;
|
dangling++;
|
||||||
}
|
}
|
||||||
|
@ -1281,11 +1281,11 @@ desktop_cache_update_free(void *data, void *ev)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* TODO: Keep in old_desktop_caches, as we might close ref later */
|
/* TODO: Keep in old_desktop_caches, as we might close ref later */
|
||||||
printf("Efreet: ERROR. There are still %i desktop files with old\n"
|
ERR("Efreet: ERROR. There are still %i desktop files with old\n"
|
||||||
"dangling references to desktop files. This application\n"
|
"dangling references to desktop files. This application\n"
|
||||||
"has not handled the EFREET_EVENT_DESKTOP_CACHE_UPDATE\n"
|
"has not handled the EFREET_EVENT_DESKTOP_CACHE_UPDATE\n"
|
||||||
"fully and released its references. Please fix the application\n"
|
"fully and released its references. Please fix the application\n"
|
||||||
"so it does this.\n",
|
"so it does this.",
|
||||||
dangling);
|
dangling);
|
||||||
}
|
}
|
||||||
old_desktop_caches = eina_list_remove(old_desktop_caches, d);
|
old_desktop_caches = eina_list_remove(old_desktop_caches, d);
|
||||||
|
|
|
@ -114,7 +114,7 @@ efreet_desktop_init(void)
|
||||||
("efreet_desktop", EFREET_DEFAULT_LOG_COLOR);
|
("efreet_desktop", EFREET_DEFAULT_LOG_COLOR);
|
||||||
if (_efreet_desktop_log_dom < 0)
|
if (_efreet_desktop_log_dom < 0)
|
||||||
{
|
{
|
||||||
ERR("Efreet: Could not create a log domain for efreet_desktop");
|
EINA_LOG_ERR("Efreet: Could not create a log domain for efreet_desktop");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,7 @@ efreet_ini_init(void)
|
||||||
("efreet_init", EFREET_DEFAULT_LOG_COLOR);
|
("efreet_init", EFREET_DEFAULT_LOG_COLOR);
|
||||||
if (_efreet_ini_log_dom < 0)
|
if (_efreet_ini_log_dom < 0)
|
||||||
{
|
{
|
||||||
ERR("Efreet: Could not create a log domain for efreet_init");
|
EINA_LOG_ERR("Efreet: Could not create a log domain for efreet_init");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -196,7 +196,7 @@ efreet_ini_parse(const char *file)
|
||||||
{
|
{
|
||||||
/* invalid file - skip line? or refuse to parse file? */
|
/* invalid file - skip line? or refuse to parse file? */
|
||||||
/* just printf for now till we figure out what to do */
|
/* just printf for now till we figure out what to do */
|
||||||
// printf("Invalid file (%s) (missing ] on group name)\n", file);
|
// ERR("Invalid file (%s) (missing ] on group name)", file);
|
||||||
}
|
}
|
||||||
goto next_line;
|
goto next_line;
|
||||||
}
|
}
|
||||||
|
|
|
@ -475,7 +475,7 @@ efreet_menu_init(void)
|
||||||
("efreet_menu", EFREET_DEFAULT_LOG_COLOR);
|
("efreet_menu", EFREET_DEFAULT_LOG_COLOR);
|
||||||
if (_efreet_menu_log_dom < 0)
|
if (_efreet_menu_log_dom < 0)
|
||||||
{
|
{
|
||||||
ERR("Efreet: Could not create a log domain for efreet_menu");
|
EINA_LOG_ERR("Efreet: Could not create a log domain for efreet_menu");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -224,7 +224,7 @@ efreet_mime_init(void)
|
||||||
|
|
||||||
if (_efreet_mime_log_dom < 0)
|
if (_efreet_mime_log_dom < 0)
|
||||||
{
|
{
|
||||||
ERR("Efreet: Could not create a log domain for efreet_mime.");
|
EINA_LOG_ERR("Efreet: Could not create a log domain for efreet_mime.");
|
||||||
goto shutdown_efreet;
|
goto shutdown_efreet;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ efreet_trash_init(void)
|
||||||
("efreet_trash", EFREET_DEFAULT_LOG_COLOR);
|
("efreet_trash", EFREET_DEFAULT_LOG_COLOR);
|
||||||
if (_efreet_trash_log_dom < 0)
|
if (_efreet_trash_log_dom < 0)
|
||||||
{
|
{
|
||||||
ERR("Efreet: Could not create a log domain for efreet_trash");
|
EINA_LOG_ERR("Efreet: Could not create a log domain for efreet_trash");
|
||||||
eina_shutdown();
|
eina_shutdown();
|
||||||
return --_efreet_trash_init_count;
|
return --_efreet_trash_init_count;
|
||||||
}
|
}
|
||||||
|
@ -318,8 +318,9 @@ efreet_trash_ls(void)
|
||||||
snprintf(buf, sizeof(buf), "%s/files", efreet_trash_dir_get(NULL));
|
snprintf(buf, sizeof(buf), "%s/files", efreet_trash_dir_get(NULL));
|
||||||
files = ecore_file_ls(buf);
|
files = ecore_file_ls(buf);
|
||||||
|
|
||||||
EINA_LIST_FOREACH(files, l, infofile)
|
if (eina_log_domain_level_check(_efreet_trash_log_dom, EINA_LOG_LEVEL_INFO))
|
||||||
printf("FILE: %s\n", infofile);
|
EINA_LIST_FOREACH(files, l, infofile)
|
||||||
|
INF("FILE: %s\n", infofile);
|
||||||
|
|
||||||
return files;
|
return files;
|
||||||
}
|
}
|
||||||
|
|
|
@ -61,7 +61,7 @@ efreet_util_init(void)
|
||||||
("efreet_util", EFREET_DEFAULT_LOG_COLOR);
|
("efreet_util", EFREET_DEFAULT_LOG_COLOR);
|
||||||
if (_efreet_utils_log_dom < 0)
|
if (_efreet_utils_log_dom < 0)
|
||||||
{
|
{
|
||||||
ERR("Efreet: Could not create a log domain for efreet_util");
|
EINA_LOG_ERR("Efreet: Could not create a log domain for efreet_util");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,7 @@ efreet_xml_init(void)
|
||||||
if (_efreet_xml_log_dom < 0)
|
if (_efreet_xml_log_dom < 0)
|
||||||
{
|
{
|
||||||
_efreet_xml_init_count--;
|
_efreet_xml_init_count--;
|
||||||
ERR("Efreet: Could not create a log domain for efreet_xml.");
|
EINA_LOG_ERR("Efreet: Could not create a log domain for efreet_xml.");
|
||||||
return _efreet_xml_init_count;
|
return _efreet_xml_init_count;
|
||||||
}
|
}
|
||||||
return _efreet_xml_init_count;
|
return _efreet_xml_init_count;
|
||||||
|
|
Loading…
Reference in New Issue