database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-10 17:42:29 +03:00
Code Activity

Another PGINDENT run that changes variable indenting and case label indenting. Also static variable indenting.

Browse Source
This commit is contained in:
Bruce Momjian
1997-09-08 02:41:22 +00:00
parent a90f12fd9d
commit 319dbfa736
632 changed files with 28301 additions and 28220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/backend/storage/buffer/buf_init.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.11 1997/09/07 04:48:15 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.12 1997/09/08 02:28:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -43,33 +43,33 @@
* deallocations in a circular buffer in shared memory.
*/
#ifdef BMTRACE
bmtrace *TraceBuf;
long *CurTraceBuf;
bmtrace *TraceBuf;
long *CurTraceBuf;
#define BMT_LIMIT 200
#endif /* BMTRACE */
int ShowPinTrace = 0;
int ShowPinTrace = 0;
int NBuffers = NDBUFS; /* NDBUFS defined in miscadmin.h */
int Data_Descriptors;
int Free_List_Descriptor;
int Lookup_List_Descriptor;
int Num_Descriptors;
int NBuffers = NDBUFS; /* NDBUFS defined in miscadmin.h */
int Data_Descriptors;
int Free_List_Descriptor;
int Lookup_List_Descriptor;
int Num_Descriptors;
BufferDesc *BufferDescriptors;
BufferBlock BufferBlocks;
BufferDesc *BufferDescriptors;
BufferBlock BufferBlocks;
#ifndef HAS_TEST_AND_SET
long *NWaitIOBackendP;
long *NWaitIOBackendP;
#endif
extern IpcSemaphoreId WaitIOSemId;
long *PrivateRefCount;/* also used in freelist.c */
long *LastRefCount; /* refcounts of last ExecMain level */
long *CommitInfoNeedsSave; /* to write buffers where we have
* filled in */
long *PrivateRefCount; /* also used in freelist.c */
long *LastRefCount; /* refcounts of last ExecMain level */
long *CommitInfoNeedsSave;/* to write buffers where we have filled
* in */
/* t_tmin (or t_tmax) */
@@ -124,14 +124,14 @@ long *CommitInfoNeedsSave; /* to write buffers where we have
*
*/
SPINLOCK BufMgrLock;
SPINLOCK BufMgrLock;
long int ReadBufferCount;
long int ReadLocalBufferCount;
long int BufferHitCount;
long int LocalBufferHitCount;
long int BufferFlushCount;
long int LocalBufferFlushCount;
long int ReadBufferCount;
long int ReadLocalBufferCount;
long int BufferHitCount;
long int LocalBufferHitCount;
long int BufferFlushCount;
long int LocalBufferFlushCount;
/*
@@ -143,9 +143,9 @@ long int LocalBufferFlushCount;
void
InitBufferPool(IPCKey key)
{
bool foundBufs,
foundDescs;
int i;
bool foundBufs,
foundDescs;
int i;
/* check padding of BufferDesc and BufferHdr */
@@ -189,7 +189,7 @@ InitBufferPool(IPCKey key)
#ifndef HAS_TEST_AND_SET
{
bool foundNWaitIO;
bool foundNWaitIO;
NWaitIOBackendP = (long *) ShmemInitStruct("#Backends Waiting IO",
sizeof(long),
@@ -208,8 +208,8 @@ InitBufferPool(IPCKey key)
}
else
{
BufferDesc *buf;
unsigned long block;
BufferDesc *buf;
unsigned long block;
buf = BufferDescriptors;
block = (unsigned long) BufferBlocks;
@@ -249,7 +249,7 @@ InitBufferPool(IPCKey key)
#ifndef HAS_TEST_AND_SET
{
int status;
int status;
WaitIOSemId = IpcSemaphoreCreate(IPCKeyGetWaitIOSemaphoreKey(key),
1, IPCProtection, 0, 1, &status);
@@ -270,10 +270,10 @@ InitBufferPool(IPCKey key)
int
BufferShmemSize()
{
int size = 0;
int nbuckets;
int nsegs;
int tmp;
int size = 0;
int nbuckets;
int nsegs;
int tmp;
nbuckets = 1 << (int) my_log2((NBuffers - 1) / DEF_FFACTOR + 1);
nsegs = 1 << (int) my_log2((nbuckets - 1) / DEF_SEGSIZE + 1);

28
src/backend/storage/buffer/buf_table.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.5 1997/09/07 04:48:17 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.6 1997/09/08 02:28:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -34,13 +34,13 @@
#include "storage/spin.h"
#include "utils/hsearch.h"
static HTAB *SharedBufHash;
static HTAB *SharedBufHash;
typedef struct lookup
{
BufferTag key;
Buffer id;
} LookupEnt;
BufferTag key;
Buffer id;
} LookupEnt;
/*
* Initialize shmem hash table for mapping buffers
@@ -48,8 +48,8 @@ typedef struct lookup
void
InitBufTable()
{
HASHCTL info;
int hash_flags;
HASHCTL info;
int hash_flags;
/* assume lock is held */
@@ -73,11 +73,11 @@ InitBufTable()
}
BufferDesc *
BufferDesc *
BufTableLookup(BufferTag * tagPtr)
{
LookupEnt *result;
bool found;
LookupEnt *result;
bool found;
if (tagPtr->blockNum == P_NEW)
return (NULL);
@@ -103,8 +103,8 @@ BufTableLookup(BufferTag * tagPtr)
bool
BufTableDelete(BufferDesc * buf)
{
LookupEnt *result;
bool found;
LookupEnt *result;
bool found;
/*
* buffer not initialized or has been removed from table already.
@@ -132,8 +132,8 @@ BufTableDelete(BufferDesc * buf)
bool
BufTableInsert(BufferDesc * buf)
{
LookupEnt *result;
bool found;
LookupEnt *result;
bool found;
/* cannot insert it twice */
Assert(buf->flags & BM_DELETED);

221
src/backend/storage/buffer/bufmgr.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.20 1997/09/07 04:48:19 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.21 1997/09/08 02:28:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -77,14 +77,14 @@ extern long int LocalBufferHitCount;
extern long int BufferFlushCount;
extern long int LocalBufferFlushCount;
static int WriteMode = BUFFER_LATE_WRITE; /* Delayed write is
static int WriteMode = BUFFER_LATE_WRITE; /* Delayed write is
* default */
static void WaitIO(BufferDesc * buf, SPINLOCK spinlock);
static void WaitIO(BufferDesc * buf, SPINLOCK spinlock);
#ifndef HAS_TEST_AND_SET
static void SignalIO(BufferDesc * buf);
extern long *NWaitIOBackendP;/* defined in buf_init.c */
static void SignalIO(BufferDesc * buf);
extern long *NWaitIOBackendP; /* defined in buf_init.c */
#endif /* HAS_TEST_AND_SET */
@@ -94,9 +94,9 @@ ReadBufferWithBufferLock(Relation relation, BlockNumber blockNum,
static BufferDesc *
BufferAlloc(Relation reln, BlockNumber blockNum,
bool * foundPtr, bool bufferLockHeld);
static int FlushBuffer(Buffer buffer, bool release);
static void BufferSync(void);
static int BufferReplace(BufferDesc * bufHdr, bool bufferLockHeld);
static int FlushBuffer(Buffer buffer, bool release);
static void BufferSync(void);
static int BufferReplace(BufferDesc * bufHdr, bool bufferLockHeld);
/* ---------------------------------------------------
* RelationGetBufferWithBuffer
@@ -109,8 +109,8 @@ RelationGetBufferWithBuffer(Relation relation,
BlockNumber blockNumber,
Buffer buffer)
{
BufferDesc *bufHdr;
LRelId lrelId;
BufferDesc *bufHdr;
LRelId lrelId;
if (BufferIsValid(buffer))
{
@@ -154,7 +154,7 @@ RelationGetBufferWithBuffer(Relation relation,
* opened already.
*/
extern int ShowPinTrace;
extern int ShowPinTrace;
#undef ReadBuffer /* conflicts with macro when BUFMGR_DEBUG
@@ -176,10 +176,10 @@ ReadBuffer(Relation reln, BlockNumber blockNum)
* XXX caller must have already acquired BufMgrLock
*/
#ifdef NOT_USED
static bool
static bool
is_userbuffer(Buffer buffer)
{
BufferDesc *buf = &BufferDescriptors[buffer - 1];
BufferDesc *buf = &BufferDescriptors[buffer - 1];
if (IsSystemRelationName(buf->sb_relname))
return false;
@@ -195,12 +195,12 @@ ReadBuffer_Debug(char *file,
Relation reln,
BlockNumber blockNum)
{
Buffer buffer;
Buffer buffer;
buffer = ReadBufferWithBufferLock(reln, blockNum, false);
if (ShowPinTrace && !BufferIsLocal(buffer) && is_userbuffer(buffer))
{
BufferDesc *buf = &BufferDescriptors[buffer - 1];
BufferDesc *buf = &BufferDescriptors[buffer - 1];
fprintf(stderr, "PIN(RD) %ld relname = %s, blockNum = %d, \
refcount = %ld, file: %s, line: %d\n",
@@ -219,16 +219,16 @@ refcount = %ld, file: %s, line: %d\n",
* is yet another effort to reduce the number of
* semops in the system.
*/
static Buffer
static Buffer
ReadBufferWithBufferLock(Relation reln,
BlockNumber blockNum,
bool bufferLockHeld)
{
BufferDesc *bufHdr;
int extend; /* extending the file by one block */
int status;
bool found;
bool isLocalBuf;
BufferDesc *bufHdr;
int extend; /* extending the file by one block */
int status;
bool found;
bool isLocalBuf;
extend = (blockNum == P_NEW);
isLocalBuf = reln->rd_islocal;
@@ -357,11 +357,11 @@ BufferAlloc(Relation reln,
bool * foundPtr,
bool bufferLockHeld)
{
BufferDesc *buf,
*buf2;
BufferTag newTag; /* identity of requested block */
bool inProgress; /* buffer undergoing IO */
bool newblock = FALSE;
BufferDesc *buf,
*buf2;
BufferTag newTag; /* identity of requested block */
bool inProgress; /* buffer undergoing IO */
bool newblock = FALSE;
/* create a new tag so we can lookup the buffer */
/* assume that the relation is already open */
@@ -458,7 +458,7 @@ BufferAlloc(Relation reln,
if (buf->flags & BM_DIRTY)
{
bool smok;
bool smok;
/*
* Set BM_IO_IN_PROGRESS to keep anyone from doing anything
@@ -693,7 +693,7 @@ BufferAlloc(Relation reln,
int
WriteBuffer(Buffer buffer)
{
BufferDesc *bufHdr;
BufferDesc *bufHdr;
if (WriteMode == BUFFER_FLUSH_WRITE)
{
@@ -727,7 +727,7 @@ WriteBuffer_Debug(char *file, int line, Buffer buffer)
WriteBuffer(buffer);
if (ShowPinTrace && BufferIsLocal(buffer) && is_userbuffer(buffer))
{
BufferDesc *buf;
BufferDesc *buf;
buf = &BufferDescriptors[buffer - 1];
fprintf(stderr, "UNPIN(WR) %ld relname = %s, blockNum = %d, \
@@ -761,8 +761,8 @@ refcount = %ld, file: %s, line: %d\n",
void
DirtyBufferCopy(Oid dbid, Oid relid, BlockNumber blkno, char *dest)
{
BufferDesc *buf;
BufferTag btag;
BufferDesc *buf;
BufferTag btag;
btag.relId.relId = relid;
btag.relId.dbId = dbid;
@@ -803,10 +803,10 @@ DirtyBufferCopy(Oid dbid, Oid relid, BlockNumber blkno, char *dest)
static int
FlushBuffer(Buffer buffer, bool release)
{
BufferDesc *bufHdr;
Oid bufdb;
Relation bufrel;
int status;
BufferDesc *bufHdr;
Oid bufdb;
Relation bufrel;
int status;
if (BufferIsLocal(buffer))
return FlushLocalBuffer(buffer, release);
@@ -871,7 +871,7 @@ FlushBuffer(Buffer buffer, bool release)
int
WriteNoReleaseBuffer(Buffer buffer)
{
BufferDesc *bufHdr;
BufferDesc *bufHdr;
if (WriteMode == BUFFER_FLUSH_WRITE)
{
@@ -908,8 +908,8 @@ ReleaseAndReadBuffer(Buffer buffer,
Relation relation,
BlockNumber blockNum)
{
BufferDesc *bufHdr;
Buffer retbuf;
BufferDesc *bufHdr;
Buffer retbuf;
if (BufferIsLocal(buffer))
{
@@ -972,12 +972,12 @@ ReleaseAndReadBuffer(Buffer buffer,
static void
BufferSync()
{
int i;
Oid bufdb;
Oid bufrel;
Relation reln;
BufferDesc *bufHdr;
int status;
int i;
Oid bufdb;
Oid bufrel;
Relation reln;
BufferDesc *bufHdr;
int status;
SpinAcquire(BufMgrLock);
for (i = 0, bufHdr = BufferDescriptors; i < NBuffers; i++, bufHdr++)
@@ -1114,12 +1114,12 @@ WaitIO(BufferDesc * buf, SPINLOCK spinlock)
}
#else /* HAS_TEST_AND_SET */
IpcSemaphoreId WaitIOSemId;
IpcSemaphoreId WaitIOSemId;
static void
WaitIO(BufferDesc * buf, SPINLOCK spinlock)
{
bool inProgress;
bool inProgress;
for (;;)
{
@@ -1149,16 +1149,15 @@ SignalIO(BufferDesc * buf)
#endif /* HAS_TEST_AND_SET */
long NDirectFileRead;/* some I/O's are direct file access.
long NDirectFileRead; /* some I/O's are direct file access.
* bypass bufmgr */
long NDirectFileWrite; /* e.g., I/O in psort and
* hashjoin. */
long NDirectFileWrite; /* e.g., I/O in psort and hashjoin. */
void
PrintBufferUsage(FILE * statfp)
{
float hitrate;
float localhitrate;
float hitrate;
float localhitrate;
if (ReadBufferCount == 0)
hitrate = 0.0;
@@ -1202,7 +1201,7 @@ ResetBufferUsage()
void
ResetBufferPool()
{
register int i;
register int i;
for (i = 1; i <= NBuffers; i++)
{
@@ -1230,8 +1229,8 @@ ResetBufferPool()
int
BufferPoolCheckLeak()
{
register int i;
int error = 0;
register int i;
int error = 0;
for (i = 1; i <= NBuffers; i++)
{
@@ -1315,8 +1314,8 @@ BufferGetBlockNumber(Buffer buffer)
Relation
BufferGetRelation(Buffer buffer)
{
Relation relation;
Oid relid;
Relation relation;
Oid relid;
Assert(BufferIsValid(buffer));
Assert(!BufferIsLocal(buffer)); /* not supported for local buffers */
@@ -1349,10 +1348,10 @@ BufferGetRelation(Buffer buffer)
static int
BufferReplace(BufferDesc * bufHdr, bool bufferLockHeld)
{
Relation reln;
Oid bufdb,
bufrel;
int status;
Relation reln;
Oid bufdb,
bufrel;
int status;
if (!bufferLockHeld)
SpinAcquire(BufMgrLock);
@@ -1446,9 +1445,9 @@ BufferGetBlock(Buffer buffer)
void
ReleaseRelationBuffers(Relation rdesc)
{
register int i;
int holding = 0;
BufferDesc *buf;
register int i;
int holding = 0;
BufferDesc *buf;
if (rdesc->rd_islocal)
{
@@ -1503,8 +1502,8 @@ ReleaseRelationBuffers(Relation rdesc)
void
DropBuffers(Oid dbid)
{
register int i;
BufferDesc *buf;
register int i;
BufferDesc *buf;
SpinAcquire(BufMgrLock);
for (i = 1; i <= NBuffers; i++)
@@ -1528,8 +1527,8 @@ DropBuffers(Oid dbid)
void
PrintBufferDescs()
{
int i;
BufferDesc *buf = BufferDescriptors;
int i;
BufferDesc *buf = BufferDescriptors;
if (IsUnderPostmaster)
{
@@ -1559,8 +1558,8 @@ blockNum=%d, flags=0x%x, refcount=%d %d)",
void
PrintPinnedBufs()
{
int i;
BufferDesc *buf = BufferDescriptors;
int i;
BufferDesc *buf = BufferDescriptors;
SpinAcquire(BufMgrLock);
for (i = 0; i < NBuffers; ++i, ++buf)
@@ -1587,7 +1586,7 @@ blockNum=%d, flags=0x%x, refcount=%d %d)\n",
void
BufferPoolBlowaway()
{
register int i;
register int i;
BufferSync();
for (i = 1; i <= NBuffers; i++)
@@ -1630,7 +1629,7 @@ IncrBufferRefCount(Buffer buffer)
int
ReleaseBuffer(Buffer buffer)
{
BufferDesc *bufHdr;
BufferDesc *bufHdr;
if (BufferIsLocal(buffer))
{
@@ -1678,7 +1677,7 @@ IncrBufferRefCount_Debug(char *file, int line, Buffer buffer)
IncrBufferRefCount(buffer);
if (ShowPinTrace && !BufferIsLocal(buffer) && is_userbuffer(buffer))
{
BufferDesc *buf = &BufferDescriptors[buffer - 1];
BufferDesc *buf = &BufferDescriptors[buffer - 1];
fprintf(stderr, "PIN(Incr) %ld relname = %s, blockNum = %d, \
refcount = %ld, file: %s, line: %d\n",
@@ -1696,7 +1695,7 @@ ReleaseBuffer_Debug(char *file, int line, Buffer buffer)
ReleaseBuffer(buffer);
if (ShowPinTrace && !BufferIsLocal(buffer) && is_userbuffer(buffer))
{
BufferDesc *buf = &BufferDescriptors[buffer - 1];
BufferDesc *buf = &BufferDescriptors[buffer - 1];
fprintf(stderr, "UNPIN(Rel) %ld relname = %s, blockNum = %d, \
refcount = %ld, file: %s, line: %d\n",
@@ -1715,15 +1714,15 @@ ReleaseAndReadBuffer_Debug(char *file,
Relation relation,
BlockNumber blockNum)
{
bool bufferValid;
Buffer b;
bool bufferValid;
Buffer b;
bufferValid = BufferIsValid(buffer);
b = ReleaseAndReadBuffer(buffer, relation, blockNum);
if (ShowPinTrace && bufferValid && BufferIsLocal(buffer)
&& is_userbuffer(buffer))
{
BufferDesc *buf = &BufferDescriptors[buffer - 1];
BufferDesc *buf = &BufferDescriptors[buffer - 1];
fprintf(stderr, "UNPIN(Rel&Rd) %ld relname = %s, blockNum = %d, \
refcount = %ld, file: %s, line: %d\n",
@@ -1732,7 +1731,7 @@ refcount = %ld, file: %s, line: %d\n",
}
if (ShowPinTrace && BufferIsLocal(buffer) && is_userbuffer(buffer))
{
BufferDesc *buf = &BufferDescriptors[b - 1];
BufferDesc *buf = &BufferDescriptors[b - 1];
fprintf(stderr, "PIN(Rel&Rd) %ld relname = %s, blockNum = %d, \
refcount = %ld, file: %s, line: %d\n",
@@ -1754,10 +1753,10 @@ refcount = %ld, file: %s, line: %d\n",
_bm_trace(Oid dbId, Oid relId, int blkNo, int bufNo, int allocType)
{
static int mypid = 0;
long start,
cur;
bmtrace *tb;
static int mypid = 0;
long start,
cur;
bmtrace *tb;
if (mypid == 0)
mypid = getpid();
@@ -1810,9 +1809,9 @@ okay:
_bm_die(Oid dbId, Oid relId, int blkNo, int bufNo,
int allocType, long start, long cur)
{
FILE *fp;
bmtrace *tb;
int i;
FILE *fp;
bmtrace *tb;
int i;
tb = &TraceBuf[cur];
@@ -1839,21 +1838,21 @@ _bm_die(Oid dbId, Oid relId, int blkNo, int bufNo,
switch (tb->bmt_op)
{
case BMT_ALLOCFND:
fprintf(fp, "allocate (found)\n");
break;
case BMT_ALLOCFND:
fprintf(fp, "allocate (found)\n");
break;
case BMT_ALLOCNOTFND:
fprintf(fp, "allocate (not found)\n");
break;
case BMT_ALLOCNOTFND:
fprintf(fp, "allocate (not found)\n");
break;
case BMT_DEALLOC:
fprintf(fp, "deallocate\n");
break;
case BMT_DEALLOC:
fprintf(fp, "deallocate\n");
break;
default:
fprintf(fp, "unknown op type %d\n", tb->bmt_op);
break;
default:
fprintf(fp, "unknown op type %d\n", tb->bmt_op);
break;
}
}
@@ -1868,21 +1867,21 @@ _bm_die(Oid dbId, Oid relId, int blkNo, int bufNo,
switch (allocType)
{
case BMT_ALLOCFND:
fprintf(fp, "allocate (found)\n");
break;
case BMT_ALLOCFND:
fprintf(fp, "allocate (found)\n");
break;
case BMT_ALLOCNOTFND:
fprintf(fp, "allocate (not found)\n");
break;
case BMT_ALLOCNOTFND:
fprintf(fp, "allocate (not found)\n");
break;
case BMT_DEALLOC:
fprintf(fp, "deallocate\n");
break;
case BMT_DEALLOC:
fprintf(fp, "deallocate\n");
break;
default:
fprintf(fp, "unknown op type %d\n", allocType);
break;
default:
fprintf(fp, "unknown op type %d\n", allocType);
break;
}
FreeFile(fp);
@@ -1895,7 +1894,7 @@ _bm_die(Oid dbId, Oid relId, int blkNo, int bufNo,
void
BufferRefCountReset(int *refcountsave)
{
int i;
int i;
for (i = 0; i < NBuffers; i++)
{
@@ -1908,7 +1907,7 @@ BufferRefCountReset(int *refcountsave)
void
BufferRefCountRestore(int *refcountsave)
{
int i;
int i;
for (i = 0; i < NBuffers; i++)
{
@@ -1921,7 +1920,7 @@ BufferRefCountRestore(int *refcountsave)
int
SetBufferWriteMode(int mode)
{
int old;
int old;
old = WriteMode;
WriteMode = mode;

22
src/backend/storage/buffer/freelist.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.5 1997/09/07 04:48:22 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.6 1997/09/08 02:28:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -84,7 +84,7 @@ AddBufferToFreelist(BufferDesc * bf)
void
PinBuffer(BufferDesc * buf)
{
long b;
long b;
/* Assert (buf->refcount < 25); */
@@ -119,7 +119,7 @@ PinBuffer_Debug(char *file, int line, BufferDesc * buf)
PinBuffer(buf);
if (ShowPinTrace)
{
Buffer buffer = BufferDescriptorGetBuffer(buf);
Buffer buffer = BufferDescriptorGetBuffer(buf);
fprintf(stderr, "PIN(Pin) %ld relname = %s, blockNum = %d, \
refcount = %ld, file: %s, line: %d\n",
@@ -138,7 +138,7 @@ refcount = %ld, file: %s, line: %d\n",
void
UnpinBuffer(BufferDesc * buf)
{
long b = BufferDescriptorGetBuffer(buf) - 1;
long b = BufferDescriptorGetBuffer(buf) - 1;
Assert(buf->refcount);
Assert(PrivateRefCount[b] > 0);
@@ -165,7 +165,7 @@ UnpinBuffer_Debug(char *file, int line, BufferDesc * buf)
UnpinBuffer(buf);
if (ShowPinTrace)
{
Buffer buffer = BufferDescriptorGetBuffer(buf);
Buffer buffer = BufferDescriptorGetBuffer(buf);
fprintf(stderr, "UNPIN(Unpin) %ld relname = %s, blockNum = %d, \
refcount = %ld, file: %s, line: %d\n",
@@ -180,10 +180,10 @@ refcount = %ld, file: %s, line: %d\n",
* GetFreeBuffer() -- get the 'next' buffer from the freelist.
*
*/
BufferDesc *
BufferDesc *
GetFreeBuffer()
{
BufferDesc *buf;
BufferDesc *buf;
if (Free_List_Descriptor == SharedFreeList->freeNext)
{
@@ -242,8 +242,8 @@ InitFreeList(bool init)
void
DBG_FreeListCheck(int nfree)
{
int i;
BufferDesc *buf;
int i;
BufferDesc *buf;
buf = &(BufferDescriptors[SharedFreeList->freeNext]);
for (i = 0; i < nfree; i++, buf = &(BufferDescriptors[buf->freeNext]))
@@ -291,7 +291,7 @@ DBG_FreeListCheck(int nfree)
static void
PrintBufferFreeList()
{
BufferDesc *buf;
BufferDesc *buf;
if (SharedFreeList->freeNext == Free_List_Descriptor)
{
@@ -302,7 +302,7 @@ PrintBufferFreeList()
buf = &(BufferDescriptors[SharedFreeList->freeNext]);
for (;;)
{
int i = (buf - BufferDescriptors);
int i = (buf - BufferDescriptors);
printf("[%-2d] (%s, %d) flags=0x%x, refcnt=%d %ld, nxt=%ld prv=%ld)\n",
i, buf->sb_relname, buf->tag.blockNum,

44
src/backend/storage/buffer/localbuf.c
View File

@@ -15,7 +15,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.9 1997/09/07 04:48:23 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.10 1997/09/08 02:28:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -50,11 +50,11 @@
extern long int LocalBufferFlushCount;
int NLocBuffer = 64;
BufferDesc *LocalBufferDescriptors = NULL;
long *LocalRefCount = NULL;
int NLocBuffer = 64;
BufferDesc *LocalBufferDescriptors = NULL;
long *LocalRefCount = NULL;
static int nextFreeLocalBuf = 0;
static int nextFreeLocalBuf = 0;
/*#define LBDEBUG*/
@@ -62,11 +62,11 @@ static int nextFreeLocalBuf = 0;
* LocalBufferAlloc -
* allocate a local buffer. We do round robin allocation for now.
*/
BufferDesc *
BufferDesc *
LocalBufferAlloc(Relation reln, BlockNumber blockNum, bool * foundPtr)
{
int i;
BufferDesc *bufHdr = (BufferDesc *) NULL;
int i;
BufferDesc *bufHdr = (BufferDesc *) NULL;
if (blockNum == P_NEW)
{
@@ -99,7 +99,7 @@ LocalBufferAlloc(Relation reln, BlockNumber blockNum, bool * foundPtr)
/* need to get a new buffer (round robin for now) */
for (i = 0; i < NLocBuffer; i++)
{
int b = (nextFreeLocalBuf + i) % NLocBuffer;
int b = (nextFreeLocalBuf + i) % NLocBuffer;
if (LocalRefCount[b] == 0)
{
@@ -119,7 +119,7 @@ LocalBufferAlloc(Relation reln, BlockNumber blockNum, bool * foundPtr)
*/
if (bufHdr->flags & BM_DIRTY)
{
Relation bufrel = RelationIdCacheGetRelation(bufHdr->tag.relId.relId);
Relation bufrel = RelationIdCacheGetRelation(bufHdr->tag.relId.relId);
Assert(bufrel != NULL);
@@ -142,7 +142,7 @@ LocalBufferAlloc(Relation reln, BlockNumber blockNum, bool * foundPtr)
*/
if (bufHdr->data == (SHMEM_OFFSET) 0)
{
char *data = (char *) malloc(BLCKSZ);
char *data = (char *) malloc(BLCKSZ);
bufHdr->data = MAKE_OFFSET(data);
}
@@ -158,7 +158,7 @@ LocalBufferAlloc(Relation reln, BlockNumber blockNum, bool * foundPtr)
int
WriteLocalBuffer(Buffer buffer, bool release)
{
int bufid;
int bufid;
Assert(BufferIsLocal(buffer));
@@ -185,9 +185,9 @@ WriteLocalBuffer(Buffer buffer, bool release)
int
FlushLocalBuffer(Buffer buffer, bool release)
{
int bufid;
Relation bufrel;
BufferDesc *bufHdr;
int bufid;
Relation bufrel;
BufferDesc *bufHdr;
Assert(BufferIsLocal(buffer));
@@ -221,7 +221,7 @@ FlushLocalBuffer(Buffer buffer, bool release)
void
InitLocalBuffer(void)
{
int i;
int i;
/*
* these aren't going away. I'm not gonna use palloc.
@@ -233,7 +233,7 @@ InitLocalBuffer(void)
for (i = 0; i < NLocBuffer; i++)
{
BufferDesc *buf = &LocalBufferDescriptors[i];
BufferDesc *buf = &LocalBufferDescriptors[i];
/*
* negative to indicate local buffer. This is tricky: shared
@@ -258,12 +258,12 @@ InitLocalBuffer(void)
void
LocalBufferSync(void)
{
int i;
int i;
for (i = 0; i < NLocBuffer; i++)
{
BufferDesc *buf = &LocalBufferDescriptors[i];
Relation bufrel;
BufferDesc *buf = &LocalBufferDescriptors[i];
Relation bufrel;
if (buf->flags & BM_DIRTY)
{
@@ -290,11 +290,11 @@ LocalBufferSync(void)
void
ResetLocalBufferPool(void)
{
int i;
int i;
for (i = 0; i < NLocBuffer; i++)
{
BufferDesc *buf = &LocalBufferDescriptors[i];
BufferDesc *buf = &LocalBufferDescriptors[i];
buf->tag.relId.relId = InvalidOid;
buf->flags &= ~BM_DIRTY;