Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
White Rabbit Switch - Software
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
86
Issues
86
List
Board
Labels
Milestones
Merge Requests
4
Merge Requests
4
CI / CD
CI / CD
Pipelines
Schedules
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
White Rabbit Switch - Software
Commits
af38d6fb
Commit
af38d6fb
authored
Jun 18, 2019
by
Maciej Lipinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[WIP] add vacility to wrs_msg and <facility.priority> to output msgs
parent
7660e01d
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
21 additions
and
16 deletions
+21
-16
wrs-msg.h
userspace/libwr/include/libwr/wrs-msg.h
+3
-1
wrs-msg.c
userspace/libwr/wrs-msg.c
+7
-4
wr_mon.c
userspace/tools/wr_mon.c
+1
-1
wr_phytool.c
userspace/tools/wr_phytool.c
+1
-1
wrs_checkcfg.c
userspace/tools/wrs_checkcfg.c
+1
-1
wrs_sfp_dump.c
userspace/tools/wrs_sfp_dump.c
+1
-1
wrs_status_led.c
userspace/tools/wrs_status_led.c
+1
-1
wrs_throttling.c
userspace/tools/wrs_throttling.c
+1
-1
wrs_version.c
userspace/tools/wrs_version.c
+1
-1
wrs_vlans.c
userspace/tools/wrs_vlans.c
+1
-1
wrs_watchdog.c
userspace/wrs_watchdog/wrs_watchdog.c
+1
-1
hal_main.c
userspace/wrsw_hal/hal_main.c
+1
-1
rtud.c
userspace/wrsw_rtud/rtud.c
+1
-1
No files found.
userspace/libwr/include/libwr/wrs-msg.h
View file @
af38d6fb
...
...
@@ -28,7 +28,7 @@ extern void wrs_msg_filename(char *name);
extern
int
wrs_msg_level
;
/* user can set it in main() or whatever */
/* Optional: prepare all defaults. Like argv[0] to be prefixed, signals... */
extern
void
wrs_msg_init
(
int
argc
,
char
**
argv
);
extern
void
wrs_msg_init
(
int
argc
,
char
**
argv
,
int
facility
);
#ifdef DEBUG
/* We had it, so let's keep this build-time thing */
# define WRS_MSG_DEFAULT_LEVEL LOG_DEBUG
...
...
@@ -36,6 +36,8 @@ extern void wrs_msg_init(int argc, char **argv);
# define WRS_MSG_DEFAULT_LEVEL LOG_INFO
#endif
#define WRS_MSG_DEFAULT_FACILITY LOG_USER
/* User facility by default */
#define WRS_MSG_DETAILS_AT LOG_DEBUG
/* >= for debug use __LINE__ */
/* This is the external function for it all */
...
...
userspace/libwr/wrs-msg.c
View file @
af38d6fb
...
...
@@ -14,6 +14,7 @@
#endif
int
wrs_msg_level
=
WRS_MSG_DEFAULT_LEVEL
;
int
wrs_msg_facility
=
WRS_MSG_DEFAULT_FACILITY
;
/* We use debug, info, warning, error and "silent" */
static
int
wrs_msg_used_levels
[]
=
{
...
...
@@ -40,7 +41,7 @@ static FILE *wrs_msg_f = (FILE *)-1; /* Means "not yet set" */
static
char
*
prgname
;
/* always print argv[0], or we get lost */
/* This function is optional, up to the user whether to call it or not */
void
wrs_msg_init
(
int
argc
,
char
**
argv
)
void
wrs_msg_init
(
int
argc
,
char
**
argv
,
int
facility
)
{
int
i
;
int
max
=
ARRAY_SIZE
(
wrs_msg_used_levels
)
-
1
;
...
...
@@ -116,6 +117,7 @@ void wrs_msg_init(int argc, char **argv)
}
wrs_msg_level
=
wrs_msg_used_levels
[
wrs_msg_pos
];
wrs_msg_facility
=
facility
;
/* Prepare for run-time changes */
signal
(
SIGUSR1
,
wrs_msg_sighandler
);
...
...
@@ -140,8 +142,8 @@ void __wrs_msg(int level, const char *func, int line, const char *fmt, ...)
va_list
args
;
static
char
*
header_string
[]
=
{
[
LOG_ALERT
]
=
""
,
[
LOG_ERR
]
=
"Error
:
"
,
[
LOG_WARNING
]
=
"Warning
:
"
,
[
LOG_ERR
]
=
"Error"
,
[
LOG_WARNING
]
=
"Warning"
,
[
LOG_INFO
]
=
""
,
[
LOG_DEBUG
]
=
""
};
...
...
@@ -158,7 +160,8 @@ void __wrs_msg(int level, const char *func, int line, const char *fmt, ...)
asprintf
(
&
prgname
,
"<pid-%i>"
,
getpid
());
/* Program name and header, and possibly function and line too */
fprintf
(
wrs_msg_f
,
"%s: %s"
,
prgname
,
header_string
[
level
]);
fprintf
(
wrs_msg_f
,
"<%d>%s (%s):"
,
(
wrs_msg_facility
|
level
),
header_string
[
level
],
prgname
);
if
(
level
>=
WRS_MSG_DETAILS_AT
)
fprintf
(
wrs_msg_f
,
"%s:%i: "
,
func
,
line
);
...
...
userspace/tools/wr_mon.c
View file @
af38d6fb
...
...
@@ -1137,7 +1137,7 @@ int main(int argc, char *argv[])
/* try a pps_gen based approach */
uint64_t
last_seconds
=
0
;
wrs_msg_init
(
argc
,
argv
);
wrs_msg_init
(
argc
,
argv
,
LOG_USER
);
while
((
opt
=
getopt
(
argc
,
argv
,
"himsoetabwqvH:"
))
!=
-
1
)
{
switch
(
opt
)
...
...
userspace/tools/wr_phytool.c
View file @
af38d6fb
...
...
@@ -591,7 +591,7 @@ int main(int argc, char **argv)
int
i
;
int
ep
;
wrs_msg_init
(
1
,
argv
);
/* only use argv[0]: no cmdline */
wrs_msg_init
(
1
,
argv
,
LOG_USER
);
/* only use argv[0]: no cmdline */
if
(
argc
<
3
)
{
...
...
userspace/tools/wrs_checkcfg.c
View file @
af38d6fb
...
...
@@ -12,7 +12,7 @@ int main(int argc, char **argv)
{
int
err
,
verbose
=
0
;
wrs_msg_init
(
argc
,
argv
);
wrs_msg_init
(
argc
,
argv
,
LOG_USER
);
me_lazy:
if
(
argc
<
2
||
!
strcmp
(
argv
[
1
],
"-h"
)
||
!
strcmp
(
argv
[
1
],
"--help"
))
{
...
...
userspace/tools/wrs_sfp_dump.c
View file @
af38d6fb
...
...
@@ -303,7 +303,7 @@ int main(int argc, char **argv)
struct
shw_sfp_dom
hal_sfp_raw_dom_lc
[
HAL_MAX_PORTS
];
wrs_msg_init
(
argc
,
argv
);
wrs_msg_init
(
argc
,
argv
,
LOG_USER
);
nports
=
18
;
dump_port
=
1
;
...
...
userspace/tools/wrs_status_led.c
View file @
af38d6fb
...
...
@@ -55,7 +55,7 @@ int main(int argc, char **argv)
int
opt
;
/* argc forced to 1: -q and -v are not "quiet" and "verbose" */
wrs_msg_init
(
argc
,
argv
);
wrs_msg_init
(
argc
,
argv
,
LOG_USER
);
assert_init
(
shw_pio_mmap_init
());
shw_io_init
();
...
...
userspace/tools/wrs_throttling.c
View file @
af38d6fb
...
...
@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
prgname
=
argv
[
0
];
wrs_msg_init
(
argc
,
argv
);
wrs_msg_init
(
argc
,
argv
,
LOG_USER
);
if
(
shw_fpga_mmap_init
()
<
0
)
{
pr_error
(
"%s: Can't access device memory
\n
"
,
prgname
);
...
...
userspace/tools/wrs_version.c
View file @
af38d6fb
...
...
@@ -208,7 +208,7 @@ int main(int argc, char **argv)
char
func
=
'a'
;
/* argc forced to 1: -t and -v are not "terse" and "verbose" */
wrs_msg_init
(
1
,
argv
);
wrs_msg_init
(
1
,
argv
,
LOG_USER
);
if
(
argc
>=
2
&&
argv
[
1
][
0
]
==
'-'
)
{
...
...
userspace/tools/wrs_vlans.c
View file @
af38d6fb
...
...
@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
char
*
prgname
;
wrs_msg_level
=
LOG_WARNING
;
wrs_msg_init
(
argc
,
argv
);
wrs_msg_init
(
argc
,
argv
,
LOG_USER
);
prgname
=
argv
[
0
];
if
(
NPORTS
>
8
*
sizeof
(
portmask
))
{
...
...
userspace/wrs_watchdog/wrs_watchdog.c
View file @
af38d6fb
...
...
@@ -275,7 +275,7 @@ int main(int argc, char *argv[])
return
0
;
}
wrs_msg_init
(
argc
,
argv
);
wrs_msg_init
(
argc
,
argv
,
LOG_DAEMON
);
if
(
shw_fpga_mmap_init
()
<
0
)
{
pr_error
(
"%s: Can't access device memory
\n
"
,
prgname
);
...
...
userspace/wrsw_hal/hal_main.c
View file @
af38d6fb
...
...
@@ -229,7 +229,7 @@ int main(int argc, char *argv[])
static
timeout_t
update_fan_tmo
;
static
timeout_t
update_all_tmo
;
wrs_msg_init
(
argc
,
argv
);
wrs_msg_init
(
argc
,
argv
,
LOG_DAEMON
);
/* Print HAL's version */
pr_info
(
"wrsw_hal. Commit %s, built on "
__DATE__
"
\n
"
,
__GIT_VER__
);
...
...
userspace/wrsw_rtud/rtud.c
View file @
af38d6fb
...
...
@@ -375,7 +375,7 @@ int main(int argc, char **argv)
unsigned
long
aging_res
=
DEFAULT_AGING_RES
;
// Aging resolution [sec.]
unsigned
long
aging_time
=
DEFAULT_AGING_TIME
;
// Aging time [sec.]
wrs_msg_init
(
argc
,
argv
);
wrs_msg_init
(
argc
,
argv
,
LOG_DAEMON
);
/* Print RTUd's version */
pr_info
(
"wrsw_rtud. Commit %s, built on "
__DATE__
"
\n
"
,
__GIT_VER__
);
...
...
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