mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-10-04 08:26:50 +02: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
71 lines
2.0 KiB
C
71 lines
2.0 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* parallel.h
|
|
*
|
|
* Parallel support for pg_dump and pg_restore
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* IDENTIFICATION
|
|
* src/bin/pg_dump/parallel.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
|
|
#ifndef PG_DUMP_PARALLEL_H
|
|
#define PG_DUMP_PARALLEL_H
|
|
|
|
#include "pg_backup_archiver.h"
|
|
|
|
/* Function to call in master process on completion of a worker task */
|
|
typedef void (*ParallelCompletionPtr) (ArchiveHandle *AH,
|
|
TocEntry *te,
|
|
int status,
|
|
void *callback_data);
|
|
|
|
/* Wait options for WaitForWorkers */
|
|
typedef enum
|
|
{
|
|
WFW_NO_WAIT,
|
|
WFW_GOT_STATUS,
|
|
WFW_ONE_IDLE,
|
|
WFW_ALL_IDLE
|
|
} WFW_WaitOption;
|
|
|
|
/* ParallelSlot is an opaque struct known only within parallel.c */
|
|
typedef struct ParallelSlot ParallelSlot;
|
|
|
|
/* Overall state for parallel.c */
|
|
typedef struct ParallelState
|
|
{
|
|
int numWorkers; /* allowed number of workers */
|
|
/* these arrays have numWorkers entries, one per worker: */
|
|
TocEntry **te; /* item being worked on, or NULL */
|
|
ParallelSlot *parallelSlot; /* private info about each worker */
|
|
} ParallelState;
|
|
|
|
#ifdef WIN32
|
|
extern bool parallel_init_done;
|
|
extern DWORD mainThreadId;
|
|
#endif
|
|
|
|
extern void init_parallel_dump_utils(void);
|
|
|
|
extern bool IsEveryWorkerIdle(ParallelState *pstate);
|
|
extern void WaitForWorkers(ArchiveHandle *AH, ParallelState *pstate,
|
|
WFW_WaitOption mode);
|
|
|
|
extern ParallelState *ParallelBackupStart(ArchiveHandle *AH);
|
|
extern void DispatchJobForTocEntry(ArchiveHandle *AH,
|
|
ParallelState *pstate,
|
|
TocEntry *te,
|
|
T_Action act,
|
|
ParallelCompletionPtr callback,
|
|
void *callback_data);
|
|
extern void ParallelBackupEnd(ArchiveHandle *AH, ParallelState *pstate);
|
|
|
|
extern void set_archive_cancel_info(ArchiveHandle *AH, PGconn *conn);
|
|
|
|
#endif /* PG_DUMP_PARALLEL_H */
|