diff options
| author | Tom Lane | 2000-06-28 03:33:33 +0000 |
|---|---|---|
| committer | Tom Lane | 2000-06-28 03:33:33 +0000 |
| commit | 1aebc3618a0be13451918581ad390ad9a3518702 (patch) | |
| tree | e8ab228245c43ff086bd8e9d65baf3d1d9a5f96a /src/include/storage | |
| parent | b601c8d8828ee02ffb195dead82b233b9572fe32 (diff) | |
First phase of memory management rewrite (see backend/utils/mmgr/README
for details). It doesn't really do that much yet, since there are no
short-term memory contexts in the executor, but the infrastructure is
in place and long-term contexts are handled reasonably. A few long-
standing bugs have been fixed, such as 'VACUUM; anything' in a single
query string crashing. Also, out-of-memory is now considered a
recoverable ERROR, not FATAL.
Eliminate a large amount of crufty, now-dead code in and around
memory management.
Fix problem with holding off SIGTRAP, SIGSEGV, etc in postmaster and
backend startup.
Diffstat (limited to 'src/include/storage')
| -rw-r--r-- | src/include/storage/shmem.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h index 85eb424777f..35545f95191 100644 --- a/src/include/storage/shmem.h +++ b/src/include/storage/shmem.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: shmem.h,v 1.22 2000/01/26 05:58:33 momjian Exp $ + * $Id: shmem.h,v 1.23 2000/06/28 03:33:27 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -63,14 +63,13 @@ typedef struct SHM_QUEUE extern void ShmemIndexReset(void); extern void ShmemCreate(unsigned int key, unsigned int size); extern int InitShmem(unsigned int key, unsigned int size); -extern long *ShmemAlloc(unsigned long size); +extern void *ShmemAlloc(Size size); extern int ShmemIsValid(unsigned long addr); extern HTAB *ShmemInitHash(char *name, long init_size, long max_size, HASHCTL *infoP, int hash_flags); extern bool ShmemPIDLookup(int pid, SHMEM_OFFSET *locationPtr); extern SHMEM_OFFSET ShmemPIDDestroy(int pid); -extern long *ShmemInitStruct(char *name, unsigned long size, - bool *foundPtr); +extern void *ShmemInitStruct(char *name, Size size, bool *foundPtr); typedef int TableID; |
