mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix for bug #46709. 

Allows buffer size of registry to change.

r=rayw
This commit is contained in:
kandrot%netscape.com 2000-09-08 01:53:15 +00:00
Родитель e89ce829b0
Коммит 5899bf563d
4 изменённых файлов: 116 добавлений и 23 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

84
modules/libreg/src/nr_bufio.c
Просмотреть файл

@ -19,6 +19,7 @@
*
* Contributors:
* Daniel Veditz <dveditz@netscape.com>
* Edward Kandrot <kandrot@netscape.com>
*/
/*------------------------------------------------------------------------
@ -50,6 +51,7 @@
#include "nr_bufio.h"
#define BUFIO_BUFSIZE_DEFAULT 0x10000
#define STARTS_IN_BUF(f) ((f->fpos >= f->datastart) && \
(f->fpos < (f->datastart+f->datasize)))
@ -62,17 +64,6 @@ static num_reads = 0;
#endif
#define BUFIO_BUFSIZE 0x10000
struct BufioBufStruct
{
PRInt32 datastart; /* The file position for the buffer start */
PRInt32 datasize; /* the amount of data in the buffer */
PRBool dirty; /* if the buffer has been written to */
PRInt32 dirtystart; /* lowest offset written to */
PRInt32 dirtyend; /* end of the written area */
} BufioBuf;
struct BufioFileStruct
{
FILE *fd; /* real file descriptor */
@ -80,6 +71,7 @@ struct BufioFileStruct
PRInt32 fpos; /* our logical position in the file */
PRInt32 datastart; /* the file position at which the buffer starts */
PRInt32 datasize; /* the amount of data actually in the buffer*/
PRInt32 bufsize; /* size of the in memory buffer */
PRBool bufdirty; /* whether the buffer been written to */
PRInt32 dirtystart;
PRInt32 dirtyend;
@ -115,8 +107,9 @@ BufioFile* bufio_Open(const char* name, const char* mode)
if ( file )
{
file->fd = fd;
file->bufsize = BUFIO_BUFSIZE_DEFAULT; /* set the default buffer size */
file->data = (char*)PR_Malloc( BUFIO_BUFSIZE );
file->data = (char*)PR_Malloc( file->bufsize );
if ( file->data )
{
/* get file size to finish initialization of bufio */
@ -442,14 +435,14 @@ PRUint32 bufio_Write(BufioFile* file, const char* src, PRUint32 count)
startOffset = file->fpos - file->datastart;
endOffset = startOffset + count;
if ( startOffset >= 0 && startOffset < BUFIO_BUFSIZE )
if ( startOffset >= 0 && startOffset < file->bufsize )
{
/* the area we want to write starts in the buffer */
if ( endOffset <= BUFIO_BUFSIZE )
if ( endOffset <= file->bufsize )
bytesCopied = count;
else
bytesCopied = BUFIO_BUFSIZE - startOffset;
bytesCopied = file->bufsize - startOffset;
memcpy( file->data + startOffset, src, bytesCopied );
file->bufdirty = PR_TRUE;
@ -473,7 +466,7 @@ PRUint32 bufio_Write(BufioFile* file, const char* src, PRUint32 count)
else
{
/* range doesn't start in the loaded buffer but it might end there */
if ( endOffset > 0 && endOffset <= BUFIO_BUFSIZE )
if ( endOffset > 0 && endOffset <= file->bufsize )
bytesCopied = endOffset;
else
bytesCopied = 0;
@ -575,7 +568,7 @@ static PRBool _bufio_loadBuf( BufioFile* file, PRUint32 count )
PRUint32 bytesRead;
/* no point in buffering more than the physical buffer will hold */
if ( count > BUFIO_BUFSIZE )
if ( count > (PRUint32)file->bufsize )
return PR_FALSE;
/* Is caller asking for data we already have? */
@ -591,9 +584,9 @@ static PRBool _bufio_loadBuf( BufioFile* file, PRUint32 count )
/* For now we're not trying anything smarter than simple paging. */
/* Slide over if necessary to fit the entire request */
startBuf = ( file->fpos / BUFIO_BUFSIZE ) * BUFIO_BUFSIZE;
startBuf = ( file->fpos / file->bufsize ) * file->bufsize;
endPos = file->fpos + count;
endBuf = startBuf + BUFIO_BUFSIZE;
endBuf = startBuf + file->bufsize;
if ( endPos > endBuf )
startBuf += (endPos - endBuf);
@ -604,11 +597,11 @@ static PRBool _bufio_loadBuf( BufioFile* file, PRUint32 count )
#if DEBUG_dougt
++num_reads;
#endif
bytesRead = fread( file->data, 1, BUFIO_BUFSIZE, file->fd );
bytesRead = fread( file->data, 1, file->bufsize, file->fd );
file->datastart = startBuf;
file->datasize = bytesRead;
file->bufdirty = PR_FALSE;
file->dirtystart = BUFIO_BUFSIZE;
file->dirtystart = file->bufsize;
file->dirtyend = 0;
#ifdef DEBUG_dveditzbuf
printf("REG: buffer read %d (%d) after %d reads\n",startBuf,file->fpos,file->reads);
@ -643,7 +636,7 @@ static int _bufio_flushBuf( BufioFile* file )
file->writes = 0;
#endif
file->bufdirty = PR_FALSE;
file->dirtystart = BUFIO_BUFSIZE;
file->dirtystart = file->bufsize;
file->dirtyend = 0;
return 0;
}
@ -651,4 +644,51 @@ static int _bufio_flushBuf( BufioFile* file )
return -1;
}
/*
* sets the file buffer size to bufsize, clearing the buffer in the process.
*
* accepts bufsize of -1 to mean default buffer size, defined by BUFIO_BUFSIZE_DEFAULT
* returns new buffers size, or -1 if error occured
*/
int bufio_SetBufferSize(BufioFile* file, int bufsize)
{
char *newBuffer;
int retVal = -1;
PR_ASSERT(file);
if (!file)
return retVal;
if (bufsize == -1)
bufsize = BUFIO_BUFSIZE_DEFAULT;
if (bufsize == file->bufsize)
return bufsize;
newBuffer = (char*)PR_Malloc( bufsize );
if (newBuffer)
{
/* if the buffer's dirty make sure we successfully flush it */
if ( file->bufdirty && _bufio_flushBuf(file) != 0 )
{
PR_Free( newBuffer );
return -1;
}
file->bufsize = bufsize;
if ( file->data )
PR_Free( file->data );
file->data = newBuffer;
file->datasize = 0;
file->datastart = 0;
retVal = bufsize;
}
return retVal;
}
/* EOF nr_bufio.c */

2
modules/libreg/src/nr_bufio.h
Просмотреть файл

@ -19,6 +19,7 @@
*
* Contributors:
* Daniel Veditz <dveditz@netscape.com>
* Edward Kandrot <kandrot@netscape.com>
*/
/* nr_bufio.h
@ -41,6 +42,7 @@ PRUint32 bufio_Read(BufioFile* file, char* dest, PRUint32 count);
PRUint32 bufio_Write(BufioFile* file, const char* src, PRUint32 count);
PRInt32 bufio_Tell(BufioFile* file);
int bufio_Flush(BufioFile* file);
int bufio_SetBufferSize(BufioFile* file, int bufsize);
#endif /* _NR_BUFIO_H_ */

48
modules/libreg/src/reg.c
Просмотреть файл

@ -1715,6 +1715,7 @@ static REGERR nr_RegOpen( char *filename, HREG *hReg );
static REGERR nr_RegClose( HREG hReg );
static char* nr_GetUsername();
static char* nr_GetRegName (char *name);
static int nr_RegSetBufferSize( HREG hReg, int bufsize );
/* --------------------------------------------------------------------- */
@ -2002,6 +2003,31 @@ static REGERR nr_RegDeleteKey( REGFILE *reg, RKEY key, char *path, XP_Bool raw )
static int nr_RegSetBufferSize( HREG hReg, int bufsize )
{
REGERR err = REGERR_OK;
REGHANDLE* reghnd = (REGHANDLE*)hReg;
REGFILE* reg;
XP_Bool needDelete = FALSE;
int newSize;
/* verify handle */
err = VERIFY_HREG( hReg );
if ( err != REGERR_OK )
return -1;
reg = reghnd->pReg;
PR_Lock( reg->lock );
newSize = XP_FileSetBufferSize( reg->fh, bufsize );
PR_Unlock( reg->lock );
return newSize;
}
static REGERR nr_RegOpen( char *filename, HREG *hReg )
{
@ -2233,6 +2259,28 @@ VR_INTERFACE(REGERR) NR_RegGetUsername(char **name)
}
/* ---------------------------------------------------------------------
* NR_RegSetBufferSize - Set the buffer size
*
* Parameters:
* name - name of the current user
*
* Output:
* ---------------------------------------------------------------------
*/
VR_INTERFACE(int) NR_RegSetBufferSize( HREG hReg, int bufsize )
{
int newSize;
PR_Lock( reglist_lock );
newSize = nr_RegSetBufferSize( hReg, bufsize );
PR_Unlock(reglist_lock);
return newSize;
}
/* ---------------------------------------------------------------------

5
modules/libreg/src/vr_stubs.h
Просмотреть файл

@ -93,6 +93,7 @@
#define XP_FileTell(file) ftell(file)
#define XP_FileFlush(file) fflush(file)
#define XP_FileClose(file) fclose(file)
#define XP_FileSetBufferSize(file,bufsize) (-1)
#define XP_ASSERT(x) ((void)0)
@ -145,6 +146,7 @@ typedef FILE * XP_File;
#define XP_FileClose(file) mmio_FileClose(file)
#define XP_FileOpen(path, mode) mmio_FileOpen((path), mode )
#define XP_FileFlush(file) ((void)1)
#define XP_FileSetBufferSize(file, bufsize) (-1)
typedef MmioFile* XP_File;
@ -163,7 +165,7 @@ typedef MmioFile* XP_File;
#define XP_FileClose(file) bufio_Close(file)
#define XP_FileOpen(path, mode) bufio_Open((path), (mode))
#define XP_FileFlush(file) bufio_Flush(file)
#define XP_FileSetBufferSize(file,bufsize) bufio_SetBufferSize(file,bufsize)
typedef BufioFile* XP_File;
@ -186,6 +188,7 @@ typedef BufioFile* XP_File;
#define XP_FileOpen(path, mode) PR_Open((path), mode )
#define XP_FileClose(file) PR_Close(file)
#define XP_FileFlush(file) PR_Sync(file)
#define XP_FileSetBufferSize(file,bufsize) (-1)
typedef PRFileDesc* XP_File;