mirror of
https://git.postgresql.org/git/postgresql.git
synced 2026-02-07 07:27:26 +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
88 lines
2.5 KiB
C
88 lines
2.5 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* timeout.h
|
|
* Routines to multiplex SIGALRM interrupts for multiple timeout reasons.
|
|
*
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/utils/timeout.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef TIMEOUT_H
|
|
#define TIMEOUT_H
|
|
|
|
#include "datatype/timestamp.h"
|
|
|
|
/*
|
|
* Identifiers for timeout reasons. Note that in case multiple timeouts
|
|
* trigger at the same time, they are serviced in the order of this enum.
|
|
*/
|
|
typedef enum TimeoutId
|
|
{
|
|
/* Predefined timeout reasons */
|
|
STARTUP_PACKET_TIMEOUT,
|
|
DEADLOCK_TIMEOUT,
|
|
LOCK_TIMEOUT,
|
|
STATEMENT_TIMEOUT,
|
|
STANDBY_DEADLOCK_TIMEOUT,
|
|
STANDBY_TIMEOUT,
|
|
STANDBY_LOCK_TIMEOUT,
|
|
IDLE_IN_TRANSACTION_SESSION_TIMEOUT,
|
|
/* First user-definable timeout reason */
|
|
USER_TIMEOUT,
|
|
/* Maximum number of timeout reasons */
|
|
MAX_TIMEOUTS = 16
|
|
} TimeoutId;
|
|
|
|
/* callback function signature */
|
|
typedef void (*timeout_handler_proc) (void);
|
|
|
|
/*
|
|
* Parameter structure for setting multiple timeouts at once
|
|
*/
|
|
typedef enum TimeoutType
|
|
{
|
|
TMPARAM_AFTER,
|
|
TMPARAM_AT
|
|
} TimeoutType;
|
|
|
|
typedef struct
|
|
{
|
|
TimeoutId id; /* timeout to set */
|
|
TimeoutType type; /* TMPARAM_AFTER or TMPARAM_AT */
|
|
int delay_ms; /* only used for TMPARAM_AFTER */
|
|
TimestampTz fin_time; /* only used for TMPARAM_AT */
|
|
} EnableTimeoutParams;
|
|
|
|
/*
|
|
* Parameter structure for clearing multiple timeouts at once
|
|
*/
|
|
typedef struct
|
|
{
|
|
TimeoutId id; /* timeout to clear */
|
|
bool keep_indicator; /* keep the indicator flag? */
|
|
} DisableTimeoutParams;
|
|
|
|
/* timeout setup */
|
|
extern void InitializeTimeouts(void);
|
|
extern TimeoutId RegisterTimeout(TimeoutId id, timeout_handler_proc handler);
|
|
extern void reschedule_timeouts(void);
|
|
|
|
/* timeout operation */
|
|
extern void enable_timeout_after(TimeoutId id, int delay_ms);
|
|
extern void enable_timeout_at(TimeoutId id, TimestampTz fin_time);
|
|
extern void enable_timeouts(const EnableTimeoutParams *timeouts, int count);
|
|
extern void disable_timeout(TimeoutId id, bool keep_indicator);
|
|
extern void disable_timeouts(const DisableTimeoutParams *timeouts, int count);
|
|
extern void disable_all_timeouts(bool keep_indicators);
|
|
|
|
/* accessors */
|
|
extern bool get_timeout_indicator(TimeoutId id, bool reset_indicator);
|
|
extern TimestampTz get_timeout_start_time(TimeoutId id);
|
|
extern TimestampTz get_timeout_finish_time(TimeoutId id);
|
|
|
|
#endif /* TIMEOUT_H */
|