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

needed anywhere after my previous patch.  Noticed by Tom Lane.

Also, remove #include <signal.h> from sinval.c.

diff --git a/src/backend/storage/ipc/sinval.c b/src/backend/storage/ipc/sinval.c
index a0c0b17cc958b1e601d592b2511765d97a0a831f..e151e3fab5b7bfe65c48da2e12f64f0e241b7b8f 100644 (file)
--- a/src/backend/storage/ipc/sinval.c
+++ b/src/backend/storage/ipc/sinval.c
@@ -14,8 +14,6 @@
  */
 #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
index 2d6f52eb906e3e41c36489b1eca5d0c4aef51144..0ed5927150c77dcf14672217b99b32368d0a0260 100644 (file)
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -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
index 25fddae6a06edddc9700d910092d46f55a24ea01..72d68c0ba9a618ba69dcb0c7e82d44f7ec22c74a 100644 (file)
--- a/src/include/storage/sinvaladt.h
+++ b/src/include/storage/sinvaladt.h
@@ -3,6 +3,13 @@
  * 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
@@ -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