Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitec6550c

Browse files
committed
Modify interactions between sinval.c and sinvaladt.c. The code that actually
deals with the queue, including locking etc, is all in sinvaladt.c. This meansthat the struct definition of the queue, and the queue pointer, are nowinternal "implementation details" inside sinvaladt.c.Per my proposal dated 25-Jun-2007 and followup discussion.
1 parenta3f66ea commitec6550c

File tree

6 files changed

+173
-190
lines changed

6 files changed

+173
-190
lines changed

‎src/backend/storage/ipc/ipci.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/storage/ipc/ipci.c,v 1.94 2008/01/01 19:45:51 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/storage/ipc/ipci.c,v 1.95 2008/03/16 19:47:33 alvherre Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -30,7 +30,7 @@
3030
#include"storage/pg_shmem.h"
3131
#include"storage/pmsignal.h"
3232
#include"storage/procarray.h"
33-
#include"storage/sinval.h"
33+
#include"storage/sinvaladt.h"
3434
#include"storage/spin.h"
3535

3636

‎src/backend/storage/ipc/sinval.c‎

Lines changed: 4 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/storage/ipc/sinval.c,v 1.83 2008/01/01 19:45:51 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/storage/ipc/sinval.c,v 1.84 2008/03/16 19:47:33 alvherre Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -48,38 +48,6 @@ static volatile int catchupInterruptOccurred = 0;
4848
staticvoidProcessCatchupEvent(void);
4949

5050

51-
/****************************************************************************/
52-
/*CreateSharedInvalidationState() Initialize SI buffer*/
53-
/**/
54-
/*should be called only by the POSTMASTER*/
55-
/****************************************************************************/
56-
void
57-
CreateSharedInvalidationState(void)
58-
{
59-
/* SInvalLock must be initialized already, during LWLock init */
60-
SIBufferInit();
61-
}
62-
63-
/*
64-
* InitBackendSharedInvalidationState
65-
*Initialize new backend's state info in buffer segment.
66-
*/
67-
void
68-
InitBackendSharedInvalidationState(void)
69-
{
70-
intflag;
71-
72-
LWLockAcquire(SInvalLock,LW_EXCLUSIVE);
73-
flag=SIBackendInit(shmInvalBuffer);
74-
LWLockRelease(SInvalLock);
75-
if (flag<0)/* unexpected problem */
76-
elog(FATAL,"shared cache invalidation initialization failed");
77-
if (flag==0)/* expected problem: MaxBackends exceeded */
78-
ereport(FATAL,
79-
(errcode(ERRCODE_TOO_MANY_CONNECTIONS),
80-
errmsg("sorry, too many clients already")));
81-
}
82-
8351
/*
8452
* SendSharedInvalidMessage
8553
*Add a shared-cache-invalidation message to the global SI message queue.
@@ -89,9 +57,7 @@ SendSharedInvalidMessage(SharedInvalidationMessage *msg)
8957
{
9058
boolinsertOK;
9159

92-
LWLockAcquire(SInvalLock,LW_EXCLUSIVE);
93-
insertOK=SIInsertDataEntry(shmInvalBuffer,msg);
94-
LWLockRelease(SInvalLock);
60+
insertOK=SIInsertDataEntry(msg);
9561
if (!insertOK)
9662
elog(DEBUG4,"SI buffer overflow");
9763
}
@@ -123,19 +89,7 @@ ReceiveSharedInvalidMessages(
12389
*/
12490
catchupInterruptOccurred=0;
12591

126-
/*
127-
* We can run SIGetDataEntry in parallel with other backends running
128-
* SIGetDataEntry for themselves, since each instance will modify only
129-
* fields of its own backend's ProcState, and no instance will look at
130-
* fields of other backends' ProcStates. We express this by grabbing
131-
* SInvalLock in shared mode. Note that this is not exactly the
132-
* normal (read-only) interpretation of a shared lock! Look closely at
133-
* the interactions before allowing SInvalLock to be grabbed in shared
134-
* mode for any other reason!
135-
*/
136-
LWLockAcquire(SInvalLock,LW_SHARED);
137-
getResult=SIGetDataEntry(shmInvalBuffer,MyBackendId,&data);
138-
LWLockRelease(SInvalLock);
92+
getResult=SIGetDataEntry(MyBackendId,&data);
13993

14094
if (getResult==0)
14195
break;/* nothing more to do */
@@ -155,11 +109,7 @@ ReceiveSharedInvalidMessages(
155109

156110
/* If we got any messages, try to release dead messages */
157111
if (gotMessage)
158-
{
159-
LWLockAcquire(SInvalLock,LW_EXCLUSIVE);
160-
SIDelExpiredDataEntries(shmInvalBuffer);
161-
LWLockRelease(SInvalLock);
162-
}
112+
SIDelExpiredDataEntries(false);
163113
}
164114

165115

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp