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

Commit7202d72

Browse files
committed
backend launchers void * arguments for binary data
Change backend launcher functions to take void * for binary datainstead of char *. This removes the need for numerous casts.Reviewed-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>Discussion:https://www.postgresql.org/message-id/flat/fd1fcedb-3492-4fc8-9e3e-74b97f2db6c7%40eisentraut.org
1 parentb50a554 commit7202d72

26 files changed

+42
-42
lines changed

‎src/backend/postmaster/autovacuum.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ static void check_av_worker_gucs(void);
364364
* Main entry point for the autovacuum launcher process.
365365
*/
366366
void
367-
AutoVacLauncherMain(char*startup_data,size_tstartup_data_len)
367+
AutoVacLauncherMain(constvoid*startup_data,size_tstartup_data_len)
368368
{
369369
sigjmp_buflocal_sigjmp_buf;
370370

@@ -1371,7 +1371,7 @@ avl_sigusr2_handler(SIGNAL_ARGS)
13711371
* Main entry point for autovacuum worker processes.
13721372
*/
13731373
void
1374-
AutoVacWorkerMain(char*startup_data,size_tstartup_data_len)
1374+
AutoVacWorkerMain(constvoid*startup_data,size_tstartup_data_len)
13751375
{
13761376
sigjmp_buflocal_sigjmp_buf;
13771377
Oiddbid;

‎src/backend/postmaster/bgworker.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ bgworker_die(SIGNAL_ARGS)
714714
* Main entry point for background worker processes.
715715
*/
716716
void
717-
BackgroundWorkerMain(char*startup_data,size_tstartup_data_len)
717+
BackgroundWorkerMain(constvoid*startup_data,size_tstartup_data_len)
718718
{
719719
sigjmp_buflocal_sigjmp_buf;
720720
BackgroundWorker*worker;

‎src/backend/postmaster/bgwriter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ static XLogRecPtr last_snapshot_lsn = InvalidXLogRecPtr;
8484
* basic execution environment, but not enabled signals yet.
8585
*/
8686
void
87-
BackgroundWriterMain(char*startup_data,size_tstartup_data_len)
87+
BackgroundWriterMain(constvoid*startup_data,size_tstartup_data_len)
8888
{
8989
sigjmp_buflocal_sigjmp_buf;
9090
MemoryContextbgwriter_context;

‎src/backend/postmaster/checkpointer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ static void ReqShutdownXLOG(SIGNAL_ARGS);
175175
* basic execution environment, but not enabled signals yet.
176176
*/
177177
void
178-
CheckpointerMain(char*startup_data,size_tstartup_data_len)
178+
CheckpointerMain(constvoid*startup_data,size_tstartup_data_len)
179179
{
180180
sigjmp_buflocal_sigjmp_buf;
181181
MemoryContextcheckpointer_context;

‎src/backend/postmaster/launch_backend.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -149,18 +149,18 @@ typedef struct
149149

150150
#defineSizeOfBackendParameters(startup_data_len) (offsetof(BackendParameters, startup_data) + startup_data_len)
151151

152-
staticvoidread_backend_variables(char*id,char**startup_data,size_t*startup_data_len);
152+
staticvoidread_backend_variables(char*id,void**startup_data,size_t*startup_data_len);
153153
staticvoidrestore_backend_variables(BackendParameters*param);
154154

155155
staticboolsave_backend_variables(BackendParameters*param,intchild_slot,
156156
ClientSocket*client_sock,
157157
#ifdefWIN32
158158
HANDLEchildProcess,pid_tchildPid,
159159
#endif
160-
char*startup_data,size_tstartup_data_len);
160+
constvoid*startup_data,size_tstartup_data_len);
161161

162162
staticpid_tinternal_forkexec(constchar*child_kind,intchild_slot,
163-
char*startup_data,size_tstartup_data_len,
163+
constvoid*startup_data,size_tstartup_data_len,
164164
ClientSocket*client_sock);
165165

166166
#endif/* EXEC_BACKEND */
@@ -171,7 +171,7 @@ static pid_t internal_forkexec(const char *child_kind, int child_slot,
171171
typedefstruct
172172
{
173173
constchar*name;
174-
void(*main_fn) (char*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
174+
void(*main_fn) (constvoid*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
175175
boolshmem_attach;
176176
}child_process_kind;
177177

@@ -225,7 +225,7 @@ PostmasterChildName(BackendType child_type)
225225
*/
226226
pid_t
227227
postmaster_child_launch(BackendTypechild_type,intchild_slot,
228-
char*startup_data,size_tstartup_data_len,
228+
constvoid*startup_data,size_tstartup_data_len,
229229
ClientSocket*client_sock)
230230
{
231231
pid_tpid;
@@ -289,7 +289,7 @@ postmaster_child_launch(BackendType child_type, int child_slot,
289289
*/
290290
staticpid_t
291291
internal_forkexec(constchar*child_kind,intchild_slot,
292-
char*startup_data,size_tstartup_data_len,ClientSocket*client_sock)
292+
constvoid*startup_data,size_tstartup_data_len,ClientSocket*client_sock)
293293
{
294294
staticunsigned longtmpBackendFileNum=0;
295295
pid_tpid;
@@ -399,7 +399,7 @@ internal_forkexec(const char *child_kind, int child_slot,
399399
*/
400400
staticpid_t
401401
internal_forkexec(constchar*child_kind,intchild_slot,
402-
char*startup_data,size_tstartup_data_len,ClientSocket*client_sock)
402+
constvoid*startup_data,size_tstartup_data_len,ClientSocket*client_sock)
403403
{
404404
intretry_count=0;
405405
STARTUPINFOsi;
@@ -581,7 +581,7 @@ internal_forkexec(const char *child_kind, int child_slot,
581581
void
582582
SubPostmasterMain(intargc,char*argv[])
583583
{
584-
char*startup_data;
584+
void*startup_data;
585585
size_tstartup_data_len;
586586
char*child_kind;
587587
BackendTypechild_type;
@@ -699,7 +699,7 @@ save_backend_variables(BackendParameters *param,
699699
#ifdefWIN32
700700
HANDLEchildProcess,pid_tchildPid,
701701
#endif
702-
char*startup_data,size_tstartup_data_len)
702+
constvoid*startup_data,size_tstartup_data_len)
703703
{
704704
if (client_sock)
705705
memcpy(&param->client_sock,client_sock,sizeof(ClientSocket));
@@ -867,7 +867,7 @@ read_inheritable_socket(SOCKET *dest, InheritableSocket *src)
867867
#endif
868868

869869
staticvoid
870-
read_backend_variables(char*id,char**startup_data,size_t*startup_data_len)
870+
read_backend_variables(char*id,void**startup_data,size_t*startup_data_len)
871871
{
872872
BackendParametersparam;
873873

‎src/backend/postmaster/pgarch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ PgArchCanRestart(void)
214214

215215
/* Main entry point for archiver process */
216216
void
217-
PgArchiverMain(char*startup_data,size_tstartup_data_len)
217+
PgArchiverMain(constvoid*startup_data,size_tstartup_data_len)
218218
{
219219
Assert(startup_data_len==0);
220220

‎src/backend/postmaster/postmaster.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3517,7 +3517,7 @@ BackendStartup(ClientSocket *client_sock)
35173517
bn->bgworker_notify= false;
35183518

35193519
pid=postmaster_child_launch(bn->bkend_type,bn->child_slot,
3520-
(char*)&startup_data,sizeof(startup_data),
3520+
&startup_data,sizeof(startup_data),
35213521
client_sock);
35223522
if (pid<0)
35233523
{
@@ -4080,7 +4080,7 @@ StartBackgroundWorker(RegisteredBgWorker *rw)
40804080
rw->rw_worker.bgw_name)));
40814081

40824082
worker_pid=postmaster_child_launch(B_BG_WORKER,bn->child_slot,
4083-
(char*)&rw->rw_worker,sizeof(BackgroundWorker),NULL);
4083+
&rw->rw_worker,sizeof(BackgroundWorker),NULL);
40844084
if (worker_pid==-1)
40854085
{
40864086
/* in postmaster, fork failed ... */

‎src/backend/postmaster/startup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ StartupProcExit(int code, Datum arg)
213213
* ----------------------------------
214214
*/
215215
void
216-
StartupProcessMain(char*startup_data,size_tstartup_data_len)
216+
StartupProcessMain(constvoid*startup_data,size_tstartup_data_len)
217217
{
218218
Assert(startup_data_len==0);
219219

‎src/backend/postmaster/syslogger.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ typedef struct
162162
* argc/argv parameters are valid only in EXEC_BACKEND case.
163163
*/
164164
void
165-
SysLoggerMain(char*startup_data,size_tstartup_data_len)
165+
SysLoggerMain(constvoid*startup_data,size_tstartup_data_len)
166166
{
167167
#ifndefWIN32
168168
charlogbuffer[READ_BUF_SIZE];
@@ -183,7 +183,7 @@ SysLoggerMain(char *startup_data, size_t startup_data_len)
183183
*/
184184
#ifdefEXEC_BACKEND
185185
{
186-
SysloggerStartupData*slsdata= (SysloggerStartupData*)startup_data;
186+
constSysloggerStartupData*slsdata=startup_data;
187187

188188
Assert(startup_data_len==sizeof(*slsdata));
189189
syslogFile=syslogger_fdopen(slsdata->syslogFile);
@@ -699,7 +699,7 @@ SysLogger_Start(int child_slot)
699699
startup_data.csvlogFile=syslogger_fdget(csvlogFile);
700700
startup_data.jsonlogFile=syslogger_fdget(jsonlogFile);
701701
sysloggerPid=postmaster_child_launch(B_LOGGER,child_slot,
702-
(char*)&startup_data,sizeof(startup_data),NULL);
702+
&startup_data,sizeof(startup_data),NULL);
703703
#else
704704
sysloggerPid=postmaster_child_launch(B_LOGGER,child_slot,
705705
NULL,0,NULL);

‎src/backend/postmaster/walsummarizer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ WalSummarizerShmemInit(void)
208208
* Entry point for walsummarizer process.
209209
*/
210210
void
211-
WalSummarizerMain(char*startup_data,size_tstartup_data_len)
211+
WalSummarizerMain(constvoid*startup_data,size_tstartup_data_len)
212212
{
213213
sigjmp_buflocal_sigjmp_buf;
214214
MemoryContextcontext;

‎src/backend/postmaster/walwriter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ intWalWriterFlushAfter = DEFAULT_WAL_WRITER_FLUSH_AFTER;
8484
* basic execution environment, but not enabled signals yet.
8585
*/
8686
void
87-
WalWriterMain(char*startup_data,size_tstartup_data_len)
87+
WalWriterMain(constvoid*startup_data,size_tstartup_data_len)
8888
{
8989
sigjmp_buflocal_sigjmp_buf;
9090
MemoryContextwalwriter_context;

‎src/backend/replication/logical/slotsync.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1326,7 +1326,7 @@ reset_syncing_flag()
13261326
* information periodically in order to create and sync the slots.
13271327
*/
13281328
void
1329-
ReplSlotSyncWorkerMain(char*startup_data,size_tstartup_data_len)
1329+
ReplSlotSyncWorkerMain(constvoid*startup_data,size_tstartup_data_len)
13301330
{
13311331
WalReceiverConn*wrconn=NULL;
13321332
char*dbname;

‎src/backend/replication/walreceiver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ ProcessWalRcvInterrupts(void)
180180

181181
/* Main entry point for walreceiver process */
182182
void
183-
WalReceiverMain(char*startup_data,size_tstartup_data_len)
183+
WalReceiverMain(constvoid*startup_data,size_tstartup_data_len)
184184
{
185185
charconninfo[MAXCONNINFO];
186186
char*tmp_conninfo;

‎src/backend/tcop/backend_startup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ static void StartupPacketTimeoutHandler(void);
5656
* client, and start the main processing loop.
5757
*/
5858
void
59-
BackendMain(char*startup_data,size_tstartup_data_len)
59+
BackendMain(constvoid*startup_data,size_tstartup_data_len)
6060
{
61-
BackendStartupData*bsdata= (BackendStartupData*)startup_data;
61+
constBackendStartupData*bsdata=startup_data;
6262

6363
Assert(startup_data_len==sizeof(BackendStartupData));
6464
Assert(MyClientSocket!=NULL);

‎src/include/postmaster/autovacuum.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ extern void autovac_init(void);
5858
/* called from postmaster when a worker could not be forked */
5959
externvoidAutoVacWorkerFailed(void);
6060

61-
externvoidAutoVacLauncherMain(char*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
62-
externvoidAutoVacWorkerMain(char*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
61+
externvoidAutoVacLauncherMain(constvoid*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
62+
externvoidAutoVacWorkerMain(constvoid*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
6363

6464
externboolAutoVacuumRequestWork(AutoVacuumWorkItemTypetype,
6565
OidrelationId,BlockNumberblkno);

‎src/include/postmaster/bgworker_internals.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ extern void ForgetUnstartedBackgroundWorkers(void);
5252
externvoidResetBackgroundWorkerCrashTimes(void);
5353

5454
/* Entry point for background worker processes */
55-
externvoidBackgroundWorkerMain(char*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
55+
externvoidBackgroundWorkerMain(constvoid*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
5656

5757
#endif/* BGWORKER_INTERNALS_H */

‎src/include/postmaster/bgwriter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ extern PGDLLIMPORT int CheckPointTimeout;
2727
externPGDLLIMPORTintCheckPointWarning;
2828
externPGDLLIMPORTdoubleCheckPointCompletionTarget;
2929

30-
externvoidBackgroundWriterMain(char*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
31-
externvoidCheckpointerMain(char*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
30+
externvoidBackgroundWriterMain(constvoid*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
31+
externvoidCheckpointerMain(constvoid*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
3232

3333
externvoidRequestCheckpoint(intflags);
3434
externvoidCheckpointWriteDelay(intflags,doubleprogress);

‎src/include/postmaster/pgarch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
externSizePgArchShmemSize(void);
3030
externvoidPgArchShmemInit(void);
3131
externboolPgArchCanRestart(void);
32-
externvoidPgArchiverMain(char*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
32+
externvoidPgArchiverMain(constvoid*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
3333
externvoidPgArchWakeup(void);
3434
externvoidPgArchForceDirScan(void);
3535

‎src/include/postmaster/postmaster.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ extern PGDLLIMPORT struct ClientSocket *MyClientSocket;
109109
/* prototypes for functions in launch_backend.c */
110110
externpid_tpostmaster_child_launch(BackendTypechild_type,
111111
intchild_slot,
112-
char*startup_data,
112+
constvoid*startup_data,
113113
size_tstartup_data_len,
114114
structClientSocket*client_sock);
115115
constchar*PostmasterChildName(BackendTypechild_type);

‎src/include/postmaster/startup.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
externPGDLLIMPORTintlog_startup_progress_interval;
2727

2828
externvoidHandleStartupProcInterrupts(void);
29-
externvoidStartupProcessMain(char*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
29+
externvoidStartupProcessMain(constvoid*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
3030
externvoidPreRestoreCommand(void);
3131
externvoidPostRestoreCommand(void);
3232
externboolIsPromoteSignaled(void);

‎src/include/postmaster/syslogger.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ extern intSysLogger_Start(int child_slot);
9090

9191
externvoidwrite_syslogger_file(constchar*buffer,intcount,intdestination);
9292

93-
externvoidSysLoggerMain(char*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
93+
externvoidSysLoggerMain(constvoid*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
9494

9595
externboolCheckLogrotateSignal(void);
9696
externvoidRemoveLogrotateSignalFiles(void);

‎src/include/postmaster/walsummarizer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extern PGDLLIMPORT int wal_summary_keep_time;
2121

2222
externSizeWalSummarizerShmemSize(void);
2323
externvoidWalSummarizerShmemInit(void);
24-
externvoidWalSummarizerMain(char*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
24+
externvoidWalSummarizerMain(constvoid*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
2525

2626
externvoidGetWalSummarizerState(TimeLineID*summarized_tli,
2727
XLogRecPtr*summarized_lsn,

‎src/include/postmaster/walwriter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
externPGDLLIMPORTintWalWriterDelay;
1919
externPGDLLIMPORTintWalWriterFlushAfter;
2020

21-
externvoidWalWriterMain(char*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
21+
externvoidWalWriterMain(constvoid*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
2222

2323
#endif/* _WALWRITER_H */

‎src/include/replication/slotsync.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ extern PGDLLIMPORT char *PrimarySlotName;
2626
externchar*CheckAndGetDbnameFromConninfo(void);
2727
externboolValidateSlotSyncParams(intelevel);
2828

29-
externvoidReplSlotSyncWorkerMain(char*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
29+
externvoidReplSlotSyncWorkerMain(constvoid*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
3030

3131
externvoidShutDownSlotSync(void);
3232
externboolSlotSyncWorkerCanRestart(void);

‎src/include/replication/walreceiver.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ walrcv_clear_result(WalRcvExecResult *walres)
486486
}
487487

488488
/* prototypes for functions in walreceiver.c */
489-
externvoidWalReceiverMain(char*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
489+
externvoidWalReceiverMain(constvoid*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
490490
externvoidProcessWalRcvInterrupts(void);
491491
externvoidWalRcvForceReply(void);
492492

‎src/include/tcop/backend_startup.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ typedef struct BackendStartupData
3939
CAC_statecanAcceptConnections;
4040
}BackendStartupData;
4141

42-
externvoidBackendMain(char*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
42+
externvoidBackendMain(constvoid*startup_data,size_tstartup_data_len)pg_attribute_noreturn();
4343

4444
#endif/* BACKEND_STARTUP_H */

0 commit comments

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