Changeset d8de5d3 in mainline for uspace/lib/c/generic/io/klog.c

Timestamp:

2011-05-23T13:31:54Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

540cb1b, 773f188

Parents:

207533f

Message:

do not reinvent the wheel in assert_abort(), use the services of printf_core() to implement a more elegant klog output
(printf_core should be safe w.r.t. nested assertions and memory allocation)

File:

• uspace/lib/c/generic/io/klog.c (modified) (2 diffs)

uspace/lib/c/generic/io/klog.c

@@ -38 +38 @@
 #include <sys/types.h>
 #include <unistd.h>
+#include <errno.h>
 #include <io/klog.h>
+#include <io/printf_core.h>
 
 size_t klog_write(const void *buf, size_t size)
@@ -55 +57 @@
 }
 
+/** Print formatted text to klog.
+ *
+ * @param fmt Format string
+ *
+ * \see For more details about format string see printf_core.
+ *
+ */
+int klog_printf(const char *fmt, ...)
+{
+        va_list args;
+        va_start(args, fmt);
+        
+        int ret = klog_vprintf(fmt, args);
+        
+        va_end(args);
+        
+        return ret;
+}
+
+static int klog_vprintf_str_write(const char *str, size_t size, void *data)
+{
+        size_t wr = klog_write(str, size);
+        return str_nlength(str, wr);
+}
+
+static int klog_vprintf_wstr_write(const wchar_t *str, size_t size, void *data)
+{
+        size_t offset = 0;
+        size_t chars = 0;
+        
+        while (offset < size) {
+                char buf[STR_BOUNDS(1)];
+                size_t sz = 0;
+                
+                if (chr_encode(str[chars], buf, &sz, STR_BOUNDS(1)) == EOK)
+                        klog_write(buf, sz);
+                
+                chars++;
+                offset += sizeof(wchar_t);
+        }
+        
+        return chars;
+}
+
+/** Print formatted text to klog.
+ *
+ * @param fmt Format string
+ * @param ap  Format parameters
+ *
+ * \see For more details about format string see printf_core.
+ *
+ */
+int klog_vprintf(const char *fmt, va_list ap)
+{
+        printf_spec_t ps = {
+                klog_vprintf_str_write,
+                klog_vprintf_wstr_write,
+                NULL
+        };
+        
+        return printf_core(fmt, &ps, ap);
+}
+
 /** @}
  */