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 6bf7ecdde874665424bb3445896992def0a35139..4b8a8f1afbdc487131c8738a1648f1b5c2aa340f 100644 (file)
--- 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
index 7c4956ae600697c932289fc454dffa41630879c0..485506a162d0cccce2b680a485cfc384d803f85a 100644 (file)
--- 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
index 012ce2d92cad1026a891cd80c837f6192a74c738..8535cba0f065350bc3badd2e969dd1e0e61f68d2 100644 (file)
--- 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