From 9665aa1df93b3eeebc2b05a5528439267c6b93fa Mon Sep 17 00:00:00 2001 From: Christian Thaeter Date: Wed, 14 Jan 2009 14:50:25 +0100 Subject: [PATCH] Apply log levels to existing errors --- src/backend/filedescriptor.c | 6 +++--- src/backend/filehandle.c | 9 ++++++--- src/backend/filehandlecache.c | 3 ++- src/backend/mmap.c | 3 ++- src/common/config.c | 2 +- src/common/config_typed.c | 8 ++++---- src/common/plugin.c | 2 +- 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/backend/filedescriptor.c b/src/backend/filedescriptor.c index 8f68e3e42..e27bf66f0 100644 --- a/src/backend/filedescriptor.c +++ b/src/backend/filedescriptor.c @@ -141,7 +141,7 @@ lumiera_filedescriptor_acquire (const char* name, int flags, LList filenode) INFO (filedescriptor, "try creating dir: %s", dir); if (mkdir (dir, 0777) == -1 && errno != EEXIST) { - LUMIERA_ERROR_SET (filedescriptor, ERRNO, name); + LUMIERA_ERROR_SET_CRITICAL (filedescriptor, ERRNO, name); goto error; } *slash = '/'; @@ -152,14 +152,14 @@ lumiera_filedescriptor_acquire (const char* name, int flags, LList filenode) fd = creat (name, 0666); if (fd == -1) { - LUMIERA_ERROR_SET (filedescriptor, ERRNO, name); + LUMIERA_ERROR_SET_CRITICAL (filedescriptor, ERRNO, name); goto error; } close (fd); if (stat (name, &fdesc.stat) != 0) { /* finally, no luck */ - LUMIERA_ERROR_SET (filedescriptor, ERRNO, name); + LUMIERA_ERROR_SET_CRITICAL (filedescriptor, ERRNO, name); goto error; } } diff --git a/src/backend/filehandle.c b/src/backend/filehandle.c index 2197a0805..86d9107f2 100644 --- a/src/backend/filehandle.c +++ b/src/backend/filehandle.c @@ -84,7 +84,8 @@ lumiera_filehandle_handle (LumieraFilehandle self) fd = open (lumiera_filedescriptor_name (self->descriptor), lumiera_filedescriptor_flags (self->descriptor) & LUMIERA_FILE_MASK); if (fd == -1) { - LUMIERA_ERROR_SET (filehandle, ERRNO, lumiera_filedescriptor_name (self->descriptor)); + FIXME ("Handle EMFILE etc with the resourcecollector"); + LUMIERA_ERROR_SET_CRITICAL (filehandle, ERRNO, lumiera_filedescriptor_name (self->descriptor)); } else { @@ -92,13 +93,15 @@ lumiera_filehandle_handle (LumieraFilehandle self) if (fstat (fd, &st) == -1) { close (fd); - LUMIERA_ERROR_SET (filehandle, ERRNO, lumiera_filedescriptor_name (self->descriptor)); + fd = -1; + LUMIERA_ERROR_SET_CRITICAL (filehandle, ERRNO, lumiera_filedescriptor_name (self->descriptor)); } else if (!lumiera_filedescriptor_samestat (self->descriptor, &st)) { close (fd); + fd = -1; /* Woops this is not the file we expected to use */ - LUMIERA_ERROR_SET (filehandle, FILE_CHANGED, lumiera_filedescriptor_name (self->descriptor)); + LUMIERA_ERROR_SET_CRITICAL (filehandle, FILE_CHANGED, lumiera_filedescriptor_name (self->descriptor)); } } self->fd = fd; diff --git a/src/backend/filehandlecache.c b/src/backend/filehandlecache.c index 23dd5fb74..fcec07202 100644 --- a/src/backend/filehandlecache.c +++ b/src/backend/filehandlecache.c @@ -84,8 +84,9 @@ lumiera_filehandlecache_handle_acquire (LumieraFilehandlecache self, LumieraFile /* allocate new filehandle if we are below the limit or no cached handles are available (overallocating) */ NOTICE (filehandlecache, "overallocating filehandle"); ret = lumiera_filehandle_new (desc); + TODO ("use resourcecollector here"); if (!ret) - LUMIERA_ERROR_SET (filehandlecache, FILEHANDLECACHE_NOHANDLE, lumiera_filedescriptor_name (desc)); + LUMIERA_ERROR_SET_ALERT (filehandlecache, FILEHANDLECACHE_NOHANDLE, lumiera_filedescriptor_name (desc)); else --self->available; } diff --git a/src/backend/mmap.c b/src/backend/mmap.c index f39bafc12..d06c8effb 100644 --- a/src/backend/mmap.c +++ b/src/backend/mmap.c @@ -124,6 +124,7 @@ lumiera_mmap_init (LumieraMMap self, LumieraFile file, off_t start, size_t size) { TODO ("check if current mmapped size exceeds configured as_size (as_size be smaller than retrieved from getrlimit())"); + TODO ("use resourcecllector here"); switch (strategy++) { case FIRST_TRY: @@ -173,7 +174,7 @@ lumiera_mmap_init (LumieraMMap self, LumieraFile file, off_t start, size_t size) break; case GIVE_UP: - LUMIERA_ERROR_SET (mmap, MMAP_SPACE, lumiera_filedescriptor_name (file->descriptor)); + LUMIERA_ERROR_SET_ALERT (mmap, MMAP_SPACE, lumiera_filedescriptor_name (file->descriptor)); goto espace; } diff --git a/src/common/config.c b/src/common/config.c index 34d78dcdb..af994ab64 100644 --- a/src/common/config.c +++ b/src/common/config.c @@ -208,7 +208,7 @@ lumiera_config_get (const char* key, const char** value) *value = item->delim+1; } else - LUMIERA_ERROR_SET (configsys, CONFIG_NO_ENTRY, key); + LUMIERA_ERROR_SET_WARNING (configsys, CONFIG_NO_ENTRY, key); } } else diff --git a/src/common/config_typed.c b/src/common/config_typed.c index 4fb55e6cc..aec3fce6c 100644 --- a/src/common/config_typed.c +++ b/src/common/config_typed.c @@ -82,7 +82,7 @@ lumiera_config_number_get (const char* key, long long* value) } } else - LUMIERA_ERROR_SET (configsys, CONFIG_NO_ENTRY, key); + LUMIERA_ERROR_SET_WARNING (configsys, CONFIG_NO_ENTRY, key); } } @@ -208,7 +208,7 @@ lumiera_config_string_get (const char* key, const char** value) *value = scan_string (raw_value); } else - LUMIERA_ERROR_SET (configsys, CONFIG_NO_ENTRY, key); + LUMIERA_ERROR_SET_WARNING (configsys, CONFIG_NO_ENTRY, key); } } @@ -253,7 +253,7 @@ lumiera_config_wordlist_get (const char* key, const char** value) *value = raw_value; } else - LUMIERA_ERROR_SET (configsys, CONFIG_NO_ENTRY, key); + LUMIERA_ERROR_SET_WARNING (configsys, CONFIG_NO_ENTRY, key); TODO ("remove the ERROR_SET because config_get sets it already? also in all other getters in this file"); } @@ -322,7 +322,7 @@ lumiera_config_word_get (const char* key, const char** value) *value = scan_word (raw_value); } else - LUMIERA_ERROR_SET (configsys, CONFIG_NO_ENTRY, key); + LUMIERA_ERROR_SET_WARNING (configsys, CONFIG_NO_ENTRY, key); } } diff --git a/src/common/plugin.c b/src/common/plugin.c index e5045b8e9..ae71ea8b3 100644 --- a/src/common/plugin.c +++ b/src/common/plugin.c @@ -289,7 +289,7 @@ lumiera_plugin_register (LumieraPlugin plugin) } else { - LUMIERA_ERROR_SET (plugin, PLUGIN_REGISTER, plugin->name); + LUMIERA_ERROR_SET_CRITICAL (plugin, PLUGIN_REGISTER, plugin->name); } } return !!lumiera_error_peek();