Skip to content

W
White Rabbit Switch - Software
Commit 84ade34e authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

userspace/tools: add -H parameter to wr_mon to analyze shmem binary dumps 

It is needed to ignore WRS_SHM_LOCKED flag and ignore_alive to get wr_mon
working.
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent 7aa9e51b
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 3 deletions
userspace/tools/wr_mon.c
View file @ 84ade34e
...@@ -54,6 +54,8 @@ static struct hal_temp_sensors temp_sensors_local; ...@@ -54,6 +54,8 @@ static struct hal_temp_sensors temp_sensors_local;
static uint64_t seconds; static uint64_t seconds;
static uint32_t nanoseconds; static uint32_t nanoseconds;
/* ignore checking if process is alive */
static int ignore_alive;
void help(char *prgname) void help(char *prgname)
{ {
...@@ -72,6 +74,7 @@ void help(char *prgname) ...@@ -72,6 +74,7 @@ void help(char *prgname)
" -a show all (same as -i -m -s -o -e -t options)\n" " -a show all (same as -i -m -s -o -e -t options)\n"
" -b black and white output\n" " -b black and white output\n"
" -w web interface mode\n" " -w web interface mode\n"
" -H <dir> Open shmem dumps from the given directory\n"
"\n" "\n"
"During execution the user can enter 'q' to exit the program\n" "During execution the user can enter 'q' to exit the program\n"
"and 't' to toggle printing of state information on/off\n"); "and 't' to toggle printing of state information on/off\n");
...@@ -524,8 +527,10 @@ void show_all(void) ...@@ -524,8 +527,10 @@ void show_all(void)
__GIT_VER__); __GIT_VER__);
} }
hal_alive = (hal_head->pid && (kill(hal_head->pid, 0) == 0)); hal_alive = (hal_head->pid && (kill(hal_head->pid, 0) == 0))
ppsi_alive = (ppsi_head->pid && (kill(ppsi_head->pid, 0) == 0)); + ignore_alive;
ppsi_alive = (ppsi_head->pid && (kill(ppsi_head->pid, 0) == 0))
+ ignore_alive;
if (mode & SHOW_WR_TIME) { if (mode & SHOW_WR_TIME) {
if (ppsi_alive) if (ppsi_alive)
...@@ -574,7 +579,7 @@ int main(int argc, char *argv[]) ...@@ -574,7 +579,7 @@ int main(int argc, char *argv[])
wrs_msg_init(argc, argv); wrs_msg_init(argc, argv);
while ((opt = getopt(argc, argv, "himsoetabwqv")) != -1) { while ((opt = getopt(argc, argv, "himsoetabwqvH:")) != -1) {
switch(opt) switch(opt)
{ {
case 'h': case 'h':
...@@ -606,6 +611,12 @@ int main(int argc, char *argv[]) ...@@ -606,6 +611,12 @@ int main(int argc, char *argv[])
case 'w': case 'w':
mode |= WEB_INTERFACE; mode |= WEB_INTERFACE;
break; break;
case 'H':
wrs_shm_set_path(optarg);
/* ignore WRS_SHM_LOCKED flag */
wrs_shm_ignore_flag_locked(1);
ignore_alive = 1;
break;
case 'q': break; /* done in wrs_msg_init() */ case 'q': break; /* done in wrs_msg_init() */
case 'v': break; /* done in wrs_msg_init() */ case 'v': break; /* done in wrs_msg_init() */
default: default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment