flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-10 17:36:11 +00:00
Code Issues Releases Wiki Activity

lib: add a ring buffer for log entries

Browse Source 
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
This commit is contained in:
Thomas Wood 2015-01-19 15:27:51 +00:00
parent 89201c5328
commit a5f21726cd
2 changed files with 63 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Makefile.am
View File

@ -11,7 +11,8 @@ noinst_HEADERS = check-ndebug.h
AM_CPPFLAGS = -I$(top_srcdir)
AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \
-DIGT_DATADIR=\""$(abs_top_srcdir)/tests"\" \
-DIGT_LOG_DOMAIN=\""$(subst _,-,$*)"\"
-DIGT_LOG_DOMAIN=\""$(subst _,-,$*)"\" \
-pthread
LDADD = $(CAIRO_LIBS)

72
lib/igt_core.c
View File

@ -47,9 +47,8 @@
#include <sys/types.h>
#ifdef __linux__
#include <sys/syscall.h>
#else
#include <pthread.h>
#endif
#include <pthread.h>
#include <sys/utsname.h>
#include <termios.h>
#include <errno.h>
@ -239,6 +238,35 @@ enum {
};
static char* igt_log_domain_filter;
static struct {
char *entries[256];
uint8_t start, end;
} log_buffer;
static pthread_mutex_t log_buffer_mutex = PTHREAD_MUTEX_INITIALIZER;
static void _igt_log_buffer_append(char *line)
{
pthread_mutex_lock(&log_buffer_mutex);
free(log_buffer.entries[log_buffer.end]);
log_buffer.entries[log_buffer.end] = line;
log_buffer.end++;
if (log_buffer.end == log_buffer.start)
log_buffer.start++;
pthread_mutex_unlock(&log_buffer_mutex);
}
static void _igt_log_buffer_reset(void)
{
pthread_mutex_lock(&log_buffer_mutex);
log_buffer.start = log_buffer.end = 0;
pthread_mutex_unlock(&log_buffer_mutex);
}
__attribute__((format(printf, 1, 2)))
static void kmsg(const char *format, ...)
@ -734,6 +762,8 @@ bool __igt_run_subtest(const char *subtest_name)
kmsg(KERN_INFO "%s: starting subtest %s\n", command_str, subtest_name);
igt_debug("Starting subtest: %s\n", subtest_name);
_igt_log_buffer_reset();
gettime(&subtest_time);
return (in_subtest = subtest_name);
}
@ -1532,6 +1562,7 @@ void igt_log(const char *domain, enum igt_log_level level, const char *format, .
void igt_vlog(const char *domain, enum igt_log_level level, const char *format, va_list args)
{
FILE *file;
char *line, *formatted_line;
const char *program_name;
const char *igt_log_level_str[] = {
"DEBUG",
@ -1552,18 +1583,33 @@ void igt_vlog(const char *domain, enum igt_log_level level, const char *format,
if (list_subtests && level <= IGT_LOG_WARN)
return;
if (igt_log_level > level)
if (vasprintf(&line, format, args) == -1)
return;
if (asprintf(&formatted_line, "(%s:%d) %s%s%s: %s", program_name,
getpid(), (domain) ? domain : "", (domain) ? "-" : "",
igt_log_level_str[level], line) == -1) {
goto out;
}
/* append log buffer */
_igt_log_buffer_append(formatted_line);
/* check print log level */
if (igt_log_level > level)
goto out;
/* check domain filter */
if (igt_log_domain_filter) {
/* if null domain and filter is not "application", return */
if (!domain && strcmp(igt_log_domain_filter, "application"))
return;
goto out;
/* else if domain and filter do not match, return */
else if (domain && strcmp(igt_log_domain_filter, domain))
return;
goto out;
}
/* use stderr for warning messages and above */
if (level >= IGT_LOG_WARN) {
file = stderr;
fflush(stdout);
@ -1571,12 +1617,16 @@ void igt_vlog(const char *domain, enum igt_log_level level, const char *format,
else
file = stdout;
if (level != IGT_LOG_INFO) {
fprintf(file, "(%s:%d) %s%s%s: ", program_name, getpid(),
(domain) ? domain : "", (domain) ? "-" : "",
igt_log_level_str[level]);
}
vfprintf(file, format, args);
/* prepend all except information messages with process, domain and log
* level information */
if (level != IGT_LOG_INFO)
fwrite(formatted_line, sizeof(char), strlen(formatted_line),
file);
else
fwrite(line, sizeof(char), strlen(line), file);
out:
free(line);
}
static void igt_alarm_handler(int signal)