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

Commit8f28789

Browse files
Rename BgWriterShmem/Request to CheckpointerShmem/Request
1 parentbbd3ec9 commit8f28789

File tree

3 files changed

+56
-55
lines changed

3 files changed

+56
-55
lines changed

‎src/backend/postmaster/checkpointer.c

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ typedef struct
110110
ForkNumberforknum;
111111
BlockNumbersegno;/* see md.c for special values */
112112
/* might add a real request-type field later; not needed yet */
113-
}BgWriterRequest;
113+
}CheckpointerRequest;
114114

115115
typedefstruct
116116
{
@@ -129,10 +129,10 @@ typedef struct
129129

130130
intnum_requests;/* current # of requests */
131131
intmax_requests;/* allocated array size */
132-
BgWriterRequestrequests[1];/* VARIABLE LENGTH ARRAY */
133-
}BgWriterShmemStruct;
132+
CheckpointerRequestrequests[1];/* VARIABLE LENGTH ARRAY */
133+
}CheckpointerShmemStruct;
134134

135-
staticBgWriterShmemStruct*BgWriterShmem;
135+
staticCheckpointerShmemStruct*CheckpointerShmem;
136136

137137
/* interval for calling AbsorbFsyncRequests in CheckpointWriteDelay */
138138
#defineWRITES_PER_ABSORB1000
@@ -195,7 +195,7 @@ CheckpointerMain(void)
195195
sigjmp_buflocal_sigjmp_buf;
196196
MemoryContextcheckpointer_context;
197197

198-
BgWriterShmem->checkpointer_pid=MyProcPid;
198+
CheckpointerShmem->checkpointer_pid=MyProcPid;
199199
am_checkpointer= true;
200200

201201
/*
@@ -302,7 +302,7 @@ CheckpointerMain(void)
302302
if (ckpt_active)
303303
{
304304
/* use volatile pointer to prevent code rearrangement */
305-
volatileBgWriterShmemStruct*bgs=BgWriterShmem;
305+
volatileCheckpointerShmemStruct*bgs=CheckpointerShmem;
306306

307307
SpinLockAcquire(&bgs->ckpt_lck);
308308
bgs->ckpt_failed++;
@@ -455,7 +455,7 @@ CheckpointerMain(void)
455455
booldo_restartpoint;
456456

457457
/* use volatile pointer to prevent code rearrangement */
458-
volatileBgWriterShmemStruct*bgs=BgWriterShmem;
458+
volatileCheckpointerShmemStruct*bgs=CheckpointerShmem;
459459

460460
/*
461461
* Check if we should perform a checkpoint or a restartpoint. As a
@@ -651,7 +651,7 @@ ImmediateCheckpointRequested(void)
651651
{
652652
if (checkpoint_requested)
653653
{
654-
volatileBgWriterShmemStruct*bgs=BgWriterShmem;
654+
volatileCheckpointerShmemStruct*bgs=CheckpointerShmem;
655655

656656
/*
657657
* We don't need to acquire the ckpt_lck in this case because we're
@@ -893,44 +893,44 @@ ReqShutdownHandler(SIGNAL_ARGS)
893893
*/
894894

895895
/*
896-
*BgWriterShmemSize
896+
*CheckpointerShmemSize
897897
*Compute space needed for bgwriter-related shared memory
898898
*/
899899
Size
900-
BgWriterShmemSize(void)
900+
CheckpointerShmemSize(void)
901901
{
902902
Sizesize;
903903

904904
/*
905905
* Currently, the size of the requests[] array is arbitrarily set equal to
906906
* NBuffers. This may prove too large or small ...
907907
*/
908-
size= offsetof(BgWriterShmemStruct,requests);
909-
size=add_size(size,mul_size(NBuffers,sizeof(BgWriterRequest)));
908+
size= offsetof(CheckpointerShmemStruct,requests);
909+
size=add_size(size,mul_size(NBuffers,sizeof(CheckpointerRequest)));
910910

911911
returnsize;
912912
}
913913

914914
/*
915-
*BgWriterShmemInit
915+
*CheckpointerShmemInit
916916
*Allocate and initialize bgwriter-related shared memory
917917
*/
918918
void
919-
BgWriterShmemInit(void)
919+
CheckpointerShmemInit(void)
920920
{
921921
boolfound;
922922

923-
BgWriterShmem= (BgWriterShmemStruct*)
923+
CheckpointerShmem= (CheckpointerShmemStruct*)
924924
ShmemInitStruct("Background Writer Data",
925-
BgWriterShmemSize(),
925+
CheckpointerShmemSize(),
926926
&found);
927927

928928
if (!found)
929929
{
930930
/* First time through, so initialize */
931-
MemSet(BgWriterShmem,0,sizeof(BgWriterShmemStruct));
932-
SpinLockInit(&BgWriterShmem->ckpt_lck);
933-
BgWriterShmem->max_requests=NBuffers;
931+
MemSet(CheckpointerShmem,0,sizeof(CheckpointerShmemStruct));
932+
SpinLockInit(&CheckpointerShmem->ckpt_lck);
933+
CheckpointerShmem->max_requests=NBuffers;
934934
}
935935
}
936936

@@ -955,7 +955,7 @@ void
955955
RequestCheckpoint(intflags)
956956
{
957957
/* use volatile pointer to prevent code rearrangement */
958-
volatileBgWriterShmemStruct*bgs=BgWriterShmem;
958+
volatileCheckpointerShmemStruct*bgs=CheckpointerShmem;
959959
intntries;
960960
intold_failed,
961961
old_started;
@@ -1006,7 +1006,7 @@ RequestCheckpoint(int flags)
10061006
*/
10071007
for (ntries=0;;ntries++)
10081008
{
1009-
if (BgWriterShmem->checkpointer_pid==0)
1009+
if (CheckpointerShmem->checkpointer_pid==0)
10101010
{
10111011
if (ntries >=20)/* max wait 2.0 sec */
10121012
{
@@ -1015,7 +1015,7 @@ RequestCheckpoint(int flags)
10151015
break;
10161016
}
10171017
}
1018-
elseif (kill(BgWriterShmem->checkpointer_pid,SIGINT)!=0)
1018+
elseif (kill(CheckpointerShmem->checkpointer_pid,SIGINT)!=0)
10191019
{
10201020
if (ntries >=20)/* max wait 2.0 sec */
10211021
{
@@ -1109,7 +1109,7 @@ bool
11091109
ForwardFsyncRequest(RelFileNodeBackendrnode,ForkNumberforknum,
11101110
BlockNumbersegno)
11111111
{
1112-
BgWriterRequest*request;
1112+
CheckpointerRequest*request;
11131113
booltoo_full;
11141114

11151115
if (!IsUnderPostmaster)
@@ -1121,35 +1121,35 @@ ForwardFsyncRequest(RelFileNodeBackend rnode, ForkNumber forknum,
11211121
LWLockAcquire(CheckpointerCommLock,LW_EXCLUSIVE);
11221122

11231123
/* Count all backend writes regardless of if they fit in the queue */
1124-
BgWriterShmem->num_backend_writes++;
1124+
CheckpointerShmem->num_backend_writes++;
11251125

11261126
/*
11271127
* If the checkpointer isn't running or the request queue is full,
11281128
* the backend will have to perform its own fsync request.But before
11291129
* forcing that to happen, we can try to compact the request queue.
11301130
*/
1131-
if (BgWriterShmem->checkpointer_pid==0||
1132-
(BgWriterShmem->num_requests >=BgWriterShmem->max_requests&&
1131+
if (CheckpointerShmem->checkpointer_pid==0||
1132+
(CheckpointerShmem->num_requests >=CheckpointerShmem->max_requests&&
11331133
!CompactCheckpointerRequestQueue()))
11341134
{
11351135
/*
11361136
* Count the subset of writes where backends have to do their own
11371137
* fsync
11381138
*/
1139-
BgWriterShmem->num_backend_fsync++;
1139+
CheckpointerShmem->num_backend_fsync++;
11401140
LWLockRelease(CheckpointerCommLock);
11411141
return false;
11421142
}
11431143

11441144
/* OK, insert request */
1145-
request=&BgWriterShmem->requests[BgWriterShmem->num_requests++];
1145+
request=&CheckpointerShmem->requests[CheckpointerShmem->num_requests++];
11461146
request->rnode=rnode;
11471147
request->forknum=forknum;
11481148
request->segno=segno;
11491149

11501150
/* If queue is more than half full, nudge the checkpointer to empty it */
1151-
too_full= (BgWriterShmem->num_requests >=
1152-
BgWriterShmem->max_requests /2);
1151+
too_full= (CheckpointerShmem->num_requests >=
1152+
CheckpointerShmem->max_requests /2);
11531153

11541154
LWLockRelease(CheckpointerCommLock);
11551155

@@ -1180,7 +1180,7 @@ CompactCheckpointerRequestQueue(void)
11801180
{
11811181
structBgWriterSlotMapping
11821182
{
1183-
BgWriterRequestrequest;
1183+
CheckpointerRequestrequest;
11841184
intslot;
11851185
};
11861186

@@ -1196,16 +1196,16 @@ CompactCheckpointerRequestQueue(void)
11961196

11971197
/* Initialize temporary hash table */
11981198
MemSet(&ctl,0,sizeof(ctl));
1199-
ctl.keysize=sizeof(BgWriterRequest);
1199+
ctl.keysize=sizeof(CheckpointerRequest);
12001200
ctl.entrysize=sizeof(structBgWriterSlotMapping);
12011201
ctl.hash=tag_hash;
12021202
htab=hash_create("CompactCheckpointerRequestQueue",
1203-
BgWriterShmem->num_requests,
1203+
CheckpointerShmem->num_requests,
12041204
&ctl,
12051205
HASH_ELEM |HASH_FUNCTION);
12061206

12071207
/* Initialize skip_slot array */
1208-
skip_slot=palloc0(sizeof(bool)*BgWriterShmem->num_requests);
1208+
skip_slot=palloc0(sizeof(bool)*CheckpointerShmem->num_requests);
12091209

12101210
/*
12111211
* The basic idea here is that a request can be skipped if it's followed
@@ -1220,13 +1220,13 @@ CompactCheckpointerRequestQueue(void)
12201220
* anyhow), but it's not clear that the extra complexity would buy us
12211221
* anything.
12221222
*/
1223-
for (n=0;n<BgWriterShmem->num_requests;++n)
1223+
for (n=0;n<CheckpointerShmem->num_requests;++n)
12241224
{
1225-
BgWriterRequest*request;
1225+
CheckpointerRequest*request;
12261226
structBgWriterSlotMapping*slotmap;
12271227
boolfound;
12281228

1229-
request=&BgWriterShmem->requests[n];
1229+
request=&CheckpointerShmem->requests[n];
12301230
slotmap=hash_search(htab,request,HASH_ENTER,&found);
12311231
if (found)
12321232
{
@@ -1247,16 +1247,16 @@ CompactCheckpointerRequestQueue(void)
12471247
}
12481248

12491249
/* We found some duplicates; remove them. */
1250-
for (n=0,preserve_count=0;n<BgWriterShmem->num_requests;++n)
1250+
for (n=0,preserve_count=0;n<CheckpointerShmem->num_requests;++n)
12511251
{
12521252
if (skip_slot[n])
12531253
continue;
1254-
BgWriterShmem->requests[preserve_count++]=BgWriterShmem->requests[n];
1254+
CheckpointerShmem->requests[preserve_count++]=CheckpointerShmem->requests[n];
12551255
}
12561256
ereport(DEBUG1,
12571257
(errmsg("compacted fsync request queue from %d entries to %d entries",
1258-
BgWriterShmem->num_requests,preserve_count)));
1259-
BgWriterShmem->num_requests=preserve_count;
1258+
CheckpointerShmem->num_requests,preserve_count)));
1259+
CheckpointerShmem->num_requests=preserve_count;
12601260

12611261
/* Cleanup. */
12621262
pfree(skip_slot);
@@ -1275,8 +1275,8 @@ CompactCheckpointerRequestQueue(void)
12751275
void
12761276
AbsorbFsyncRequests(void)
12771277
{
1278-
BgWriterRequest*requests=NULL;
1279-
BgWriterRequest*request;
1278+
CheckpointerRequest*requests=NULL;
1279+
CheckpointerRequest*request;
12801280
intn;
12811281

12821282
if (!am_checkpointer)
@@ -1298,19 +1298,19 @@ AbsorbFsyncRequests(void)
12981298
LWLockAcquire(CheckpointerCommLock,LW_EXCLUSIVE);
12991299

13001300
/* Transfer stats counts into pending pgstats message */
1301-
BgWriterStats.m_buf_written_backend+=BgWriterShmem->num_backend_writes;
1302-
BgWriterStats.m_buf_fsync_backend+=BgWriterShmem->num_backend_fsync;
1301+
BgWriterStats.m_buf_written_backend+=CheckpointerShmem->num_backend_writes;
1302+
BgWriterStats.m_buf_fsync_backend+=CheckpointerShmem->num_backend_fsync;
13031303

1304-
BgWriterShmem->num_backend_writes=0;
1305-
BgWriterShmem->num_backend_fsync=0;
1304+
CheckpointerShmem->num_backend_writes=0;
1305+
CheckpointerShmem->num_backend_fsync=0;
13061306

1307-
n=BgWriterShmem->num_requests;
1307+
n=CheckpointerShmem->num_requests;
13081308
if (n>0)
13091309
{
1310-
requests= (BgWriterRequest*)palloc(n*sizeof(BgWriterRequest));
1311-
memcpy(requests,BgWriterShmem->requests,n*sizeof(BgWriterRequest));
1310+
requests= (CheckpointerRequest*)palloc(n*sizeof(CheckpointerRequest));
1311+
memcpy(requests,CheckpointerShmem->requests,n*sizeof(CheckpointerRequest));
13121312
}
1313-
BgWriterShmem->num_requests=0;
1313+
CheckpointerShmem->num_requests=0;
13141314

13151315
LWLockRelease(CheckpointerCommLock);
13161316

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ CreateSharedMemoryAndSemaphores(bool makePrivate, int port)
119119
size=add_size(size,SInvalShmemSize());
120120
size=add_size(size,PMSignalShmemSize());
121121
size=add_size(size,ProcSignalShmemSize());
122-
size=add_size(size,BgWriterShmemSize());
122+
size=add_size(size,CheckpointerShmemSize());
123123
size=add_size(size,AutoVacuumShmemSize());
124124
size=add_size(size,WalSndShmemSize());
125125
size=add_size(size,WalRcvShmemSize());
@@ -224,7 +224,7 @@ CreateSharedMemoryAndSemaphores(bool makePrivate, int port)
224224
*/
225225
PMSignalShmemInit();
226226
ProcSignalShmemInit();
227-
BgWriterShmemInit();
227+
CheckpointerShmemInit();
228228
AutoVacuumShmemInit();
229229
WalSndShmemInit();
230230
WalRcvShmemInit();

‎src/include/postmaster/bgwriter.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ extern bool ForwardFsyncRequest(RelFileNodeBackend rnode, ForkNumber forknum,
3232
BlockNumbersegno);
3333
externvoidAbsorbFsyncRequests(void);
3434

35-
externSizeBgWriterShmemSize(void);
36-
externvoidBgWriterShmemInit(void);
35+
/* These were previously called BgWriterShmem... */
36+
externSizeCheckpointerShmemSize(void);
37+
externvoidCheckpointerShmemInit(void);
3738

3839
#endif/* _BGWRITER_H */

0 commit comments

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