Re-add mention of FAQ's for shared memory/ipc errors.

bmomjian · bmomjian · commit 588356320821 · 1999-10-10T16:53:51.000Z
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.39 1999/10/06 21:58:06 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.40 1999/10/10 16:53:51 momjian Exp $
  *
  * NOTES
  *
@@ -46,6 +46,7 @@
 static int	UsePrivateMemory = 0;
 
 static void IpcMemoryDetach(int status, char *shmaddr);
+static void IpcConfigTip(void);
 
 /* ----------------------------------------------------------------
  *						exit() handling stuff
@@ -329,6 +330,7 @@ IpcSemaphoreCreate(IpcSemaphoreKey semKey,
 			EPRINTF("IpcSemaphoreCreate: semget failed (%s) "
 					"key=%d, num=%d, permission=%o",
 					strerror(errno), semKey, semNum, permission);
+			IpcConfigTip();
 			return(-1);
 		}
 		for (i = 0; i < semNum; i++)
@@ -340,6 +342,7 @@ IpcSemaphoreCreate(IpcSemaphoreKey semKey,
 			EPRINTF("IpcSemaphoreCreate: semctl failed (%s) id=%d",
 					strerror(errno), semId);
 			semctl(semId, 0, IPC_RMID, semun);
+			IpcConfigTip();
 			return(-1);
 		}
 
@@ -534,6 +537,7 @@ IpcMemoryCreate(IpcMemoryKey memKey, uint32 size, int permission)
 		EPRINTF("IpcMemoryCreate: shmget failed (%s) "
 				"key=%d, size=%d, permission=%o",
 				strerror(errno), memKey, size, permission);
+		IpcConfigTip();
 		return IpcMemCreationFailed;
 	}
 
@@ -711,13 +715,12 @@ LockIsFree(int lockid)
 
 #endif	 /* HAS_TEST_AND_SET */
 
-#ifdef NOT_USED
 static void
 IpcConfigTip(void)
 {
-	fprintf(stderr, "This type of error is usually caused by improper\n");
+	fprintf(stderr, "This type of error is usually caused by an improper\n");
 	fprintf(stderr, "shared memory or System V IPC semaphore configuration.\n");
-	fprintf(stderr, "See the FAQ for more detailed information\n");
+	fprintf(stderr, "For more information, see the FAQ and platform-specific\n");
+	fprintf(stderr, "FAQ's in the source directory pgsql/doc or on our\n");
+	fprintf(stderr, "web site at http://www.postgresql.org.\n");
 }
-
-#endif

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.39 1999/10/06 21:58:06 vadim Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.40 1999/10/10 16:53:51 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`*`
`@@ -46,6 +46,7 @@`
`46`	`46`	`static int UsePrivateMemory = 0;`
`47`	`47`
`48`	`48`	`static void IpcMemoryDetach(int status, char *shmaddr);`
	`49`	`+static void IpcConfigTip(void);`
`49`	`50`
`50`	`51`	`/* ----------------------------------------------------------------`
`51`	`52`	`* exit() handling stuff`
`@@ -329,6 +330,7 @@ IpcSemaphoreCreate(IpcSemaphoreKey semKey,`
`329`	`330`	`EPRINTF("IpcSemaphoreCreate: semget failed (%s) "`
`330`	`331`	`"key=%d, num=%d, permission=%o",`
`331`	`332`	`strerror(errno), semKey, semNum, permission);`
	`333`	`+ IpcConfigTip();`
`332`	`334`	`return(-1);`
`333`	`335`	`}`
`334`	`336`	`for (i = 0; i < semNum; i++)`
`@@ -340,6 +342,7 @@ IpcSemaphoreCreate(IpcSemaphoreKey semKey,`
`340`	`342`	`EPRINTF("IpcSemaphoreCreate: semctl failed (%s) id=%d",`
`341`	`343`	`strerror(errno), semId);`
`342`	`344`	`semctl(semId, 0, IPC_RMID, semun);`
	`345`	`+ IpcConfigTip();`
`343`	`346`	`return(-1);`
`344`	`347`	`}`
`345`	`348`
`@@ -534,6 +537,7 @@ IpcMemoryCreate(IpcMemoryKey memKey, uint32 size, int permission)`
`534`	`537`	`EPRINTF("IpcMemoryCreate: shmget failed (%s) "`
`535`	`538`	`"key=%d, size=%d, permission=%o",`
`536`	`539`	`strerror(errno), memKey, size, permission);`
	`540`	`+ IpcConfigTip();`
`537`	`541`	`return IpcMemCreationFailed;`
`538`	`542`	`}`
`539`	`543`
`@@ -711,13 +715,12 @@ LockIsFree(int lockid)`
`711`	`715`
`712`	`716`	`#endif /* HAS_TEST_AND_SET */`
`713`	`717`
`714`		`-#ifdef NOT_USED`
`715`	`718`	`static void`
`716`	`719`	`IpcConfigTip(void)`
`717`	`720`	`{`
`718`		`- fprintf(stderr, "This type of error is usually caused by improper\n");`
	`721`	`+ fprintf(stderr, "This type of error is usually caused by an improper\n");`
`719`	`722`	`fprintf(stderr, "shared memory or System V IPC semaphore configuration.\n");`
`720`		`- fprintf(stderr, "See the FAQ for more detailed information\n");`
	`723`	`+ fprintf(stderr, "For more information, see the FAQ and platform-specific\n");`
	`724`	`+ fprintf(stderr, "FAQ's in the source directory pgsql/doc or on our\n");`
	`725`	`+ fprintf(stderr, "web site at http://www.postgresql.org.\n");`
`721`	`726`	`}`
`722`		`-`
`723`		`-#endif`