github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-05-16 20:29:53 +00:00
Code Issues Projects Releases Wiki Activity

tools: acrnlog: improve for log incompleteness problem

Browse Source 
1. add warning when log incompleteness observed;
2. decrease default polling interval to reduce chance of log incompleteness;
3. add option "-t" to allow user to specify the polling interval;
4. modified README.rst to reflect the options.

Reviewed-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com>
Signed-off-by: Yan, Like <like.yan@intel.com>
This commit is contained in:
Yan, Like 2018-06-13 21:47:35 +08:00 committed by lijinxia
parent 57d6a933f6
commit b8bdf171eb
2 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/acrnlog/README.rst
View File

@ -22,6 +22,22 @@ The ``acrnlog`` tool is launched as a service at boot, and limited to
supporting four 1MB log files by default. You can change this log file
limitation temporarily or permanently.
Options:
-h
display the help
-t:
specify a polling interval (ms). Once buffer is empty, acrnlog stops
and starts reading in specified interval.
If an incomplete log warning is reported, please try with a smaller
interval to get a complete log.
-s:
limit the size of each log file, in KB. 0 means no limitation.
-n:
specify the number of log files to keep, old files would be deleted.
Temporary log file changes
==========================

31
tools/acrnlog/acrnlog.c
View File

@ -18,9 +18,13 @@
#define LOG_ELEMENT_SIZE 80
#define LOG_MSG_SIZE 480
#define PCPU_NUM 4
#define DEFAULT_POLL_INTERVAL 100000
#define LOG_INCOMPLETE_WARNING "WARNING: logs missing here! "\
"Try reducing polling interval"
/* num of physical cpu, not the cpu num seen on SOS */
static unsigned int pcpu_num = PCPU_NUM;
static unsigned long interval = DEFAULT_POLL_INTERVAL;
struct hvlog_msg {
__u64 usec; /* timestamp, from tsc reset in usec */
@ -355,15 +359,28 @@ size_t write_log_file(struct hvlog_file * log, const char *buf, size_t len)
static void *cur_read_func(void *arg)
{
struct hvlog_msg *msg;
__u64 last_seq = 0;
char warn_msg[LOG_MSG_SIZE] = {0};
while (1) {
hvlog_dev_read_msg(cur, pcpu_num);
msg = get_min_seq_msg(cur, pcpu_num);
if (!msg) {
usleep(500000);
usleep(interval);
continue;
}
/* if msg->seq is not contineous, warn for logs missing */
if (last_seq + 1 < msg->seq) {
snprintf(warn_msg, LOG_MSG_SIZE,
"\n\n\t%s[%lu ms]\n\n\n",
LOG_INCOMPLETE_WARNING, interval);
write_log_file(&cur_log, warn_msg, strlen(warn_msg));
}
last_seq = msg->seq;
write_log_file(&cur_log, msg->raw, msg->len);
}
@ -371,7 +388,7 @@ static void *cur_read_func(void *arg)
}
/* for user optinal args */
static const char optString[] = "s:n:h";
static const char optString[] = "s:n:t:h";
static void display_usage(void)
{
@ -379,6 +396,7 @@ static void display_usage(void)
"[Usage] acrnlog [-s] [size] [-n] [number]\n\n"
"[Options]\n"
"\t-h: print this message\n"
"\t-t: polling interval to collect logs, in ms\n"
"\t-s: size limitation for each log file, in MB.\n"
"\t 0 means no limitation.\n"
"\t-n: how many files you would like to keep on disk\n"
@ -399,6 +417,15 @@ static int parse_opt(int argc, char *argv[])
if (ret > 3)
hvlog_log_num = ret;
break;
case 't':
ret = atoi(optarg);
if (ret <= 0 || ret >=1000) {
printf("'-t' require integer between [1-999]\n");
return -EINVAL;
}
interval = ret * 1000;
printf("Polling interval is %u ms\n", ret);
break;
case 'h':
display_usage();
return -EINVAL;