mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Massimo's Deadlock patches w/o the #ifdefs

Browse Source
This commit is contained in:
Marc G. Fournier 1997-03-10 00:18:09 +00:00
parent 766bdd2bb5
commit 977654d55b
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/commands/async.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.12 1997/01/24 23:48:25 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.13 1997/03/10 00:18:09 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -84,6 +84,8 @@
#include <port-protos.h> /* for strdup() */ #include <port-protos.h> /* for strdup() */
#include <storage/lmgr.h>
static int notifyFrontEndPending = 0; static int notifyFrontEndPending = 0;
static int notifyIssued = 0; static int notifyIssued = 0;
static Dllist *pendingNotifies = NULL; static Dllist *pendingNotifies = NULL;
@ -194,6 +196,7 @@ Async_Notify(char *relname)
lRel = heap_openr(ListenerRelationName); lRel = heap_openr(ListenerRelationName);
tdesc = RelationGetTupleDescriptor(lRel); tdesc = RelationGetTupleDescriptor(lRel);
RelationSetLockForWrite(lRel);
sRel = heap_beginscan(lRel, 0, NowTimeQual, 1, &key); sRel = heap_beginscan(lRel, 0, NowTimeQual, 1, &key);
nulls[0] = nulls[1] = nulls[2] = ' '; nulls[0] = nulls[1] = nulls[2] = ' ';
@ -212,6 +215,7 @@ Async_Notify(char *relname)
ReleaseBuffer(b); ReleaseBuffer(b);
} }
heap_endscan(sRel); heap_endscan(sRel);
RelationUnsetLockForWrite(lRel);
heap_close(lRel); heap_close(lRel);
notifyIssued = 1; notifyIssued = 1;
} }
@ -269,6 +273,7 @@ Async_NotifyAtCommit()
Integer32EqualRegProcedure, Integer32EqualRegProcedure,
Int32GetDatum(1)); Int32GetDatum(1));
lRel = heap_openr(ListenerRelationName); lRel = heap_openr(ListenerRelationName);
RelationSetLockForWrite(lRel);
sRel = heap_beginscan(lRel, 0, NowTimeQual, 1, &key); sRel = heap_beginscan(lRel, 0, NowTimeQual, 1, &key);
tdesc = RelationGetTupleDescriptor(lRel); tdesc = RelationGetTupleDescriptor(lRel);
ourpid = getpid(); ourpid = getpid();
@ -302,6 +307,7 @@ Async_NotifyAtCommit()
ReleaseBuffer(b); ReleaseBuffer(b);
} }
heap_endscan(sRel); heap_endscan(sRel);
RelationUnsetLockForWrite(lRel);
heap_close(lRel); heap_close(lRel);
CommitTransactionCommand(); CommitTransactionCommand();
@ -405,6 +411,7 @@ Async_Listen(char *relname, int pid)
values[i++] = (Datum) 0; /* no notifies pending */ values[i++] = (Datum) 0; /* no notifies pending */
lDesc = heap_openr(ListenerRelationName); lDesc = heap_openr(ListenerRelationName);
RelationSetLockForWrite(lDesc);
/* is someone already listening. One listener per relation */ /* is someone already listening. One listener per relation */
tdesc = RelationGetTupleDescriptor(lDesc); tdesc = RelationGetTupleDescriptor(lDesc);
@ -440,6 +447,8 @@ Async_Listen(char *relname, int pid)
/* if (alreadyListener) { /* if (alreadyListener) {
elog(NOTICE,"Async_Listen: already one listener on %s (possibly dead)",relname); elog(NOTICE,"Async_Listen: already one listener on %s (possibly dead)",relname);
}*/ }*/
RelationUnsetLockForWrite(lDesc);
heap_close(lDesc); heap_close(lDesc);
/* /*
@ -480,9 +489,13 @@ Async_Unlisten(char *relname, int pid)
Int32GetDatum(pid), Int32GetDatum(pid),
0,0); 0,0);
lDesc = heap_openr(ListenerRelationName); lDesc = heap_openr(ListenerRelationName);
RelationSetLockForWrite(lDesc);
if (lTuple != NULL) { if (lTuple != NULL) {
heap_delete(lDesc,&lTuple->t_ctid); heap_delete(lDesc,&lTuple->t_ctid);
} }
RelationUnsetLockForWrite(lDesc);
heap_close(lDesc); heap_close(lDesc);
} }
@ -549,6 +562,7 @@ Async_NotifyFrontEnd()
Integer32EqualRegProcedure, Integer32EqualRegProcedure,
Int32GetDatum(ourpid)); Int32GetDatum(ourpid));
lRel = heap_openr(ListenerRelationName); lRel = heap_openr(ListenerRelationName);
RelationSetLockForWrite(lRel);
tdesc = RelationGetTupleDescriptor(lRel); tdesc = RelationGetTupleDescriptor(lRel);
sRel = heap_beginscan(lRel, 0, NowTimeQual, 2, key); sRel = heap_beginscan(lRel, 0, NowTimeQual, 2, key);