Suppress compile warning, avoid possible problems with signed vs. unsigned

tglsfdc · tglsfdc · commit 810f2cfa3298 · 2002-11-18T00:40:46.000Z
comparisons in recently-added CheckPointWarning code.
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.297 2002/11/15 02:44:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.298 2002/11/18 00:40:46 tgl Exp $
  *
  * NOTES
  *
@@ -2338,12 +2338,17 @@ sigusr1_handler(SIGNAL_ARGS)
 			 *	segment files.  Other checkpoints could reduce
 			 *	the frequency of forced checkpoints.
 			 */
-			time_t now = time(NULL);
+			time_t	now = time(NULL);
 
-			if (now - LastSignalledCheckpoint < CheckPointWarning)
-				elog(LOG, "Checkpoint segments are being created too frequently (%d secs)\n
-				Consider increasing CHECKPOINT_SEGMENTS",
-				now - LastSignalledCheckpoint);
+			if (LastSignalledCheckpoint != 0)
+			{
+				int		elapsed_secs = now - LastSignalledCheckpoint;
+
+				if (elapsed_secs < CheckPointWarning)
+					elog(LOG, "Checkpoint segments are being created too frequently (%d secs)"
+						 "\n\tConsider increasing CHECKPOINT_SEGMENTS",
+						 elapsed_secs);
+			}
 			LastSignalledCheckpoint = now;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.297 2002/11/15 02:44:55 momjian Exp $`
	`40`	`+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.298 2002/11/18 00:40:46 tgl Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -2338,12 +2338,17 @@ sigusr1_handler(SIGNAL_ARGS)`
`2338`	`2338`	`* segment files. Other checkpoints could reduce`
`2339`	`2339`	`* the frequency of forced checkpoints.`
`2340`	`2340`	`*/`
`2341`		`- time_t now = time(NULL);`
	`2341`	`+ time_t now = time(NULL);`
`2342`	`2342`
`2343`		`- if (now - LastSignalledCheckpoint < CheckPointWarning)`
`2344`		`- elog(LOG, "Checkpoint segments are being created too frequently (%d secs)\n`
`2345`		`- Consider increasing CHECKPOINT_SEGMENTS",`
`2346`		`- now - LastSignalledCheckpoint);`
	`2343`	`+ if (LastSignalledCheckpoint != 0)`
	`2344`	`+ {`
	`2345`	`+ int elapsed_secs = now - LastSignalledCheckpoint;`
	`2346`	`+`
	`2347`	`+ if (elapsed_secs < CheckPointWarning)`
	`2348`	`+ elog(LOG, "Checkpoint segments are being created too frequently (%d secs)"`
	`2349`	`+ "\n\tConsider increasing CHECKPOINT_SEGMENTS",`
	`2350`	`+ elapsed_secs);`
	`2351`	`+ }`
`2347`	`2352`	`LastSignalledCheckpoint = now;`
`2348`	`2353`	`}`
`2349`	`2354`