mirror of
https://github.com/postgres/postgres.git
synced 2026-04-27 17:16:43 -04:00
c7b8998ebb
Change pg_bsd_indent to follow upstream rules for placement of comments
to the right of code, and remove pgindent hack that caused comments
following #endif to not obey the general rule.
Commit e3860ffa4d wasn't actually using
the published version of pg_bsd_indent, but a hacked-up version that
tried to minimize the amount of movement of comments to the right of
code. The situation of interest is where such a comment has to be
moved to the right of its default placement at column 33 because there's
code there. BSD indent has always moved right in units of tab stops
in such cases --- but in the previous incarnation, indent was working
in 8-space tab stops, while now it knows we use 4-space tabs. So the
net result is that in about half the cases, such comments are placed
one tab stop left of before. This is better all around: it leaves
more room on the line for comment text, and it means that in such
cases the comment uniformly starts at the next 4-space tab stop after
the code, rather than sometimes one and sometimes two tabs after.
Also, ensure that comments following #endif are indented the same
as comments following other preprocessor commands such as #else.
That inconsistency turns out to have been self-inflicted damage
from a poorly-thought-through post-indent "fixup" in pgindent.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
77 lines
2.5 KiB
C
77 lines
2.5 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* postmaster.h
|
|
* Exports from postmaster/postmaster.c.
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/postmaster/postmaster.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef _POSTMASTER_H
|
|
#define _POSTMASTER_H
|
|
|
|
/* GUC options */
|
|
extern bool EnableSSL;
|
|
extern int ReservedBackends;
|
|
extern int PostPortNumber;
|
|
extern int Unix_socket_permissions;
|
|
extern char *Unix_socket_group;
|
|
extern char *Unix_socket_directories;
|
|
extern char *ListenAddresses;
|
|
extern bool ClientAuthInProgress;
|
|
extern int PreAuthDelay;
|
|
extern int AuthenticationTimeout;
|
|
extern bool Log_connections;
|
|
extern bool log_hostname;
|
|
extern bool enable_bonjour;
|
|
extern char *bonjour_name;
|
|
extern bool restart_after_crash;
|
|
|
|
#ifdef WIN32
|
|
extern HANDLE PostmasterHandle;
|
|
#else
|
|
extern int postmaster_alive_fds[2];
|
|
|
|
/*
|
|
* Constants that represent which of postmaster_alive_fds is held by
|
|
* postmaster, and which is used in children to check for postmaster death.
|
|
*/
|
|
#define POSTMASTER_FD_WATCH 0 /* used in children to check for
|
|
* postmaster death */
|
|
#define POSTMASTER_FD_OWN 1 /* kept open by postmaster only */
|
|
#endif
|
|
|
|
extern const char *progname;
|
|
|
|
extern void PostmasterMain(int argc, char *argv[]) pg_attribute_noreturn();
|
|
extern void ClosePostmasterPorts(bool am_syslogger);
|
|
|
|
extern int MaxLivePostmasterChildren(void);
|
|
|
|
extern int GetNumShmemAttachedBgworkers(void);
|
|
extern bool PostmasterMarkPIDForWorkerNotify(int);
|
|
|
|
#ifdef EXEC_BACKEND
|
|
extern pid_t postmaster_forkexec(int argc, char *argv[]);
|
|
extern void SubPostmasterMain(int argc, char *argv[]) pg_attribute_noreturn();
|
|
|
|
extern Size ShmemBackendArraySize(void);
|
|
extern void ShmemBackendArrayAllocation(void);
|
|
#endif
|
|
|
|
/*
|
|
* Note: MAX_BACKENDS is limited to 2^18-1 because that's the width reserved
|
|
* for buffer references in buf_internals.h. This limitation could be lifted
|
|
* by using a 64bit state; but it's unlikely to be worthwhile as 2^18-1
|
|
* backends exceed currently realistic configurations. Even if that limitation
|
|
* were removed, we still could not a) exceed 2^23-1 because inval.c stores
|
|
* the backend ID as a 3-byte signed integer, b) INT_MAX/4 because some places
|
|
* compute 4*MaxBackends without any overflow check. This is rechecked in the
|
|
* relevant GUC check hooks and in RegisterBackgroundWorker().
|
|
*/
|
|
#define MAX_BACKENDS 0x3FFFF
|
|
|
|
#endif /* _POSTMASTER_H */
|