diff options
Diffstat (limited to 'src/backend/storage')
-rw-r--r-- | src/backend/storage/buffer/buf_table.c | 3 | ||||
-rw-r--r-- | src/backend/storage/buffer/freelist.c | 3 | ||||
-rw-r--r-- | src/backend/storage/file/buffile.c | 3 | ||||
-rw-r--r-- | src/backend/storage/file/fd.c | 8 | ||||
-rw-r--r-- | src/backend/storage/freespace/freespace.c | 3 | ||||
-rw-r--r-- | src/backend/storage/ipc/ipc.c | 8 | ||||
-rw-r--r-- | src/backend/storage/ipc/shmqueue.c | 3 | ||||
-rw-r--r-- | src/backend/storage/lmgr/deadlock.c | 3 | ||||
-rw-r--r-- | src/backend/storage/lmgr/lock.c | 21 | ||||
-rw-r--r-- | src/backend/storage/lmgr/proc.c | 4 | ||||
-rw-r--r-- | src/backend/storage/lmgr/s_lock.c | 5 | ||||
-rw-r--r-- | src/backend/storage/lmgr/spin.c | 3 | ||||
-rw-r--r-- | src/backend/storage/page/bufpage.c | 4 | ||||
-rw-r--r-- | src/backend/storage/smgr/md.c | 4 | ||||
-rw-r--r-- | src/backend/storage/smgr/mm.c | 3 |
15 files changed, 43 insertions, 35 deletions
diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c index eb4ce0330ca..ab6f4f7837e 100644 --- a/src/backend/storage/buffer/buf_table.c +++ b/src/backend/storage/buffer/buf_table.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.25 2001/10/25 05:49:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.26 2001/10/28 06:25:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -152,4 +152,5 @@ DBG_LookupListCheck(int nlookup) hash_stats("Shared", SharedBufHash); } + #endif diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c index 073d3ae4fc2..6e8e0f9b8bb 100644 --- a/src/backend/storage/buffer/freelist.c +++ b/src/backend/storage/buffer/freelist.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.26 2001/10/25 05:49:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.27 2001/10/28 06:25:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -309,4 +309,5 @@ PrintBufferFreeList() buf = &(BufferDescriptors[buf->freeNext]); } } + #endif diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c index bb8b8f39a7a..14379cd1ef5 100644 --- a/src/backend/storage/file/buffile.c +++ b/src/backend/storage/file/buffile.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/file/buffile.c,v 1.11 2001/10/25 05:49:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/file/buffile.c,v 1.12 2001/10/28 06:25:49 momjian Exp $ * * NOTES: * @@ -572,4 +572,5 @@ BufFileTellBlock(BufFile *file) blknum += file->curFile * RELSEG_SIZE; return blknum; } + #endif diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index 3c6722863ec..8936685f941 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/file/fd.c,v 1.85 2001/10/25 05:49:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/file/fd.c,v 1.86 2001/10/28 06:25:49 momjian Exp $ * * NOTES: * @@ -118,11 +118,11 @@ typedef struct vfd unsigned short fdstate; /* bitflags for VFD's state */ /* these are the assigned bits in fdstate: */ -#define FD_DIRTY (1 << 0)/* written to, but not yet fsync'd */ -#define FD_TEMPORARY (1 << 1)/* should be unlinked when closed */ +#define FD_DIRTY (1 << 0) /* written to, but not yet fsync'd */ +#define FD_TEMPORARY (1 << 1) /* should be unlinked when closed */ File nextFree; /* link to next free VFD, if in freelist */ - File lruMoreRecently; /* doubly linked recency-of-use list */ + File lruMoreRecently; /* doubly linked recency-of-use list */ File lruLessRecently; long seekPos; /* current logical file position */ char *fileName; /* name of file, or NULL for unused VFD */ diff --git a/src/backend/storage/freespace/freespace.c b/src/backend/storage/freespace/freespace.c index 1956b92d68d..8ae99061015 100644 --- a/src/backend/storage/freespace/freespace.c +++ b/src/backend/storage/freespace/freespace.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/freespace/freespace.c,v 1.8 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/freespace/freespace.c,v 1.9 2001/10/28 06:25:49 momjian Exp $ * * * NOTES: @@ -1116,4 +1116,5 @@ DumpFreeSpace(void) fprintf(stderr, "DumpFreeSpace: %d chunks in list, but numFreeChunks = %d\n", nChunks, FreeSpaceMap->numFreeChunks); } + #endif /* FREESPACE_DEBUG */ diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c index d083d071bd6..558645e8b9b 100644 --- a/src/backend/storage/ipc/ipc.c +++ b/src/backend/storage/ipc/ipc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.72 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.73 2001/10/28 06:25:49 momjian Exp $ * * NOTES * @@ -94,9 +94,9 @@ static struct ONEXIT { void (*function) (); Datum arg; -} on_proc_exit_list[MAX_ON_EXITS], +} on_proc_exit_list[MAX_ON_EXITS], - on_shmem_exit_list[MAX_ON_EXITS]; +on_shmem_exit_list[MAX_ON_EXITS]; static int on_proc_exit_index, on_shmem_exit_index; @@ -745,7 +745,7 @@ PrivateMemoryCreate(uint32 size) fprintf(stderr, "PrivateMemoryCreate: malloc(%u) failed\n", size); proc_exit(1); } - MemSet(memAddress, 0, size); /* keep Purify quiet */ + MemSet(memAddress, 0, size); /* keep Purify quiet */ /* Register on-exit routine to release storage */ on_shmem_exit(PrivateMemoryDelete, PointerGetDatum(memAddress)); diff --git a/src/backend/storage/ipc/shmqueue.c b/src/backend/storage/ipc/shmqueue.c index 4f677887420..4fbb6211608 100644 --- a/src/backend/storage/ipc/shmqueue.c +++ b/src/backend/storage/ipc/shmqueue.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.17 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.18 2001/10/28 06:25:50 momjian Exp $ * * NOTES * @@ -253,4 +253,5 @@ dumpQ(SHM_QUEUE *q, char *s) strcat(buf, elem); elog(SHMQUEUE_DEBUG_ELOG, "%s: %s", s, buf); } + #endif /* SHMQUEUE_DEBUG */ diff --git a/src/backend/storage/lmgr/deadlock.c b/src/backend/storage/lmgr/deadlock.c index e7a0c6e8556..70867b65642 100644 --- a/src/backend/storage/lmgr/deadlock.c +++ b/src/backend/storage/lmgr/deadlock.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/deadlock.c,v 1.7 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/deadlock.c,v 1.8 2001/10/28 06:25:50 momjian Exp $ * * Interface: * @@ -756,4 +756,5 @@ PrintLockQueue(LOCK *lock, const char *info) printf("\n"); fflush(stdout); } + #endif diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index a33b633d2d6..a7ddd92dda4 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.101 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.102 2001/10/28 06:25:50 momjian Exp $ * * NOTES * Outside modules can create a lock table and acquire/release @@ -54,15 +54,15 @@ static void LockCountMyLocks(SHMEM_OFFSET lockOffset, PROC *proc, static char *lock_mode_names[] = { - "INVALID", - "AccessShareLock", - "RowShareLock", - "RowExclusiveLock", - "ShareUpdateExclusiveLock", - "ShareLock", - "ShareRowExclusiveLock", - "ExclusiveLock", - "AccessExclusiveLock" + "INVALID", + "AccessShareLock", + "RowShareLock", + "RowExclusiveLock", + "ShareUpdateExclusiveLock", + "ShareLock", + "ShareRowExclusiveLock", + "ExclusiveLock", + "AccessExclusiveLock" }; @@ -1463,4 +1463,5 @@ DumpAllLocks(void) elog(DEBUG, "DumpAllLocks: holder->tag.lock = NULL"); } } + #endif /* LOCK_DEBUG */ diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 503312b53df..1b0058eaeff 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.113 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.114 2001/10/28 06:25:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -653,7 +653,7 @@ ProcSleep(LOCKMETHODTABLE *lockMethodTable, MyProc->waitHolder = holder; MyProc->waitLockMode = lockmode; - MyProc->errType = STATUS_OK; /* initialize result for success */ + MyProc->errType = STATUS_OK; /* initialize result for success */ /* * If we detected deadlock, give up without waiting. This must agree diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c index 84934b3b026..86c5bac6d97 100644 --- a/src/backend/storage/lmgr/s_lock.c +++ b/src/backend/storage/lmgr/s_lock.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/s_lock.c,v 1.3 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/s_lock.c,v 1.4 2001/10/28 06:25:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -248,8 +248,6 @@ tas_dummy() /* really means: extern int tas(slock_t #if defined(NEED_I386_TAS_ASM) /* non gcc i386 based things */ #endif /* NEED_I386_TAS_ASM */ - - #endif /* not __GNUC__ */ @@ -292,4 +290,5 @@ main() exit(3); } + #endif /* S_LOCK_TEST */ diff --git a/src/backend/storage/lmgr/spin.c b/src/backend/storage/lmgr/spin.c index 59a7b4414c5..0c13062dcbc 100644 --- a/src/backend/storage/lmgr/spin.c +++ b/src/backend/storage/lmgr/spin.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/spin.c,v 1.5 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/spin.c,v 1.6 2001/10/28 06:25:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -186,4 +186,5 @@ tas_sema(volatile slock_t *lock) /* Note that TAS macros return 0 if *success* */ return !IpcSemaphoreTryLock(lock->semId, lock->sem); } + #endif /* !HAS_TEST_AND_SET */ diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c index 3fc1958b538..ada46e68172 100644 --- a/src/backend/storage/page/bufpage.c +++ b/src/backend/storage/page/bufpage.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.39 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.40 2001/10/28 06:25:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -389,7 +389,7 @@ PageGetFreeSpace(Page page) if (space < sizeof(ItemIdData)) return 0; - space -= sizeof(ItemIdData); /* XXX not always appropriate */ + space -= sizeof(ItemIdData); /* XXX not always appropriate */ return space; } diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c index c8fd7829888..c9139ef18e7 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.88 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.89 2001/10/28 06:25:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -58,7 +58,7 @@ typedef struct _MdfdVec int mdfd_nextFree; /* link to next freelist member, if free */ #ifndef LET_OS_MANAGE_FILESIZE - struct _MdfdVec *mdfd_chain; /* for large relations */ + struct _MdfdVec *mdfd_chain; /* for large relations */ #endif } MdfdVec; diff --git a/src/backend/storage/smgr/mm.c b/src/backend/storage/smgr/mm.c index 789083fba2b..fab130cd373 100644 --- a/src/backend/storage/smgr/mm.c +++ b/src/backend/storage/smgr/mm.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.28 2001/10/25 05:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.29 2001/10/28 06:25:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -561,4 +561,5 @@ MMShmemSize() return size; } + #endif /* STABLE_MEMORY_STORAGE */ |