sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move mapfile to vips_ namespace

Browse Source
This commit is contained in:
John Cupitt 2011-03-25 12:07:10 +00:00
parent b8e4c57830
commit 6d8950a5c0
7 changed files with 50 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libvips/include/vips/internal.h
View File

@ -83,9 +83,6 @@ int vips__open_image_read( const char *filename );
int vips_image_open_input( VipsImage *image ); int vips_image_open_input( VipsImage *image );
int vips_image_open_output( VipsImage *image ); int vips_image_open_output( VipsImage *image );
int im_mapfile( VipsImage * );
int im_mapfilerw( VipsImage * );
int im_remapfilerw( VipsImage *image );
VipsImage *im_open_header( const char * ); VipsImage *im_open_header( const char * );
@ -193,8 +190,12 @@ struct im_col_tab_disp *im_col_make_tables_RGB( VipsImage *im,
struct im_col_display *d ); struct im_col_display *d );
struct im_col_tab_disp *im_col_display_get_table( struct im_col_display *d ); struct im_col_tab_disp *im_col_display_get_table( struct im_col_display *d );
void *im__mmap( int fd, int writeable, size_t length, gint64 offset ); void *vips__mmap( int fd, int writeable, size_t length, gint64 offset );
int im__munmap( void *start, size_t length ); int vips__munmap( void *start, size_t length );
int vips_mapfile( VipsImage * );
int vips_mapfilerw( VipsImage * );
int vips_remapfilerw( VipsImage * );
int im__write( int, const void *, size_t ); int im__write( int, const void *, size_t );
void im__change_suffix( const char *name, char *out, int mx, void im__change_suffix( const char *name, char *out, int mx,
const char *new_suff, const char **olds, int nolds ); const char *new_suff, const char **olds, int nolds );

7
libvips/include/vips/vips7compat.h
View File

@ -292,9 +292,14 @@ VipsDemandStyle im_char2dhint( const char *str );
#define im_start_fn VipsStartFn #define im_start_fn VipsStartFn
#define im_generate_fn VipsGenerateFn #define im_generate_fn VipsGenerateFn
#define im_stop_fn VipsStopFn #define im_stop_fn VipsStopFn
#define im_generate vips_image_generate #define im_generate vips_image_generate
#define im__mmap vips__mmap
#define im__munmap vips__munmap
#define im_mapfile vips_mapfile
#define im_mapfilerw vips_mapfilerw
#define im_remapfilerw vips_remapfilerw
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /*__cplusplus*/ #endif /*__cplusplus*/

2
libvips/iofuncs/Makefile.am
View File

@ -11,7 +11,7 @@ libiofuncs_la_SOURCES = \
image.c \ image.c \
vips.c \ vips.c \
generate.c \ generate.c \
im_mapfile.c \ mapfile.c \
sinkmemory.c \ sinkmemory.c \
sinkscreen.c \ sinkscreen.c \
sinkdisc.c \ sinkdisc.c \

4
libvips/iofuncs/check.c
View File

@ -153,7 +153,7 @@ convert_otom( IMAGE *im )
{ {
/* just mmap() the whole thing. /* just mmap() the whole thing.
*/ */
if( im_mapfile( im ) ) if( vips_mapfile( im ) )
return( -1 ); return( -1 );
im->data = im->baseaddr + im->sizeof_header; im->data = im->baseaddr + im->sizeof_header;
im->dtype = VIPS_IMAGE_MMAPIN; im->dtype = VIPS_IMAGE_MMAPIN;
@ -379,7 +379,7 @@ im_rwcheck( IMAGE *im )
case VIPS_IMAGE_MMAPIN: case VIPS_IMAGE_MMAPIN:
/* Try to remap read-write. /* Try to remap read-write.
*/ */
if( im_remapfilerw( im ) ) if( vips_remapfilerw( im ) )
return( -1 ); return( -1 );
break; break;

2
libvips/iofuncs/image.c
View File

@ -361,7 +361,7 @@ vips_image_finalize( GObject *gobject )
*/ */
VIPS_DEBUG_MSG( "vips_image_finalize: unmapping file\n" ); VIPS_DEBUG_MSG( "vips_image_finalize: unmapping file\n" );
im__munmap( image->baseaddr, image->length ); vips__munmap( image->baseaddr, image->length );
image->baseaddr = NULL; image->baseaddr = NULL;
image->length = 0; image->length = 0;

70
libvips/iofuncs/im_mapfile.c → libvips/iofuncs/mapfile.c
View File

@ -1,17 +1,4 @@
/* @(#) Function which returns a char pointer at the beginning of the file /* map and unmap files in various ways
* @(#) corresponding to fd.
* @(#)
* @(#) int
* @(#) im_mapfile( im )
* @(#) IMAGE im;
* @(#)
* @(#) As above, but map read-write.
* @(#)
* @(#) int
* @(#) im_mapfilerw( im )
* @(#) IMAGE im;
* @(#)
* @(#) Return -1 on error, 0 for success.
* *
* Copyright: Nicos Dessipris * Copyright: Nicos Dessipris
* Wriiten on: 13/02/1990 * Wriiten on: 13/02/1990
@ -31,6 +18,10 @@
* 5/2/04 JC * 5/2/04 JC
* - now records length as well as base, so we unmap the right amount of * - now records length as well as base, so we unmap the right amount of
* memory even if files change behind our back * memory even if files change behind our back
* 1/1/10
* - set NOCACHE if we can ... helps OS X performance a lot
* 25/3/11
* - move to vips_ namespace
*/ */
/* /*
@ -102,12 +93,13 @@
#endif /*WITH_DMALLOC*/ #endif /*WITH_DMALLOC*/
void * void *
im__mmap( int fd, int writeable, size_t length, gint64 offset ) vips__mmap( int fd, int writeable, size_t length, gint64 offset )
{ {
void *baseaddr; void *baseaddr;
#ifdef DEBUG #ifdef DEBUG
printf( "im__mmap: length = 0x%zx, offset = 0x%lx\n", length, offset ); printf( "vips__mmap: length = 0x%zx, offset = 0x%lx\n",
length, offset );
#endif /*DEBUG*/ #endif /*DEBUG*/
#ifdef OS_WIN32 #ifdef OS_WIN32
@ -138,7 +130,7 @@ im__mmap( int fd, int writeable, size_t length, gint64 offset )
if( !(hMMFile = CreateFileMapping( hFile, if( !(hMMFile = CreateFileMapping( hFile,
NULL, flProtect, 0, 0, NULL )) ) { NULL, flProtect, 0, 0, NULL )) ) {
vips_error_system( GetLastError(), "im_mapfile", vips_error_system( GetLastError(), "vips_mapfile",
"%s", _( "unable to CreateFileMapping" ) ); "%s", _( "unable to CreateFileMapping" ) );
printf( "CreateFileMapping failed: %s\n", vips_error_buffer() ); printf( "CreateFileMapping failed: %s\n", vips_error_buffer() );
return( NULL ); return( NULL );
@ -146,7 +138,7 @@ im__mmap( int fd, int writeable, size_t length, gint64 offset )
if( !(baseaddr = (char *)MapViewOfFile( hMMFile, dwDesiredAccess, if( !(baseaddr = (char *)MapViewOfFile( hMMFile, dwDesiredAccess,
dwFileOffsetHigh, dwFileOffsetLow, length )) ) { dwFileOffsetHigh, dwFileOffsetLow, length )) ) {
vips_error_system( GetLastError(), "im_mapfile", vips_error_system( GetLastError(), "vips_mapfile",
"%s", _( "unable to MapViewOfFile" ) ); "%s", _( "unable to MapViewOfFile" ) );
printf( "MapViewOfFile failed: %s\n", vips_error_buffer() ); printf( "MapViewOfFile failed: %s\n", vips_error_buffer() );
CloseHandle( hMMFile ); CloseHandle( hMMFile );
@ -186,9 +178,9 @@ im__mmap( int fd, int writeable, size_t length, gint64 offset )
baseaddr = mmap( 0, length, prot, MAP_SHARED, fd, (off_t) offset ); baseaddr = mmap( 0, length, prot, MAP_SHARED, fd, (off_t) offset );
if( baseaddr == MAP_FAILED ) { if( baseaddr == MAP_FAILED ) {
vips_error_system( errno, "im_mapfile", vips_error_system( errno, "vips_mapfile",
"%s", _( "unable to mmap" ) ); "%s", _( "unable to mmap" ) );
vips_warn( "im_mapfile", _( "map failed (%s), " vips_warn( "vips_mapfile", _( "map failed (%s), "
"running very low on system resources, " "running very low on system resources, "
"expect a crash soon" ), strerror( errno ) ); "expect a crash soon" ), strerror( errno ) );
return( NULL ); return( NULL );
@ -200,17 +192,17 @@ im__mmap( int fd, int writeable, size_t length, gint64 offset )
} }
int int
im__munmap( void *start, size_t length ) vips__munmap( void *start, size_t length )
{ {
#ifdef OS_WIN32 #ifdef OS_WIN32
if( !UnmapViewOfFile( start ) ) { if( !UnmapViewOfFile( start ) ) {
vips_error_system( GetLastError(), "im_mapfile", vips_error_system( GetLastError(), "vips_mapfile",
"%s", _( "unable to UnmapViewOfFile" ) ); "%s", _( "unable to UnmapViewOfFile" ) );
return( -1 ); return( -1 );
} }
#else /*!OS_WIN32*/ #else /*!OS_WIN32*/
if( munmap( start, length ) < 0 ) { if( munmap( start, length ) < 0 ) {
vips_error_system( errno, "im_mapfile", vips_error_system( errno, "vips_mapfile",
"%s", _( "unable to munmap file" ) ); "%s", _( "unable to munmap file" ) );
return( -1 ); return( -1 );
} }
@ -220,7 +212,7 @@ im__munmap( void *start, size_t length )
} }
int int
im_mapfile( IMAGE *im ) vips_mapfile( VipsImage *im )
{ {
struct stat st; struct stat st;
mode_t m; mode_t m;
@ -228,27 +220,27 @@ im_mapfile( IMAGE *im )
assert( !im->baseaddr ); assert( !im->baseaddr );
/* Check the size of the file; if it is less than 64 bytes, then flag /* Check the size of the file; if it is less than 64 bytes, then flag
* an error. * an error, we won't be able to read the vips header without a segv.
*/ */
g_assert( im->file_length > 0 ); g_assert( im->file_length > 0 );
if( im->file_length < 64 ) { if( im->file_length < 64 ) {
vips_error( "im_mapfile", vips_error( "vips_mapfile",
"%s", _( "file is less than 64 bytes" ) ); "%s", _( "file is less than 64 bytes" ) );
return( -1 ); return( -1 );
} }
if( fstat( im->fd, &st ) == -1 ) { if( fstat( im->fd, &st ) == -1 ) {
vips_error( "im_mapfile", vips_error( "vips_mapfile",
"%s", _( "unable to get file status" ) ); "%s", _( "unable to get file status" ) );
return( -1 ); return( -1 );
} }
m = (mode_t) st.st_mode; m = (mode_t) st.st_mode;
if( !S_ISREG( m ) ) { if( !S_ISREG( m ) ) {
vips_error( "im_mapfile", vips_error( "vips_mapfile",
"%s", _( "not a regular file" ) ); "%s", _( "not a regular file" ) );
return( -1 ); return( -1 );
} }
if( !(im->baseaddr = im__mmap( im->fd, 0, im->file_length, 0 )) ) if( !(im->baseaddr = vips__mmap( im->fd, 0, im->file_length, 0 )) )
return( -1 ); return( -1 );
im->length = im->file_length; im->length = im->file_length;
@ -259,7 +251,7 @@ im_mapfile( IMAGE *im )
/* As above, but map read/write. /* As above, but map read/write.
*/ */
int int
im_mapfilerw( IMAGE *im ) vips_mapfilerw( VipsImage *im )
{ {
struct stat st; struct stat st;
mode_t m; mode_t m;
@ -271,18 +263,18 @@ im_mapfilerw( IMAGE *im )
*/ */
g_assert( im->file_length > 0 ); g_assert( im->file_length > 0 );
if( fstat( im->fd, &st ) == -1 ) { if( fstat( im->fd, &st ) == -1 ) {
vips_error( "im_mapfilerw", vips_error( "vips_mapfilerw",
"%s", _( "unable to get file status" ) ); "%s", _( "unable to get file status" ) );
return( -1 ); return( -1 );
} }
m = (mode_t) st.st_mode; m = (mode_t) st.st_mode;
if( im->file_length < 64 || !S_ISREG( m ) ) { if( im->file_length < 64 || !S_ISREG( m ) ) {
vips_error( "im_mapfile", vips_error( "vips_mapfile",
"%s", _( "unable to read data" ) ); "%s", _( "unable to read data" ) );
return( -1 ); return( -1 );
} }
if( !(im->baseaddr = im__mmap( im->fd, 1, im->file_length, 0 )) ) if( !(im->baseaddr = vips__mmap( im->fd, 1, im->file_length, 0 )) )
return( -1 ); return( -1 );
im->length = im->file_length; im->length = im->file_length;
@ -294,7 +286,7 @@ im_mapfilerw( IMAGE *im )
* we try to remap it read-write. * we try to remap it read-write.
*/ */
int int
im_remapfilerw( IMAGE *image ) vips_remapfilerw( VipsImage *image )
{ {
void *baseaddr; void *baseaddr;
@ -305,19 +297,19 @@ im_remapfilerw( IMAGE *image )
if( !(hMMFile = CreateFileMapping( hFile, if( !(hMMFile = CreateFileMapping( hFile,
NULL, PAGE_READWRITE, 0, 0, NULL )) ) { NULL, PAGE_READWRITE, 0, 0, NULL )) ) {
vips_error_system( GetLastError(), "im_mapfile", vips_error_system( GetLastError(), "vips_mapfile",
"%s", _( "unable to CreateFileMapping" ) ); "%s", _( "unable to CreateFileMapping" ) );
return( -1 ); return( -1 );
} }
if( !UnmapViewOfFile( image->baseaddr ) ) { if( !UnmapViewOfFile( image->baseaddr ) ) {
vips_error_system( GetLastError(), "im_mapfile", vips_error_system( GetLastError(), "vips_mapfile",
"%s", _( "unable to UnmapViewOfFile" ) ); "%s", _( "unable to UnmapViewOfFile" ) );
return( -1 ); return( -1 );
} }
if( !(baseaddr = (char *)MapViewOfFileEx( hMMFile, FILE_MAP_WRITE, if( !(baseaddr = (char *)MapViewOfFileEx( hMMFile, FILE_MAP_WRITE,
0, 0, 0, image->baseaddr )) ) { 0, 0, 0, image->baseaddr )) ) {
vips_error_system( GetLastError(), "im_mapfile", vips_error_system( GetLastError(), "vips_mapfile",
"%s", _( "unable to MapViewOfFile" ) ); "%s", _( "unable to MapViewOfFile" ) );
CloseHandle( hMMFile ); CloseHandle( hMMFile );
return( -1 ); return( -1 );
@ -338,7 +330,7 @@ im_remapfilerw( IMAGE *image )
PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED,
image->fd, 0 ); image->fd, 0 );
if( baseaddr == (void *)-1 ) { if( baseaddr == (void *)-1 ) {
vips_error( "im_mapfile", _( "unable to mmap: \"%s\" - %s" ), vips_error( "vips_mapfile", _( "unable to mmap: \"%s\" - %s" ),
image->filename, strerror( errno ) ); image->filename, strerror( errno ) );
return( -1 ); return( -1 );
} }
@ -348,7 +340,7 @@ im_remapfilerw( IMAGE *image )
image->dtype = VIPS_IMAGE_MMAPINRW; image->dtype = VIPS_IMAGE_MMAPINRW;
if( baseaddr != image->baseaddr ) { if( baseaddr != image->baseaddr ) {
vips_error( "im_mapfile", _( "unable to mmap \"%s\" to same " vips_error( "vips_mapfile", _( "unable to mmap \"%s\" to same "
"address" ), image->filename ); "address" ), image->filename );
image->baseaddr = baseaddr; image->baseaddr = baseaddr;
return( -1 ); return( -1 );

5
libvips/iofuncs/window.c
View File

@ -93,7 +93,7 @@ im_window_unmap( im_window_t *window )
/* unmap the old window /* unmap the old window
*/ */
if( window->baseaddr ) { if( window->baseaddr ) {
if( im__munmap( window->baseaddr, window->length ) ) if( vips__munmap( window->baseaddr, window->length ) )
return( -1 ); return( -1 );
#ifdef DEBUG_TOTAL #ifdef DEBUG_TOTAL
@ -242,7 +242,8 @@ im_window_set( im_window_t *window, int top, int height )
return( -1 ); return( -1 );
} }
if( !(baseaddr = im__mmap( window->im->fd, 0, pagelength, pagestart )) ) if( !(baseaddr = vips__mmap( window->im->fd,
0, pagelength, pagestart )) )
return( -1 ); return( -1 );
window->baseaddr = baseaddr; window->baseaddr = baseaddr;