michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ext: nffs: update for enabling statistic

Browse source 
Origin: Apache Mynewt NFFS
URL: https://github.com/apache/mynewt-nffs/tree/master
Commit: 199575aa8b309dfe809cc59b9c6854ccdad9bdf7
Maintained-by: External

This patch introduce version whitch enables NFFS statistic.
Statistic functionalities were (recently) introduced within
mgmtm subsystem.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
This commit is contained in:
Andrzej Puzdrowski 2018-03-21 15:44:38 +01:00 • committed by Carles Cufí
commit a8b801f171
2 changed files with 60 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

36
ext/fs/nffs/include/nffs/nffs.h
View file

@ -25,6 +25,11 @@
#include <nffs/config.h>
#include <nffs/queue.h>
#if __ZEPHYR__
#include <zephyr/types.h>
#include <stats.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif
@ -284,6 +289,36 @@ struct nffs_dir {
struct nffs_dirent nd_dirent;
};
#ifdef STATS_SECT_START
/* Mynewt team can enable statistic once they
* start building this codebase.
*/
STATS_SECT_START(nffs_stats)
STATS_SECT_ENTRY(nffs_hashcnt_ins)
STATS_SECT_ENTRY(nffs_hashcnt_rm)
STATS_SECT_ENTRY(nffs_object_count)
STATS_SECT_ENTRY(nffs_iocnt_read)
STATS_SECT_ENTRY(nffs_iocnt_write)
STATS_SECT_ENTRY(nffs_gccnt)
STATS_SECT_ENTRY(nffs_readcnt_data)
STATS_SECT_ENTRY(nffs_readcnt_block)
STATS_SECT_ENTRY(nffs_readcnt_crc)
STATS_SECT_ENTRY(nffs_readcnt_copy)
STATS_SECT_ENTRY(nffs_readcnt_format)
STATS_SECT_ENTRY(nffs_readcnt_gccollate)
STATS_SECT_ENTRY(nffs_readcnt_inode)
STATS_SECT_ENTRY(nffs_readcnt_inodeent)
STATS_SECT_ENTRY(nffs_readcnt_rename)
STATS_SECT_ENTRY(nffs_readcnt_update)
STATS_SECT_ENTRY(nffs_readcnt_filename)
STATS_SECT_ENTRY(nffs_readcnt_object)
STATS_SECT_ENTRY(nffs_readcnt_detect)
STATS_SECT_END;
extern STATS_SECT_DECL(nffs_stats) nffs_stats;
#else
#define STATS_INC(sectvarname, var)
#endif
extern void *nffs_file_mem;
extern void *nffs_block_entry_mem;
extern void *nffs_inode_mem;
@ -527,7 +562,6 @@ int nffs_write_to_file(struct nffs_file *file, const void *data, int len);
#define NFFS_LOG(lvl, ...)
#define MYNEWT_VAL(val) 0
#define ASSERT_IF_TEST(cond)
#define STATS_INC(sectvarname, var)
#else

25
ext/fs/nffs/src/nffs.c
View file

@ -32,3 +32,28 @@ struct nffs_area_desc *nffs_current_area_descs;
struct nffs_inode_entry *nffs_root_dir;
struct nffs_inode_entry *nffs_lost_found_dir;
#ifdef STATS_SECT_START
STATS_SECT_DECL(nffs_stats) nffs_stats;
STATS_NAME_START(nffs_stats)
STATS_NAME(nffs_stats, nffs_hashcnt_ins)
STATS_NAME(nffs_stats, nffs_hashcnt_rm)
STATS_NAME(nffs_stats, nffs_object_count)
STATS_NAME(nffs_stats, nffs_iocnt_read)
STATS_NAME(nffs_stats, nffs_iocnt_write)
STATS_NAME(nffs_stats, nffs_gccnt)
STATS_NAME(nffs_stats, nffs_readcnt_data)
STATS_NAME(nffs_stats, nffs_readcnt_block)
STATS_NAME(nffs_stats, nffs_readcnt_crc)
STATS_NAME(nffs_stats, nffs_readcnt_copy)
STATS_NAME(nffs_stats, nffs_readcnt_format)
STATS_NAME(nffs_stats, nffs_readcnt_gccollate)
STATS_NAME(nffs_stats, nffs_readcnt_inode)
STATS_NAME(nffs_stats, nffs_readcnt_inodeent)
STATS_NAME(nffs_stats, nffs_readcnt_rename)
STATS_NAME(nffs_stats, nffs_readcnt_update)
STATS_NAME(nffs_stats, nffs_readcnt_filename)
STATS_NAME(nffs_stats, nffs_readcnt_object)
STATS_NAME(nffs_stats, nffs_readcnt_detect)
STATS_NAME_END(nffs_stats);
#endif