maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split

Browse Source 
Tested with one UE
Possibly broken FLEXRAN (different methods for configuring the link manager)
This commit is contained in:
Nikos Makris
2018-04-05 13:22:12 +03:00
parent 73691de7f6 1272cabb35
commit 4195681fc9
246 changed files with 30644 additions and 19464 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/UTIL/ASYNC_IF/ringbuffer_queue.c
+1 -1
View File
@@ -117,7 +117,7 @@ int message_get(message_queue_t *queue, void **data, int *size, int *priority) {
return 0;
}
message_queue_t destroy_message_queue(message_queue_t *queue) {
void destroy_message_queue(message_queue_t *queue) {
struct lfds700_misc_prng_state ls;
message_t *m;
openair2/UTIL/ASYNC_IF/ringbuffer_queue.h
+1 -1
View File
@@ -48,6 +48,6 @@ typedef struct {
message_queue_t * new_message_queue(int size);
int message_put(message_queue_t *queue, void *data, int size, int priority);
int message_get(message_queue_t *queue, void **data, int *size, int *priority);
message_queue_t destroy_message_queue(message_queue_t *queue);
void destroy_message_queue(message_queue_t *queue);
#endif /* RINGBUFFER_QUEUE_H */
openair2/UTIL/LOG/log.c
+4 -3
View File
@@ -34,6 +34,7 @@
#define COMPONENT_LOG
#define COMPONENT_LOG_IF
#include <ctype.h>
#define LOG_MAIN
#include "log.h"
#include "vcd_signal_dumper.h"
#include "assertions.h"
@@ -46,7 +47,7 @@
# include <string.h>
#include "common/config/config_userapi.h"
// main log variables
log_t *g_log;
mapping log_level_names[] = {
{"emerg", LOG_EMERG},
@@ -1589,7 +1590,7 @@ int set_log(int component, int level, int interval)
component, MIN_LOG_COMPONENTS, MAX_LOG_COMPONENTS);
DevCheck((level <= LOG_TRACE) && (level >= LOG_EMERG), level, LOG_TRACE,
LOG_EMERG);
DevCheck((interval > 0) && (interval <= 0xFF), interval, 0, 0xFF);
DevCheck((interval >= 0) && (interval <= 0xFF), interval, 0, 0xFF);
g_log->log_component[component].level = level;
@@ -1623,7 +1624,7 @@ int set_comp_log(int component, int level, int verbosity, int interval)
component, MIN_LOG_COMPONENTS, MAX_LOG_COMPONENTS);
DevCheck((level <= LOG_TRACE) && (level >= LOG_EMERG), level, LOG_TRACE,
LOG_EMERG);
DevCheck((interval > 0) && (interval <= 0xFF), interval, 0, 0xFF);
DevCheck((interval >= 0) && (interval <= 0xFF), interval, 0, 0xFF);
#if 0
if ((verbosity == LOG_NONE) || (verbosity == LOG_LOW) ||
openair2/UTIL/LOG/log.h
+13 -3
View File
@@ -255,7 +255,17 @@ typedef enum log_instance_type_e {
void log_set_instance_type (log_instance_type_t instance);
#endif
#ifdef LOG_MAIN
log_t *g_log;
#else
#ifdef __cplusplus
extern "C" {
#endif
extern log_t *g_log;
#ifdef __cplusplus
}
#endif
#endif
/*--- INCLUDES ---------------------------------------------------------------*/
# include "log_if.h"
/*----------------------------------------------------------------------------*/
@@ -281,9 +291,9 @@ void *log_thread_function(void * list);
* @brief Macro used to call tr_log_full_ex with file, function and line information
* @{*/
#ifdef LOG_NO_THREAD
#define logIt(component, level, format, args...) logRecord_mt(__FILE__, __FUNCTION__, __LINE__, component, level, format, ##args)
#define logIt(component, level, format, args...) (g_log->log_component[component].interval?logRecord_mt(__FILE__, __FUNCTION__, __LINE__, component, level, format, ##args):(void)0)
#else //default
#define logIt(component, level, format, args...) logRecord(__FILE__, __FUNCTION__, __LINE__, component, level, format, ##args)
#define logIt(component, level, format, args...) (g_log->log_component[component].interval?logRecord(__FILE__, __FUNCTION__, __LINE__, component, level, format, ##args):(void)0)
#endif
/* @}*/