Skip to content

Commit f66f1ca

Browse files
syyyrmichalvasko
authored andcommitted
Get rid of volatile in favor of ATOMIC_T
1 parent 4ac3b87 commit f66f1ca

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

src/log.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929
/**
3030
* @brief libnetconf verbose level variable
3131
*/
32-
volatile uint8_t verbose_level = 0;
32+
ATOMIC_T verbose_level = 0;
3333

3434
void (*depr_print_clb)(NC_VERB_LEVEL level, const char *msg);
3535
void (*print_clb)(const struct nc_session *session, NC_VERB_LEVEL level, const char *msg);
3636

3737
API void
3838
nc_verbosity(NC_VERB_LEVEL level)
3939
{
40-
verbose_level = level;
40+
ATOMIC_STORE_RELAXED(verbose_level, level);
4141
ly_log_level((LY_LOG_LEVEL)level);
4242
}
4343

src/log_p.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
#include <stdint.h>
2020

21+
#include "compat.h"
2122
#include "log.h"
2223

2324
/*
@@ -36,16 +37,16 @@ void prv_printf(const struct nc_session *session, NC_VERB_LEVEL level, const cha
3637
/**
3738
* @brief Verbose level variable
3839
*/
39-
extern volatile uint8_t verbose_level;
40+
extern ATOMIC_T verbose_level;
4041

4142
/*
4243
* Verbose printing macros
4344
*/
4445
#define ERR(session, format, args ...) prv_printf(session,NC_VERB_ERROR,format,##args)
45-
#define WRN(session, format, args ...) if(verbose_level>=NC_VERB_WARNING){prv_printf(session,NC_VERB_WARNING,format,##args);}
46-
#define VRB(session, format, args ...) if(verbose_level>=NC_VERB_VERBOSE){prv_printf(session,NC_VERB_VERBOSE,format,##args);}
47-
#define DBG(session, format, args ...) if(verbose_level>=NC_VERB_DEBUG){prv_printf(session,NC_VERB_DEBUG,format,##args);}
48-
#define DBL(session, format, args ...) if(verbose_level>=NC_VERB_DEBUG_LOWLVL){prv_printf(session,NC_VERB_DEBUG_LOWLVL,format,##args);}
46+
#define WRN(session, format, args ...) if(ATOMIC_LOAD_RELAXED(verbose_level)>=NC_VERB_WARNING){prv_printf(session,NC_VERB_WARNING,format,##args);}
47+
#define VRB(session, format, args ...) if(ATOMIC_LOAD_RELAXED(verbose_level)>=NC_VERB_VERBOSE){prv_printf(session,NC_VERB_VERBOSE,format,##args);}
48+
#define DBG(session, format, args ...) if(ATOMIC_LOAD_RELAXED(verbose_level)>=NC_VERB_DEBUG){prv_printf(session,NC_VERB_DEBUG,format,##args);}
49+
#define DBL(session, format, args ...) if(ATOMIC_LOAD_RELAXED(verbose_level)>=NC_VERB_DEBUG_LOWLVL){prv_printf(session,NC_VERB_DEBUG_LOWLVL,format,##args);}
4950

5051
#define ERRMEM ERR(NULL, "%s: memory reallocation failed (%s:%d).", __func__, __FILE__, __LINE__)
5152
#define ERRARG(arg) ERR(NULL, "%s: invalid argument (%s).", __func__, arg)

0 commit comments

Comments
 (0)