summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Conway2005-10-06 21:30:39 +0000
committerNeil Conway2005-10-06 21:30:39 +0000
commit7624fdd38e6d01fece676dc60d6985536b96a013 (patch)
treebd82b686d5e2750488146af09165d7a038c55061
parent12e983b9a1f4146097b9e24f82e21df07761ad0f (diff)
Minor API cleanup for async notifications: we can only register the
current backend in pg_listener, so there is little point in making the PID to register part of async.c's public API. Other minor tweaks.
-rw-r--r--src/backend/commands/async.c31
-rw-r--r--src/backend/tcop/utility.c4
-rw-r--r--src/include/commands/async.h6
3 files changed, 16 insertions, 25 deletions
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index ffabc346b7..d173ec9587 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -146,13 +146,10 @@ static void ClearPendingNotifies(void);
* Actual notification happens during transaction commit.
* ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
*
- * Results:
- * XXX
- *
*--------------------------------------------------------------
*/
void
-Async_Notify(char *relname)
+Async_Notify(const char *relname)
{
if (Trace_notify)
elog(DEBUG1, "Async_Notify(%s)", relname);
@@ -180,11 +177,8 @@ Async_Notify(char *relname)
*
* This is executed by the SQL listen command.
*
- * Register a backend (identified by its Unix PID) as listening
- * on the specified relation.
- *
- * Results:
- * XXX
+ * Register the current backend as listening on the specified
+ * relation.
*
* Side effects:
* pg_listener is updated.
@@ -192,7 +186,7 @@ Async_Notify(char *relname)
*--------------------------------------------------------------
*/
void
-Async_Listen(char *relname, int pid)
+Async_Listen(const char *relname)
{
Relation lRel;
HeapScanDesc scan;
@@ -203,7 +197,7 @@ Async_Listen(char *relname, int pid)
bool alreadyListener = false;
if (Trace_notify)
- elog(DEBUG1, "Async_Listen(%s,%d)", relname, pid);
+ elog(DEBUG1, "Async_Listen(%s,%d)", relname, MyProcPid);
lRel = heap_open(ListenerRelationId, ExclusiveLock);
@@ -213,7 +207,7 @@ Async_Listen(char *relname, int pid)
{
Form_pg_listener listener = (Form_pg_listener) GETSTRUCT(tuple);
- if (listener->listenerpid == pid &&
+ if (listener->listenerpid == MyProcPid &&
strncmp(NameStr(listener->relname), relname, NAMEDATALEN) == 0)
{
alreadyListener = true;
@@ -241,7 +235,7 @@ Async_Listen(char *relname, int pid)
i = 0;
values[i++] = (Datum) relname;
- values[i++] = (Datum) pid;
+ values[i++] = (Datum) MyProcPid;
values[i++] = (Datum) 0; /* no notifies pending */
tuple = heap_formtuple(RelationGetDescr(lRel), values, nulls);
@@ -271,19 +265,16 @@ Async_Listen(char *relname, int pid)
*
* This is executed by the SQL unlisten command.
*
- * Remove the backend from the list of listening backends
+ * Remove the current backend from the list of listening backends
* for the specified relation.
*
- * Results:
- * XXX
- *
* Side effects:
* pg_listener is updated.
*
*--------------------------------------------------------------
*/
void
-Async_Unlisten(char *relname, int pid)
+Async_Unlisten(const char *relname)
{
Relation lRel;
HeapScanDesc scan;
@@ -297,7 +288,7 @@ Async_Unlisten(char *relname, int pid)
}
if (Trace_notify)
- elog(DEBUG1, "Async_Unlisten(%s,%d)", relname, pid);
+ elog(DEBUG1, "Async_Unlisten(%s,%d)", relname, MyProcPid);
lRel = heap_open(ListenerRelationId, ExclusiveLock);
@@ -306,7 +297,7 @@ Async_Unlisten(char *relname, int pid)
{
Form_pg_listener listener = (Form_pg_listener) GETSTRUCT(tuple);
- if (listener->listenerpid == pid &&
+ if (listener->listenerpid == MyProcPid &&
strncmp(NameStr(listener->relname), relname, NAMEDATALEN) == 0)
{
/* Found the matching tuple, delete it */
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index cb6e275bfe..0aa3ee53cf 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -823,7 +823,7 @@ ProcessUtility(Node *parsetree,
{
ListenStmt *stmt = (ListenStmt *) parsetree;
- Async_Listen(stmt->relation->relname, MyProcPid);
+ Async_Listen(stmt->relation->relname);
}
break;
@@ -831,7 +831,7 @@ ProcessUtility(Node *parsetree,
{
UnlistenStmt *stmt = (UnlistenStmt *) parsetree;
- Async_Unlisten(stmt->relation->relname, MyProcPid);
+ Async_Unlisten(stmt->relation->relname);
}
break;
diff --git a/src/include/commands/async.h b/src/include/commands/async.h
index fd43d29d1e..2c02f27dbf 100644
--- a/src/include/commands/async.h
+++ b/src/include/commands/async.h
@@ -16,9 +16,9 @@
extern bool Trace_notify;
/* notify-related SQL statements */
-extern void Async_Notify(char *relname);
-extern void Async_Listen(char *relname, int pid);
-extern void Async_Unlisten(char *relname, int pid);
+extern void Async_Notify(const char *relname);
+extern void Async_Listen(const char *relname);
+extern void Async_Unlisten(const char *relname);
/* perform (or cancel) outbound notify processing at transaction commit */
extern void AtCommit_Notify(void);