Re: [Intel-gfx] [PATCH igt 1/2] lib: Export kmsg()
On Wed, Feb 21, 2018 at 11:28:45AM +, Chris Wilson wrote: > Export the kmsg() function for use by tests to write into the kernel > message log, useful for tests to inline their progress with kernel error > messages. > > Signed-off-by: Chris Wilson Reviewed-by: Arkadiusz Hiler both patches and pushed. ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [PATCH igt 1/2] lib: Export kmsg()
Export the kmsg() function for use by tests to write into the kernel
message log, useful for tests to inline their progress with kernel error
messages.
Signed-off-by: Chris Wilson
---
lib/igt_core.c | 20 ++--
lib/igt_core.h | 17 +
2 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/lib/igt_core.c b/lib/igt_core.c
index 558a538d..c292343d 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -386,16 +386,7 @@ void igt_log_buffer_inspect(igt_buffer_log_handler_t
check, void *data)
pthread_mutex_unlock(&log_buffer_mutex);
}
-__attribute__((format(printf, 1, 2)))
-static void kmsg(const char *format, ...)
-#define KERN_EMER "<0>"
-#define KERN_ALERT "<1>"
-#define KERN_CRIT "<2>"
-#define KERN_ERR "<3>"
-#define KERN_WARNING "<4>"
-#define KERN_NOTICE"<5>"
-#define KERN_INFO "<6>"
-#define KERN_DEBUG "<7>"
+void igt_kmsg(const char *format, ...)
{
va_list ap;
FILE *file;
@@ -811,7 +802,7 @@ out:
if (!list_subtests) {
kick_fbcon(false);
- kmsg(KERN_INFO "[IGT] %s: executing\n", command_str);
+ igt_kmsg(KMSG_INFO "%s: executing\n", command_str);
print_version();
sync();
@@ -938,7 +929,8 @@ bool __igt_run_subtest(const char *subtest_name)
return false;
}
- kmsg(KERN_INFO "[IGT] %s: starting subtest %s\n", command_str,
subtest_name);
+ igt_kmsg(KMSG_INFO "%s: starting subtest %s\n",
+command_str, subtest_name);
igt_debug("Starting subtest: %s\n", subtest_name);
_igt_log_buffer_reset();
@@ -1447,8 +1439,8 @@ void igt_exit(void)
}
if (command_str)
- kmsg(KERN_INFO "[IGT] %s: exiting, ret=%d\n",
-command_str, igt_exitcode);
+ igt_kmsg(KMSG_INFO "%s: exiting, ret=%d\n",
+command_str, igt_exitcode);
igt_debug("Exiting with status code %d\n", igt_exitcode);
for (int c = 0; c < num_test_children; c++)
diff --git a/lib/igt_core.h b/lib/igt_core.h
index f8543d65..7af2b4c1 100644
--- a/lib/igt_core.h
+++ b/lib/igt_core.h
@@ -932,4 +932,21 @@ int igt_system_quiet(const char *command);
free(buf); \
} while (0)
+/**
+ * igt_kmsg:
+ * @format: printf-style format string with optional args
+ *
+ * Writes a message into the kernel log file (/dev/kmsg).
+ */
+__attribute__((format(printf, 1, 2)))
+void igt_kmsg(const char *format, ...);
+#define KMSG_EMER "<0>[IGT] "
+#define KMSG_ALERT "<1>[IGT] "
+#define KMSG_CRIT "<2>[IGT] "
+#define KMSG_ERR "<3>[IGT] "
+#define KMSG_WARNING "<4>[IGT] "
+#define KMSG_NOTICE"<5>[IGT] "
+#define KMSG_INFO "<6>[IGT] "
+#define KMSG_DEBUG "<7>[IGT] "
+
#endif /* IGT_CORE_H */
--
2.16.1
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [PATCH igt 1/2] lib: Export kmsg()
Export the kmsg() function for use by tests to write into the kernel
message log, useful for tests to inline their progress with kernel error
messages.
Signed-off-by: Chris Wilson
---
lib/igt_core.c | 20 ++--
lib/igt_core.h | 17 +
2 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/lib/igt_core.c b/lib/igt_core.c
index 777687b5f..cec5f066b 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -385,16 +385,7 @@ void igt_log_buffer_inspect(igt_buffer_log_handler_t
check, void *data)
pthread_mutex_unlock(&log_buffer_mutex);
}
-__attribute__((format(printf, 1, 2)))
-static void kmsg(const char *format, ...)
-#define KERN_EMER "<0>"
-#define KERN_ALERT "<1>"
-#define KERN_CRIT "<2>"
-#define KERN_ERR "<3>"
-#define KERN_WARNING "<4>"
-#define KERN_NOTICE"<5>"
-#define KERN_INFO "<6>"
-#define KERN_DEBUG "<7>"
+void igt_kmsg(const char *format, ...)
{
va_list ap;
FILE *file;
@@ -810,7 +801,7 @@ out:
if (!list_subtests) {
kick_fbcon(false);
- kmsg(KERN_INFO "[IGT] %s: executing\n", command_str);
+ igt_kmsg(KMSG_INFO "%s: executing\n", command_str);
print_version();
sync();
@@ -937,7 +928,8 @@ bool __igt_run_subtest(const char *subtest_name)
return false;
}
- kmsg(KERN_INFO "[IGT] %s: starting subtest %s\n", command_str,
subtest_name);
+ igt_kmsg(KMSG_INFO "%s: starting subtest %s\n",
+command_str, subtest_name);
igt_debug("Starting subtest: %s\n", subtest_name);
_igt_log_buffer_reset();
@@ -1444,8 +1436,8 @@ void igt_exit(void)
}
if (command_str)
- kmsg(KERN_INFO "[IGT] %s: exiting, ret=%d\n",
-command_str, igt_exitcode);
+ igt_kmsg(KMSG_INFO "%s: exiting, ret=%d\n",
+command_str, igt_exitcode);
igt_debug("Exiting with status code %d\n", igt_exitcode);
for (int c = 0; c < num_test_children; c++)
diff --git a/lib/igt_core.h b/lib/igt_core.h
index f8543d658..7af2b4c10 100644
--- a/lib/igt_core.h
+++ b/lib/igt_core.h
@@ -932,4 +932,21 @@ int igt_system_quiet(const char *command);
free(buf); \
} while (0)
+/**
+ * igt_kmsg:
+ * @format: printf-style format string with optional args
+ *
+ * Writes a message into the kernel log file (/dev/kmsg).
+ */
+__attribute__((format(printf, 1, 2)))
+void igt_kmsg(const char *format, ...);
+#define KMSG_EMER "<0>[IGT] "
+#define KMSG_ALERT "<1>[IGT] "
+#define KMSG_CRIT "<2>[IGT] "
+#define KMSG_ERR "<3>[IGT] "
+#define KMSG_WARNING "<4>[IGT] "
+#define KMSG_NOTICE"<5>[IGT] "
+#define KMSG_INFO "<6>[IGT] "
+#define KMSG_DEBUG "<7>[IGT] "
+
#endif /* IGT_CORE_H */
--
2.15.1
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
