os: A stream for debug logging.

Just a wrapper around os_log_message. Although it would probably make
more sense to be the other way around.

Also some comment fixes.

diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile
index 7e4335f29f4c406d87cc44cf3527255a248f9097..ff7695150e2184858c01e1018e896d9be3698e3a 100644 (file)
--- a/src/gallium/auxiliary/Makefile
+++ b/src/gallium/auxiliary/Makefile
@@ -49,6 +49,7 @@ C_SOURCES = \
        indices/u_indices_gen.c \
        indices/u_unfilled_gen.c \
        os/os_misc.c \
+       os/os_stream_log.c \
        os/os_stream_stdc.c \
        os/os_stream_str.c \
        os/os_stream_null.c \

diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript
index e13ac9187cbd5d4820700fc719677820e6523e27..b531ad2dbd9f8c48bb47b661fe293b877944df3d 100644 (file)
--- a/src/gallium/auxiliary/SConscript
+++ b/src/gallium/auxiliary/SConscript
@@ -83,6 +83,7 @@ source = [
     'indices/u_indices_gen.c',
     'indices/u_unfilled_gen.c',
     'os/os_misc.c',
+    'os/os_stream_log.c',
     'os/os_stream_stdc.c',
     'os/os_stream_str.c',
     'os/os_stream_null.c',

diff --git a/src/gallium/auxiliary/os/os_stream.h b/src/gallium/auxiliary/os/os_stream.h
index 3423b84d6915f8d66a3f61c6d1bd2703fee1f280..693a0621e2d374c215ee65026569723ef053c0a0 100644 (file)
--- a/src/gallium/auxiliary/os/os_stream.h
+++ b/src/gallium/auxiliary/os/os_stream.h
@@ -99,6 +99,10 @@ struct os_stream *
 os_null_stream_create(void);
 
 
+extern struct os_stream *
+os_log_stream;
+
+
 struct os_stream *
 os_str_stream_create(size_t initial_size);
 

diff --git a/src/gallium/auxiliary/os/os_stream_log.c b/src/gallium/auxiliary/os/os_stream_log.c
new file mode 100644 (file)
index 0000000..7cc2028
--- /dev/null
+++ b/src/gallium/auxiliary/os/os_stream_log.c
@@ -0,0 +1,81 @@
+/**************************************************************************
+ *
+ * Copyright 2008-2010 VMware, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
+
+/**
+ * @file
+ * Debug logging stream implementation.
+ */
+
+#include "os_memory.h"
+#include "os_misc.h"
+#include "os_stream.h"
+
+
+static void
+os_log_stream_close(struct os_stream *stream)
+{
+   (void)stream;
+}
+
+
+static boolean
+os_log_stream_write(struct os_stream *stream, const void *data, size_t size)
+{
+   char *str;
+
+   str = os_malloc(size + 1);
+   if (!str)
+      return FALSE;
+
+   memcpy(str, data, size);
+   str[size] = 0;
+
+   os_log_message(str);
+
+   os_free(str);
+
+   return TRUE;
+}
+
+
+static void
+os_log_stream_flush(struct os_stream *stream)
+{
+   (void)stream;
+}
+
+
+static struct os_stream
+os_log_stream_struct = {
+   &os_log_stream_close,
+   &os_log_stream_write,
+   &os_log_stream_flush
+};
+
+
+struct os_stream *
+os_log_stream = &os_log_stream_struct;

diff --git a/src/gallium/auxiliary/os/os_stream_null.c b/src/gallium/auxiliary/os/os_stream_null.c
index b55ce9c926efa13abc2c0fdc93095fcef1185a8a..128c4e8f0e097159e4241c7cc25ed15c8133a228 100644 (file)
--- a/src/gallium/auxiliary/os/os_stream_null.c
+++ b/src/gallium/auxiliary/os/os_stream_null.c
@@ -27,7 +27,7 @@
 
 /**
  * @file
- * Stream implementation for the Windows Display driver.
+ * Null stream implementation.
  */
 
 #include "os_memory.h"

diff --git a/src/gallium/auxiliary/os/os_stream_str.c b/src/gallium/auxiliary/os/os_stream_str.c
index a2884798d63ee8b279be0e46e8c3fdd370cacc69..b5c7270d2ae08b6439cd6dbb833b42866227de7a 100644 (file)
--- a/src/gallium/auxiliary/os/os_stream_str.c
+++ b/src/gallium/auxiliary/os/os_stream_str.c
@@ -27,7 +27,7 @@
 
 /**
  * @file
- * Stream implementation based on the Standard C Library.
+ * Malloc string stream implementation.
  */
 
 #include "pipe/p_config.h"