diff options
author | Bruce Momjian <bruce@momjian.us> | 2004-04-19 17:42:59 +0000 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 2004-04-19 17:42:59 +0000 |
commit | 31338352bd89439c7c55d25c13d88338fa874771 (patch) | |
tree | 318c34ab817a8d3e47b2fa6fa1c37ceacd8541a4 /src/backend/port/sysv_shmem.c | |
parent | 862b20b3822887bdb3b42a72ea0e73dc8028fb31 (diff) | |
download | postgresql-31338352bd89439c7c55d25c13d88338fa874771.tar.gz postgresql-31338352bd89439c7c55d25c13d88338fa874771.zip |
* Most changes are to fix warnings issued when compiling win32
* removed a few redundant defines
* get_user_name safe under win32
* rationalized pipe read EOF for win32 (UPDATED PATCH USED)
* changed all backend instances of sleep() to pg_usleep
- except for the SLEEP_ON_ASSERT in assert.c, as it would exceed a
32-bit long [Note to patcher: If a SLEEP_ON_ASSERT of 2000 seconds is
acceptable, please replace with pg_usleep(2000000000L)]
I added a comment to that part of the code:
/*
* It would be nice to use pg_usleep() here, but only does 2000 sec
* or 33 minutes, which seems too short.
*/
sleep(1000000);
Claudio Natoli
Diffstat (limited to 'src/backend/port/sysv_shmem.c')
-rw-r--r-- | src/backend/port/sysv_shmem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/port/sysv_shmem.c b/src/backend/port/sysv_shmem.c index 72d693f5f21..1c03fe4866b 100644 --- a/src/backend/port/sysv_shmem.c +++ b/src/backend/port/sysv_shmem.c @@ -10,7 +10,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/sysv_shmem.c,v 1.32 2004/02/25 19:41:22 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/port/sysv_shmem.c,v 1.33 2004/04/19 17:42:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -259,7 +259,7 @@ PGSharedMemoryCreate(uint32 size, bool makePrivate, int port) PGSharedMemoryDetach(); UsedShmemSegAddr = origUsedShmemSegAddr; #endif - elog(DEBUG3,"Attaching to %x",UsedShmemSegAddr); + elog(DEBUG3,"Attaching to %p",UsedShmemSegAddr); hdr = PGSharedMemoryAttach((IpcMemoryKey) UsedShmemSegID, &shmid); if (hdr == NULL) elog(FATAL, "could not attach to proper memory at fixed address: shmget(key=%d, addr=%p) failed: %m", |