KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

os: Make streams abstract. 

Also replace windows kernel stream with null implementation. It was
severely limited and no easy means to test it now.
This commit is contained in:
José Fonseca 2010-02-14 16:55:04 +00:00
parent e7660a5442
commit 2b4575f16d
6 changed files with 175 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/auxiliary/Makefile
View File

@ -50,7 +50,7 @@ C_SOURCES = \
indices/u_unfilled_gen.c \
os/os_misc.c \
os/os_stream_stdc.c \
os/os_stream_wd.c \
os/os_stream_null.c \
os/os_time.c \
pipebuffer/pb_buffer_malloc.c \
pipebuffer/pb_bufmgr_alt.c \

2
src/gallium/auxiliary/SConscript
View File

@ -84,7 +84,7 @@ source = [
'indices/u_unfilled_gen.c',
'os/os_misc.c',
'os/os_stream_stdc.c',
'os/os_stream_wd.c',
'os/os_stream_null.c',
'os/os_time.c',
'pipebuffer/pb_buffer_fenced.c',
'pipebuffer/pb_buffer_malloc.c',

55
src/gallium/auxiliary/os/os_stream.h
View File

@ -37,25 +37,54 @@
#include "pipe/p_compiler.h"
struct os_stream;
/**
* Create a stream
* @param filename relative or absolute path (necessary for windows)
* @param optional maximum file size (0 for a growable size).
* OS stream (FILE, socket, etc) abstraction.
*/
struct os_stream
{
void
(*close)(struct os_stream *stream);
boolean
(*write)(struct os_stream *stream, const void *data, size_t size);
void
(*flush)(struct os_stream *stream);
};
static INLINE void
os_stream_close(struct os_stream *stream)
{
stream->close(stream);
}
static INLINE boolean
os_stream_write(struct os_stream *stream, const void *data, size_t size)
{
return stream->write(stream, data, size);
}
static INLINE void
os_stream_flush(struct os_stream *stream)
{
stream->flush(stream);
}
struct os_stream *
os_stream_create(const char *filename, size_t max_size);
os_file_stream_create(const char *filename);
boolean
os_stream_write(struct os_stream *stream, const void *data, size_t size);
void
os_stream_flush(struct os_stream *stream);
struct os_stream *
os_null_stream_create(void);
void
os_stream_close(struct os_stream *stream);
#if defined(PIPE_SUBSYSTEM_WINDOWS_DISPLAY)
#define os_file_stream_create(_filename) os_null_stream_create()
#endif
#endif /* _OS_STREAM_H_ */

72
src/gallium/auxiliary/os/os_stream_null.c Normal file
View File

@ -0,0 +1,72 @@
/**************************************************************************
*
* 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
* Stream implementation for the Windows Display driver.
*/
#include "os_memory.h"
#include "os_stream.h"
static void
os_null_stream_close(struct os_stream *stream)
{
(void)stream;
}
static boolean
os_null_stream_write(struct os_stream *stream, const void *data, size_t size)
{
(void)data;
(void)size;
return TRUE;
}
static void
os_null_stream_flush(struct os_stream *stream)
{
(void)stream;
}
static struct os_stream
os_null_stream = {
&os_null_stream_close,
&os_null_stream_write,
&os_null_stream_flush
};
struct os_stream *
os_null_stream_create()
{
return &os_null_stream;
}

101
src/gallium/auxiliary/os/os_stream_stdc.c
View File

@ -40,59 +40,26 @@
#include "os_stream.h"
struct os_stream
struct os_stdc_stream
{
struct os_stream base;
FILE *file;
};
struct os_stream *
os_stream_create(const char *filename, size_t max_size)
static INLINE struct os_stdc_stream *
os_stdc_stream(struct os_stream *stream)
{
struct os_stream *stream;
(void)max_size;
stream = (struct os_stream *)calloc(1, sizeof(struct os_stream));
if(!stream)
goto no_stream;
stream->file = fopen(filename, "w");
if(!stream->file)
goto no_file;
return stream;
no_file:
free(stream);
no_stream:
return NULL;
return (struct os_stdc_stream *)stream;
}
boolean
os_stream_write(struct os_stream *stream, const void *data, size_t size)
static void
os_stdc_stream_close(struct os_stream *_stream)
{
if(!stream)
return FALSE;
return fwrite(data, size, 1, stream->file) == size ? TRUE : FALSE;
}
struct os_stdc_stream *stream = os_stdc_stream(_stream);
void
os_stream_flush(struct os_stream *stream)
{
if(!stream)
return;
fflush(stream->file);
}
void
os_stream_close(struct os_stream *stream)
{
if(!stream)
return;
@ -102,4 +69,54 @@ os_stream_close(struct os_stream *stream)
}
static boolean
os_stdc_stream_write(struct os_stream *_stream, const void *data, size_t size)
{
struct os_stdc_stream *stream = os_stdc_stream(_stream);
if(!stream)
return FALSE;
return fwrite(data, size, 1, stream->file) == size ? TRUE : FALSE;
}
static void
os_stdc_stream_flush(struct os_stream *_stream)
{
struct os_stdc_stream *stream = os_stdc_stream(_stream);
if(!stream)
return;
fflush(stream->file);
}
struct os_stream *
os_file_stream_create(const char *filename)
{
struct os_stdc_stream *stream;
stream = (struct os_stdc_stream *)calloc(1, sizeof(struct os_stream));
if(!stream)
goto no_stream;
stream->base.close = &os_stdc_stream_close;
stream->base.write = &os_stdc_stream_write;
stream->base.flush = &os_stdc_stream_flush;
stream->file = fopen(filename, "w");
if(!stream->file)
goto no_file;
return &stream->base;
no_file:
free(stream);
no_stream:
return NULL;
}
#endif

222
src/gallium/auxiliary/os/os_stream_wd.c
View File

@ -1,222 +0,0 @@
/**************************************************************************
*
* 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
* Stream implementation for the Windows Display driver.
*/
#include "pipe/p_config.h"
#if defined(PIPE_SUBSYSTEM_WINDOWS_DISPLAY)
#include <windows.h>
#include <winddi.h>
#include "os_memory.h"
#include "os_stream.h"
#define MAP_FILE_SIZE (4*1024*1024)
struct os_stream
{
char filename[MAX_PATH + 1];
WCHAR wFileName[MAX_PATH + 1];
boolean growable;
size_t map_size;
ULONG_PTR iFile;
char *pMap;
size_t written;
unsigned suffix;
};
static INLINE boolean
os_stream_map(struct os_stream *stream)
{
ULONG BytesInUnicodeString;
static char filename[MAX_PATH + 1];
unsigned filename_len;
if(stream->growable)
filename_len = snprintf(filename,
sizeof(filename),
"%s.%04x",
stream->filename,
stream->suffix++);
else
filename_len = snprintf(filename,
sizeof(filename),
"%s",
stream->filename);
EngMultiByteToUnicodeN(
stream->wFileName,
sizeof(stream->wFileName),
&BytesInUnicodeString,
filename,
filename_len);
stream->pMap = EngMapFile(stream->wFileName, stream->map_size, &stream->iFile);
if(!stream->pMap)
return FALSE;
memset(stream->pMap, 0, stream->map_size);
stream->written = 0;
return TRUE;
}
static INLINE void
os_stream_unmap(struct os_stream *stream)
{
EngUnmapFile(stream->iFile);
if(stream->written < stream->map_size) {
/* Truncate file size */
stream->pMap = EngMapFile(stream->wFileName, stream->written, &stream->iFile);
if(stream->pMap)
EngUnmapFile(stream->iFile);
}
stream->pMap = NULL;
}
static INLINE void
os_stream_full_qualified_filename(char *dst, size_t size, const char *src)
{
boolean need_drive, need_root;
if((('A' <= src[0] && src[0] <= 'Z') || ('a' <= src[0] && src[0] <= 'z')) && src[1] == ':') {
need_drive = FALSE;
need_root = src[2] == '\\' ? FALSE : TRUE;
}
else {
need_drive = TRUE;
need_root = src[0] == '\\' ? FALSE : TRUE;
}
snprintf(dst, size,
"\\??\\%s%s%s",
need_drive ? "C:" : "",
need_root ? "\\" : "",
src);
}
struct os_stream *
os_stream_create(const char *filename, size_t max_size)
{
struct os_stream *stream;
stream = CALLOC_STRUCT(os_stream);
if(!stream)
goto error1;
os_stream_full_qualified_filename(stream->filename,
sizeof(stream->filename),
filename);
if(max_size) {
stream->growable = FALSE;
stream->map_size = max_size;
}
else {
stream->growable = TRUE;
stream->map_size = MAP_FILE_SIZE;
}
if(!os_stream_map(stream))
goto error2;
return stream;
error2:
FREE(stream);
error1:
return NULL;
}
static INLINE void
os_stream_copy(struct os_stream *stream, const char *data, size_t size)
{
assert(stream->written + size <= stream->map_size);
memcpy(stream->pMap + stream->written, data, size);
stream->written += size;
}
boolean
os_stream_write(struct os_stream *stream, const void *data, size_t size)
{
if(!stream)
return FALSE;
if(!stream->pMap)
return FALSE;
while(stream->written + size > stream->map_size) {
size_t step = stream->map_size - stream->written;
os_stream_copy(stream, data, step);
data = (const char *)data + step;
size -= step;
os_stream_unmap(stream);
if(!stream->growable || !os_stream_map(stream))
return FALSE;
}
os_stream_copy(stream, data, size);
return TRUE;
}
void
os_stream_flush(struct os_stream *stream)
{
(void)stream;
}
void
os_stream_close(struct os_stream *stream)
{
if(!stream)
return;
os_stream_unmap(stream);
FREE(stream);
}
#endif