Merge remote-tracking branch 'origin/remove-not-needed-global-vars' into integration_2024_w49 (!3140)
remove un-necessary global variables Remove global variables that can be removed by a trivial way: - simply dead globals - or reference is a single source, so can be static setting them static reduces the scope, that is a progress, but of course as for all static variables, the code is still not re-entrant
This commit is contained in:
@@ -69,13 +69,13 @@ typedef struct {
|
||||
|
||||
static log_mem_cnt_t log_mem_d[2];
|
||||
static int log_mem_flag = 0;
|
||||
volatile int log_mem_side=0;
|
||||
static volatile int log_mem_side = 0;
|
||||
static pthread_mutex_t log_mem_lock;
|
||||
static pthread_cond_t log_mem_notify;
|
||||
static pthread_t log_mem_thread;
|
||||
static int log_mem_file_cnt=0;
|
||||
volatile int log_mem_write_flag=0;
|
||||
volatile int log_mem_write_side=0;
|
||||
static volatile int log_mem_write_flag = 0;
|
||||
static volatile int log_mem_write_side = 0;
|
||||
static char * log_mem_filename;
|
||||
|
||||
static mapping log_level_names[] = {{"error", OAILOG_ERR},
|
||||
|
||||
@@ -43,6 +43,8 @@
|
||||
|
||||
#include "common/config/config_userapi.h"
|
||||
#include "load_module_shlib.h"
|
||||
loader_data_t loader_data;
|
||||
|
||||
void loader_init(void) {
|
||||
paramdef_t LoaderParams[] = LOADER_PARAMS_DESC;
|
||||
|
||||
|
||||
@@ -32,9 +32,6 @@
|
||||
#ifndef LOAD_SHLIB_H
|
||||
#define LOAD_SHLIB_H
|
||||
|
||||
|
||||
|
||||
|
||||
typedef struct {
|
||||
char *fname;
|
||||
int (*fptr)(void);
|
||||
@@ -68,11 +65,10 @@ typedef int(*checkverfunc_t)(char * mainexec_version, char ** shlib_version);
|
||||
/* the function array when calling load_module_shlib (farray param NULL) */
|
||||
typedef int(*getfarrayfunc_t)(loader_shlibfunc_t **funcarray);
|
||||
|
||||
#ifdef LOAD_MODULE_SHLIB_MAIN
|
||||
#define LOADER_CONFIG_PREFIX "loader"
|
||||
#define DEFAULT_PATH ""
|
||||
#define DEFAULT_MAXSHLIBS 10
|
||||
loader_data_t loader_data;
|
||||
extern loader_data_t loader_data;
|
||||
|
||||
/*----------------------------------------------------------------------------------------------------------------------------------------------------------*/
|
||||
/* LOADER parameters */
|
||||
@@ -85,13 +81,8 @@ loader_data_t loader_data;
|
||||
}
|
||||
// clang-format on
|
||||
|
||||
/*-------------------------------------------------------------------------------------------------------------*/
|
||||
#else /* LOAD_MODULE_SHLIB_MAIN */
|
||||
|
||||
extern int load_module_version_shlib(char *modname, char *version, loader_shlibfunc_t *farray, int numf, void *initfunc_arg);
|
||||
extern void * get_shlibmodule_fptr(char *modname, char *fname);
|
||||
extern loader_data_t loader_data;
|
||||
#endif /* LOAD_MODULE_SHLIB_MAIN */
|
||||
int load_module_version_shlib(char *modname, char *version, loader_shlibfunc_t *farray, int numf, void *initfunc_arg);
|
||||
void *get_shlibmodule_fptr(char *modname, char *fname);
|
||||
#define load_module_shlib(M, F, N, I) load_module_version_shlib(M, NULL, F, N, I)
|
||||
void loader_reset();
|
||||
#endif
|
||||
|
||||
@@ -434,7 +434,7 @@ typedef struct timer_elm_s {
|
||||
void itti_send_terminate_message(task_id_t task_id) {
|
||||
}
|
||||
|
||||
sem_t itti_sem_block;
|
||||
static sem_t itti_sem_block;
|
||||
void itti_wait_tasks_unblock()
|
||||
{
|
||||
int rc = sem_post(&itti_sem_block);
|
||||
|
||||
Reference in New Issue
Block a user