Substantial rewrite of async.c to avoid problems with non-reentrant stdio

and possibly other problems.  Minor changes in xact.c and postgres.c's
main loop to support new handling of async NOTIFY.

3 files changed, 21 insertions, 13 deletions

diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index a612910047..d006264ae1 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: xact.h,v 1.15 1998/09/01 04:34:35 momjian Exp $
+ * $Id: xact.h,v 1.16 1998/10/06 02:40:06 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -107,6 +107,7 @@ extern void BeginTransactionBlock(void);
 extern void EndTransactionBlock(void);
 extern bool IsTransactionBlock(void);
 extern void UserAbortTransactionBlock(void);
+extern void AbortOutOfAnyTransaction(void);
 
 extern TransactionId DisabledTransactionId;
 
diff --git a/src/include/commands/async.h b/src/include/commands/async.h
index 2c9d0a348a..5494b0f6c7 100644
--- a/src/include/commands/async.h
+++ b/src/include/commands/async.h
@@ -1,27 +1,38 @@
 /*-------------------------------------------------------------------------
  *
  * async.h--
- *
- *
+ *	  Asynchronous notification: NOTIFY, LISTEN, UNLISTEN
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: async.h,v 1.9 1998/09/01 04:35:22 momjian Exp $
+ * $Id: async.h,v 1.10 1998/10/06 02:40:08 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef ASYNC_H
 #define ASYNC_H
 
-#include <nodes/memnodes.h>
+#include <postgres.h>
 
-extern void Async_NotifyHandler(SIGNAL_ARGS);
+/* notify-related SQL statements */
 extern void Async_Notify(char *relname);
-extern void Async_NotifyAtCommit(void);
-extern void Async_NotifyAtAbort(void);
 extern void Async_Listen(char *relname, int pid);
 extern void Async_Unlisten(char *relname, int pid);
 
-extern GlobalMemory notifyContext;
+/* perform (or cancel) outbound notify processing at transaction commit */
+extern void AtCommit_Notify(void);
+extern void AtAbort_Notify(void);
+
+/* signal handler for inbound notifies (SIGUSR2) */
+extern void Async_NotifyHandler(SIGNAL_ARGS);
+
+/*
+ * enable/disable processing of inbound notifies directly from signal handler.
+ * The enable routine first performs processing of any inbound notifies that
+ * have occurred since the last disable.  These are meant to be called ONLY
+ * from the appropriate places in PostgresMain().
+ */
+extern void EnableNotifyInterrupt(void);
+extern void DisableNotifyInterrupt(void);
 
 #endif	 /* ASYNC_H */
diff --git a/src/include/utils/trace.h b/src/include/utils/trace.h
index 8f716393c6..d978f16ab4 100644
--- a/src/include/utils/trace.h
+++ b/src/include/utils/trace.h
@@ -66,10 +66,6 @@ enum pg_option_enum
 	OPT_SYSLOG,					/* use syslog for error messages */
 	OPT_HOSTLOOKUP,				/* enable hostname lookup in ps_status */
 	OPT_SHOWPORTNUMBER,			/* show port number in ps_status */
-	OPT_NOTIFYUNLOCK,			/* enable unlock of pg_listener after
-								 * notify */
-	OPT_NOTIFYHACK,				/* enable notify hack to remove duplicate
-								 * tuples */
 
 	NUM_PG_OPTIONS				/* must be the last item of enum */
 };