mirror of
https://git.postgresql.org/git/postgresql.git
synced 2026-02-10 08:17:36 +08: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 e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89 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
81 lines
2.7 KiB
C
81 lines
2.7 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* ipc.h
|
|
* POSTGRES inter-process communication definitions.
|
|
*
|
|
* This file is misnamed, as it no longer has much of anything directly
|
|
* to do with IPC. The functionality here is concerned with managing
|
|
* exit-time cleanup for either a postmaster or a backend.
|
|
*
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/storage/ipc.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef IPC_H
|
|
#define IPC_H
|
|
|
|
typedef void (*pg_on_exit_callback) (int code, Datum arg);
|
|
typedef void (*shmem_startup_hook_type) (void);
|
|
|
|
/*----------
|
|
* API for handling cleanup that must occur during either ereport(ERROR)
|
|
* or ereport(FATAL) exits from a block of code. (Typical examples are
|
|
* undoing transient changes to shared-memory state.)
|
|
*
|
|
* PG_ENSURE_ERROR_CLEANUP(cleanup_function, arg);
|
|
* {
|
|
* ... code that might throw ereport(ERROR) or ereport(FATAL) ...
|
|
* }
|
|
* PG_END_ENSURE_ERROR_CLEANUP(cleanup_function, arg);
|
|
*
|
|
* where the cleanup code is in a function declared per pg_on_exit_callback.
|
|
* The Datum value "arg" can carry any information the cleanup function
|
|
* needs.
|
|
*
|
|
* This construct ensures that cleanup_function() will be called during
|
|
* either ERROR or FATAL exits. It will not be called on successful
|
|
* exit from the controlled code. (If you want it to happen then too,
|
|
* call the function yourself from just after the construct.)
|
|
*
|
|
* Note: the macro arguments are multiply evaluated, so avoid side-effects.
|
|
*----------
|
|
*/
|
|
#define PG_ENSURE_ERROR_CLEANUP(cleanup_function, arg) \
|
|
do { \
|
|
before_shmem_exit(cleanup_function, arg); \
|
|
PG_TRY()
|
|
|
|
#define PG_END_ENSURE_ERROR_CLEANUP(cleanup_function, arg) \
|
|
cancel_before_shmem_exit(cleanup_function, arg); \
|
|
PG_CATCH(); \
|
|
{ \
|
|
cancel_before_shmem_exit(cleanup_function, arg); \
|
|
cleanup_function (0, arg); \
|
|
PG_RE_THROW(); \
|
|
} \
|
|
PG_END_TRY(); \
|
|
} while (0)
|
|
|
|
|
|
/* ipc.c */
|
|
extern PGDLLIMPORT bool proc_exit_inprogress;
|
|
|
|
extern void proc_exit(int code) pg_attribute_noreturn();
|
|
extern void shmem_exit(int code);
|
|
extern void on_proc_exit(pg_on_exit_callback function, Datum arg);
|
|
extern void on_shmem_exit(pg_on_exit_callback function, Datum arg);
|
|
extern void before_shmem_exit(pg_on_exit_callback function, Datum arg);
|
|
extern void cancel_before_shmem_exit(pg_on_exit_callback function, Datum arg);
|
|
extern void on_exit_reset(void);
|
|
|
|
/* ipci.c */
|
|
extern PGDLLIMPORT shmem_startup_hook_type shmem_startup_hook;
|
|
|
|
extern void CreateSharedMemoryAndSemaphores(bool makePrivate, int port);
|
|
|
|
#endif /* IPC_H */
|