Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
openairinterface5G
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
150
Issues
150
List
Board
Labels
Milestones
Merge Requests
11
Merge Requests
11
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
oai
openairinterface5G
Commits
b1920797
Commit
b1920797
authored
Sep 04, 2018
by
Haruki Naoi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Fix: --log-mem options is erased."
This reverts commit
31821838
.
parent
0eb74771
Pipeline
#10452
failed with stage
in 0 seconds
Changes
8
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
21 additions
and
312 deletions
+21
-312
log.c
common/utils/LOG/log.c
+18
-283
log.h
common/utils/LOG/log.h
+0
-14
log_extern.h
common/utils/LOG/log_extern.h
+0
-3
assertions.h
common/utils/itti/assertions.h
+1
-0
signals.c
common/utils/itti/signals.c
+0
-3
lte-softmodem.c
targets/RT/USER/lte-softmodem.c
+2
-7
lte-softmodem.h
targets/RT/USER/lte-softmodem.h
+0
-1
lte-uesoftmodem.c
targets/RT/USER/lte-uesoftmodem.c
+0
-1
No files found.
common/utils/LOG/log.c
View file @
b1920797
This diff is collapsed.
Click to expand it.
common/utils/LOG/log.h
View file @
b1920797
...
...
@@ -269,20 +269,6 @@ int is_newline( char *str, int size);
int
register_log_component
(
char
*
name
,
char
*
fext
,
int
compidx
);
#define LOG_MEM_SIZE 500*1024*1024
#define LOG_MEM_FILE "./logmem.log"
void
flush_mem_to_file
(
void
);
void
log_output_memory
(
const
char
*
file
,
const
char
*
func
,
int
line
,
int
comp
,
int
level
,
const
char
*
format
,
va_list
args
);
int
logInit_log_mem
(
void
);
void
close_log_mem
(
void
);
typedef
struct
{
char
*
buf_p
;
int
buf_index
;
int
enable_flag
;
}
log_mem_cnt_t
;
/* @}*/
/*!\fn int32_t write_file_matlab(const char *fname, const char *vname, void *data, int length, int dec, char format);
...
...
common/utils/LOG/log_extern.h
View file @
b1920797
...
...
@@ -28,6 +28,3 @@ extern mapping log_level_names[];
extern
mapping
log_options
[];
extern
mapping
log_maskmap
[];
extern
int
log_mem_flag
;
extern
char
*
log_mem_filename
;
extern
char
logmem_filename
[
1024
];
common/utils/itti/assertions.h
View file @
b1920797
...
...
@@ -35,6 +35,7 @@
#ifndef ASSERTIONS_H_
#define ASSERTIONS_H_
void
output_log_mem
(
void
);
#define _Assert_Exit_ \
{ \
fprintf(stderr, "\nExiting execution\n"); \
...
...
common/utils/itti/signals.c
View file @
b1920797
...
...
@@ -117,21 +117,18 @@ int signal_handle(int *end)
case
SIGUSR1
:
SIG_DEBUG
(
"Received SIGUSR1
\n
"
);
*
end
=
1
;
close_log_mem
();
break
;
case
SIGSEGV
:
/* Fall through */
case
SIGABRT
:
SIG_DEBUG
(
"Received SIGABORT
\n
"
);
backtrace_handle_signal
(
&
info
);
close_log_mem
();
break
;
case
SIGINT
:
printf
(
"Received SIGINT
\n
"
);
itti_send_terminate_message
(
TASK_UNKNOWN
);
*
end
=
1
;
close_log_mem
();
break
;
default:
...
...
targets/RT/USER/lte-softmodem.c
View file @
b1920797
...
...
@@ -70,7 +70,6 @@
unsigned
short
config_frames
[
4
]
=
{
2
,
9
,
11
,
13
};
#endif
#include "common/utils/LOG/log.h"
#include "common/utils/LOG/log_extern.h"
#include "UTIL/OTG/otg_tx.h"
#include "UTIL/OTG/otg_externs.h"
#include "UTIL/MATH/oml.h"
...
...
@@ -142,6 +141,7 @@ static int8_t threequarter_fs=0;
uint32_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
int32_t
uplink_frequency_offset
[
MAX_NUM_CCs
][
4
];
// This is a dummy declaration (dlsch_demodulation.c is no longer compiled for eNodeB)
int16_t
dlsch_demod_shift
=
0
;
...
...
@@ -550,12 +550,7 @@ static void get_options(void) {
if
(
start_telnetsrv
)
{
load_module_shlib
(
"telnetsrv"
,
NULL
,
0
);
}
if
(
strlen
(
logmem_filename
)
>
0
)
{
log_mem_filename
=
&
logmem_filename
[
0
];
log_mem_flag
=
1
;
printf
(
"Enabling OPT for log save at memory %s
\n
"
,
log_mem_filename
);
logInit_log_mem
();
}
if
(
!
(
CONFIG_ISFLAGSET
(
CONFIG_ABORT
))
)
{
...
...
targets/RT/USER/lte-softmodem.h
View file @
b1920797
...
...
@@ -202,7 +202,6 @@
{"R" , CONFIG_HLP_FLOG, 0, uptr:&online_log_messages, defintval:1, TYPE_INT, 0}, \
{"g" , CONFIG_HLP_LOGL, 0, uptr:&glog_level, defintval:0, TYPE_UINT, 0}, \
{"telnetsrv", CONFIG_HLP_TELN, PARAMFLAG_BOOL, uptr:&start_telnetsrv, defintval:0, TYPE_UINT, 0}, \
{"log-mem", NULL, 0, strptr:(char **)&logmem_filename, defstrval:"./logmem.log", TYPE_STRING, sizeof(logmem_filename)}, \
}
#define CMDLINE_ONLINELOG_IDX 0
#define CMDLINE_GLOGLEVEL_IDX 1
...
...
targets/RT/USER/lte-uesoftmodem.c
View file @
b1920797
...
...
@@ -71,7 +71,6 @@
#include "PHY_INTERFACE/phy_interface_vars.h"
#include "common/utils/LOG/log.h"
#include "common/utils/LOG/log_extern.h"
#include "UTIL/OTG/otg_tx.h"
#include "UTIL/OTG/otg_externs.h"
#include "UTIL/MATH/oml.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment