patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

settings: enable logging

Browse source 
This patch introduce logging to settings.

Error in stored data record might occurred in runtime, so
better to switch assertion to error logging.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
This commit is contained in:
Andrzej Puzdrowski 2019-03-06 15:25:00 +01:00 committed by Anas Nashif
parent 922f53864f
commit 4e4048fadf
5 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
subsys/settings/Kconfig
View file

@ -15,6 +15,12 @@ menuconfig SETTINGS
It supports several back-ends to store and load serialized data from
and it can do so atomically for all involved modules.
if SETTINGS
module = SETTINGS
module-str = settings
source "subsys/logging/Kconfig.template.log_config"
endif
# Hidden option to enable encoding length into settings entry
config SETTINGS_ENCODE_LEN
depends on SETTINGS

3
subsys/settings/src/settings.c
View file

@ -14,6 +14,9 @@
#include "settings_priv.h"
#include <zephyr/types.h>
#include <logging/log.h>
LOG_MODULE_REGISTER(settings, CONFIG_SETTINGS_LOG_LEVEL);
sys_slist_t settings_handlers;
static u8_t settings_cmd_inited;

12
subsys/settings/src/settings_fcb.c
View file

@ -13,6 +13,9 @@
#include "settings/settings_fcb.h"
#include "settings_priv.h"
#include <logging/log.h>
LOG_MODULE_DECLARE(settings, CONFIG_SETTINGS_LOG_LEVEL);
#define SETTINGS_FCB_VERS 1
struct settings_fcb_load_cb_arg {
@ -211,11 +214,16 @@ static void settings_fcb_compress(struct settings_fcb *cf)
continue;
}
rc = fcb_append_finish(&cf->cf_fcb, &loc2.loc);
__ASSERT(rc == 0, "Failed to finish fcb_append.\n");
if (rc != 0) {
LOG_ERR("Failed to finish fcb_append (%d)", rc);
}
}
rc = fcb_rotate(&cf->cf_fcb);
__ASSERT(rc == 0, "Failed to fcb rotate.\n");
if (rc != 0) {
LOG_ERR("Failed to fcb rotate (%d)", rc);
}
}
static size_t get_len_cb(void *ctx)

8
subsys/settings/src/settings_line.c
View file

@ -7,7 +7,6 @@
#include <ctype.h>
#include <string.h>
#include <misc/__assert.h>
#include "settings/settings.h"
#include "settings_priv.h"
@ -16,7 +15,8 @@
#include "base64.h"
#endif
#include "misc/printk.h"
#include <logging/log.h>
LOG_MODULE_DECLARE(settings, CONFIG_SETTINGS_LOG_LEVEL);
int settings_line_parse(char *buf, char **namep, char **valp)
{
@ -447,7 +447,9 @@ size_t settings_line_val_get_len(off_t val_off, void *read_cb_ctx)
rc = settings_line_raw_read(len - 2, raw, 2, &len, read_cb_ctx);
if (rc || len != 2) {
/* very unexpected error */
__ASSERT(rc == 0, "Failed to read the storage.\n");
if (rc != 0) {
LOG_ERR("Failed to read the storage (%d)", rc);
}
return 0;
}

15
subsys/settings/src/settings_store.c
View file

@ -12,11 +12,13 @@
#include <stddef.h>
#include <sys/types.h>
#include <errno.h>
#include <misc/__assert.h>
#include "settings/settings.h"
#include "settings_priv.h"
#include <logging/log.h>
LOG_MODULE_DECLARE(settings, CONFIG_SETTINGS_LOG_LEVEL);
struct settings_dup_check_arg {
const char *name;
const char *val;
@ -48,8 +50,15 @@ void settings_dst_register(struct settings_store *cs)
static void settings_load_cb(char *name, void *val_read_cb_ctx, off_t off,
void *cb_arg)
{
int rc = settings_set_value_priv(name, val_read_cb_ctx, off, 0);
__ASSERT(rc == 0, "set-value operation failure\n");
int rc = settings_set_value_priv(name, val_read_cb_ctx, off, 0);
if (rc != 0) {
LOG_ERR("set-value failure. key: %s error(%d)",
name, rc);
} else {
LOG_DBG("set-value OK. key: %s",
name);
}
(void)rc;
}