mirror of
https://github.com/postgres/postgres.git
synced 2025-08-24 09:27:52 +03:00
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
64 lines
1.9 KiB
C
64 lines
1.9 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* pgsleep.c
|
|
* Portable delay handling.
|
|
*
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
*
|
|
* src/port/pgsleep.c
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#include "c.h"
|
|
|
|
#include <unistd.h>
|
|
#include <sys/time.h>
|
|
#ifdef HAVE_SYS_SELECT_H
|
|
#include <sys/select.h>
|
|
#endif
|
|
|
|
/*
|
|
* In a Windows backend, we don't use this implementation, but rather
|
|
* the signal-aware version in src/backend/port/win32/signal.c.
|
|
*/
|
|
#if defined(FRONTEND) || !defined(WIN32)
|
|
|
|
/*
|
|
* pg_usleep --- delay the specified number of microseconds.
|
|
*
|
|
* NOTE: although the delay is specified in microseconds, the effective
|
|
* resolution is only 1/HZ, or 10 milliseconds, on most Unixen. Expect
|
|
* the requested delay to be rounded up to the next resolution boundary.
|
|
*
|
|
* On machines where "long" is 32 bits, the maximum delay is ~2000 seconds.
|
|
*
|
|
* CAUTION: the behavior when a signal arrives during the sleep is platform
|
|
* dependent. On most Unix-ish platforms, a signal does not terminate the
|
|
* sleep; but on some, it will (the Windows implementation also allows signals
|
|
* to terminate pg_usleep). And there are platforms where not only does a
|
|
* signal not terminate the sleep, but it actually resets the timeout counter
|
|
* so that the sleep effectively starts over! It is therefore rather hazardous
|
|
* to use this for long sleeps; a continuing stream of signal events could
|
|
* prevent the sleep from ever terminating. Better practice for long sleeps
|
|
* is to use WaitLatch() with a timeout.
|
|
*/
|
|
void
|
|
pg_usleep(long microsec)
|
|
{
|
|
if (microsec > 0)
|
|
{
|
|
#ifndef WIN32
|
|
struct timeval delay;
|
|
|
|
delay.tv_sec = microsec / 1000000L;
|
|
delay.tv_usec = microsec % 1000000L;
|
|
(void) select(0, NULL, NULL, NULL, &delay);
|
|
#else
|
|
SleepEx((microsec < 500 ? 1 : (microsec + 500) / 1000), FALSE);
|
|
#endif
|
|
}
|
|
}
|
|
|
|
#endif /* defined(FRONTEND) || !defined(WIN32) */
|