Move ProcState definition into sinvaladt.c from sinvaladt.h, since it's not

alvherre · alvherre · commit 23057f51f5c1 · 2008-03-17T11:50:27.000Z
needed anywhere after my previous patch.  Noticed by Tom Lane.

Also, remove #include &lt;signal.h&gt; from sinval.c.
diff --git a/src/backend/storage/ipc/sinval.c b/src/backend/storage/ipc/sinval.c
@@ -8,14 +8,12 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/ipc/sinval.c,v 1.84 2008/03/16 19:47:33 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/ipc/sinval.c,v 1.85 2008/03/17 11:50:26 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <signal.h>
-
 #include "access/xact.h"
 #include "commands/async.h"
 #include "miscadmin.h"
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.67 2008/03/16 19:47:33 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.68 2008/03/17 11:50:27 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -64,6 +64,13 @@
 #define MAXNUMMESSAGES 4096
 #define MSGNUMWRAPAROUND (MAXNUMMESSAGES * 4096)
 
+/* Per-backend state in shared invalidation structure */
+typedef struct ProcState
+{
+	/* nextMsgNum is -1 in an inactive ProcState array entry. */
+	int			nextMsgNum;		/* next message number to read, or -1 */
+	bool		resetState;		/* true, if backend has to reset its state */
+} ProcState;
 
 /* Shared cache invalidation memory segment */
 typedef struct SISeg
diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h
@@ -3,11 +3,18 @@
  * sinvaladt.h
  *	  POSTGRES shared cache invalidation segment definitions.
  *
+ * The shared cache invalidation manager is responsible for transmitting
+ * invalidation messages between backends.	Any message sent by any backend
+ * must be delivered to all already-running backends before it can be
+ * forgotten.
+ * 
+ * The struct type SharedInvalidationMessage, defining the contents of
+ * a single message, is defined in sinval.h.
  *
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/sinvaladt.h,v 1.46 2008/03/16 19:47:34 alvherre Exp $
+ * $PostgreSQL: pgsql/src/include/storage/sinvaladt.h,v 1.47 2008/03/17 11:50:27 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,24 +23,6 @@
 
 #include "storage/sinval.h"
 
-/*
- * The shared cache invalidation manager is responsible for transmitting
- * invalidation messages between backends.	Any message sent by any backend
- * must be delivered to all already-running backends before it can be
- * forgotten.
- * 
- * The struct type SharedInvalidationMessage, defining the contents of
- * a single message, is defined in sinval.h.
- */
-
-/* Per-backend state in shared invalidation structure */
-typedef struct ProcState
-{
-	/* nextMsgNum is -1 in an inactive ProcState array entry. */
-	int			nextMsgNum;		/* next message number to read, or -1 */
-	bool		resetState;		/* true, if backend has to reset its state */
-} ProcState;
-
 
 /*
  * prototypes for functions in sinvaladt.c

Original file line number	Diff line number	Diff line change
`@@ -8,14 +8,12 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/storage/ipc/sinval.c,v 1.84 2008/03/16 19:47:33 alvherre Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/storage/ipc/sinval.c,v 1.85 2008/03/17 11:50:26 alvherre Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`15`	`15`	`#include "postgres.h"`
`16`	`16`
`17`		`-#include <signal.h>`
`18`		`-`
`19`	`17`	`#include "access/xact.h"`
`20`	`18`	`#include "commands/async.h"`
`21`	`19`	`#include "miscadmin.h"`