=== Applying patches on top of PostgreSQL commit ID ac4494646daee27df20f7cded3ad49be24e9a98c ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Mar 12 20:12:27 UTC 2025
On branch cf/5571
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0001-pg_noreturn-to-replace-pg_attribute_noreturn.patch ===
Applying: pg_noreturn to replace pg_attribute_noreturn()
Using index info to reconstruct a base tree...
M	src/backend/postmaster/launch_backend.c
M	src/backend/postmaster/postmaster.c
M	src/include/postmaster/postmaster.h
M	src/include/tcop/backend_startup.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/tcop/backend_startup.h
CONFLICT (content): Merge conflict in src/include/tcop/backend_startup.h
Auto-merging src/include/postmaster/postmaster.h
Auto-merging src/backend/postmaster/postmaster.c
Auto-merging src/backend/postmaster/launch_backend.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 pg_noreturn to replace pg_attribute_noreturn()
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Unstaged changes after reset:
M	contrib/dblink/dblink.c
M	contrib/pgcrypto/px.h
M	src/backend/access/transam/xlogrecovery.c
M	src/backend/backup/basebackup_incremental.c
M	src/backend/postmaster/autovacuum.c
M	src/backend/postmaster/launch_backend.c
M	src/backend/postmaster/postmaster.c
M	src/backend/replication/logical/tablesync.c
M	src/backend/replication/walsender.c
M	src/backend/utils/adt/ri_triggers.c
M	src/backend/utils/fmgr/dfmgr.c
M	src/backend/utils/hash/dynahash.c
M	src/backend/utils/mmgr/slab.c
M	src/bin/pg_combinebackup/load_manifest.c
M	src/bin/pg_dump/pg_backup_utils.h
M	src/bin/pg_upgrade/pg_upgrade.h
M	src/bin/pg_verifybackup/pg_verifybackup.c
M	src/bin/pg_verifybackup/pg_verifybackup.h
M	src/bin/pgbench/pgbench.h
M	src/include/bootstrap/bootstrap.h
M	src/include/c.h
M	src/include/commands/defrem.h
M	src/include/common/parse_manifest.h
M	src/include/mb/pg_wchar.h
M	src/include/parser/parse_relation.h
M	src/include/parser/scanner.h
M	src/include/postmaster/autovacuum.h
M	src/include/postmaster/bgworker_internals.h
M	src/include/postmaster/bgwriter.h
M	src/include/postmaster/pgarch.h
M	src/include/postmaster/postmaster.h
M	src/include/postmaster/startup.h
M	src/include/postmaster/syslogger.h
M	src/include/postmaster/walsummarizer.h
M	src/include/postmaster/walwriter.h
M	src/include/replication/slotsync.h
M	src/include/replication/walreceiver.h
M	src/include/replication/walsender_private.h
M	src/include/storage/ipc.h
M	src/include/storage/lock.h
M	src/include/tcop/backend_startup.h
M	src/include/tcop/tcopprot.h
M	src/include/utils/elog.h
M	src/include/utils/float.h
M	src/include/utils/help_config.h
M	src/include/utils/memutils_internal.h
M	src/interfaces/ecpg/preproc/preproc_extern.h
M	src/pl/plpgsql/src/plpgsql.h
M	src/test/modules/libpq_pipeline/libpq_pipeline.c
M	src/test/modules/test_shm_mq/test_shm_mq.h
M	src/test/modules/worker_spi/worker_spi.c
M	src/timezone/zic.c
M	src/tools/pg_bsd_indent/err.h
=== using patch(1) to apply patch ./v3-0001-pg_noreturn-to-replace-pg_attribute_noreturn.patch ===
patch: unrecognized option `--no-backup-if-mismatch'
usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]
             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]
             [-r rej-name] [-V t | nil | never | none] [-x number]
             [-z backup-ext] [--posix] [origfile [patchfile]]
       patch <patchfile
=== using 'git apply' to apply patch ./v3-0001-pg_noreturn-to-replace-pg_attribute_noreturn.patch ===
Applied patch to 'contrib/dblink/dblink.c' cleanly.
Applied patch to 'contrib/pgcrypto/px.h' cleanly.
Applied patch to 'src/backend/access/transam/xlogrecovery.c' cleanly.
Applied patch to 'src/backend/backup/basebackup_incremental.c' cleanly.
Applied patch to 'src/backend/postmaster/autovacuum.c' cleanly.
Applied patch to 'src/backend/postmaster/launch_backend.c' cleanly.
Applied patch to 'src/backend/postmaster/postmaster.c' cleanly.
Applied patch to 'src/backend/replication/logical/tablesync.c' cleanly.
Applied patch to 'src/backend/replication/walsender.c' cleanly.
Applied patch to 'src/backend/utils/adt/ri_triggers.c' cleanly.
Applied patch to 'src/backend/utils/fmgr/dfmgr.c' cleanly.
Applied patch to 'src/backend/utils/hash/dynahash.c' cleanly.
Applied patch to 'src/backend/utils/mmgr/slab.c' cleanly.
Applied patch to 'src/bin/pg_combinebackup/load_manifest.c' cleanly.
Applied patch to 'src/bin/pg_dump/pg_backup_utils.h' cleanly.
Applied patch to 'src/bin/pg_upgrade/pg_upgrade.h' cleanly.
Applied patch to 'src/bin/pg_verifybackup/pg_verifybackup.c' cleanly.
Applied patch to 'src/bin/pg_verifybackup/pg_verifybackup.h' cleanly.
Applied patch to 'src/bin/pgbench/pgbench.h' cleanly.
Applied patch to 'src/include/bootstrap/bootstrap.h' cleanly.
Applied patch to 'src/include/c.h' cleanly.
Applied patch to 'src/include/commands/defrem.h' cleanly.
Applied patch to 'src/include/common/parse_manifest.h' cleanly.
Applied patch to 'src/include/mb/pg_wchar.h' cleanly.
Applied patch to 'src/include/parser/parse_relation.h' cleanly.
Applied patch to 'src/include/parser/scanner.h' cleanly.
Applied patch to 'src/include/postmaster/autovacuum.h' cleanly.
Applied patch to 'src/include/postmaster/bgworker_internals.h' cleanly.
Applied patch to 'src/include/postmaster/bgwriter.h' cleanly.
Applied patch to 'src/include/postmaster/pgarch.h' cleanly.
Applied patch to 'src/include/postmaster/postmaster.h' cleanly.
Applied patch to 'src/include/postmaster/startup.h' cleanly.
Applied patch to 'src/include/postmaster/syslogger.h' cleanly.
Applied patch to 'src/include/postmaster/walsummarizer.h' cleanly.
Applied patch to 'src/include/postmaster/walwriter.h' cleanly.
Applied patch to 'src/include/replication/slotsync.h' cleanly.
Applied patch to 'src/include/replication/walreceiver.h' cleanly.
Applied patch to 'src/include/replication/walsender_private.h' cleanly.
Applied patch to 'src/include/storage/ipc.h' cleanly.
Applied patch to 'src/include/storage/lock.h' cleanly.
Applied patch to 'src/include/tcop/backend_startup.h' with conflicts.
Applied patch to 'src/include/tcop/tcopprot.h' cleanly.
Applied patch to 'src/include/utils/elog.h' cleanly.
Applied patch to 'src/include/utils/float.h' cleanly.
Applied patch to 'src/include/utils/help_config.h' cleanly.
Applied patch to 'src/include/utils/memutils_internal.h' cleanly.
Applied patch to 'src/interfaces/ecpg/preproc/preproc_extern.h' cleanly.
Applied patch to 'src/pl/plpgsql/src/plpgsql.h' cleanly.
Applied patch to 'src/test/modules/libpq_pipeline/libpq_pipeline.c' cleanly.
Applied patch to 'src/test/modules/test_shm_mq/test_shm_mq.h' cleanly.
Applied patch to 'src/test/modules/worker_spi/worker_spi.c' cleanly.
Applied patch to 'src/timezone/zic.c' cleanly.
Applied patch to 'src/tools/pg_bsd_indent/err.h' cleanly.
U src/include/tcop/backend_startup.h
diff --cc src/include/tcop/backend_startup.h
index 2912ef80288,6dc59738889..00000000000
--- a/src/include/tcop/backend_startup.h
+++ b/src/include/tcop/backend_startup.h
@@@ -44,79 -37,8 +44,83 @@@ typedef enum CAC_stat
  typedef struct BackendStartupData
  {
  	CAC_state	canAcceptConnections;
 +
 +	/*
 +	 * Time at which the connection client socket is created. Only used for
 +	 * client and wal sender connections.
 +	 */
 +	TimestampTz socket_created;
 +
 +	/*
 +	 * Time at which the postmaster initiates process creation -- either
 +	 * through fork or otherwise. Only used for client and wal sender
 +	 * connections.
 +	 */
 +	TimestampTz fork_started;
  } BackendStartupData;
  
++<<<<<<< ours
 +/*
 + * Granular control over which messages to log for the log_connections GUC.
 + *
 + * RECEIPT, AUTHENTICATION, AUTHORIZATION, and SETUP_DURATIONS are different
 + * aspects of connection establishment and backend setup for which we may emit
 + * a log message.
 + *
 + * ALL is a convenience alias equivalent to all of the above aspects.
 + *
 + * ON is backwards compatibility alias for the connection aspects that were
 + * logged in Postgres versions < 18.
 + */
 +typedef enum LogConnectionOption
 +{
 +	LOG_CONNECTION_RECEIPT = (1 << 0),
 +	LOG_CONNECTION_AUTHENTICATION = (1 << 1),
 +	LOG_CONNECTION_AUTHORIZATION = (1 << 2),
 +	LOG_CONNECTION_SETUP_DURATIONS = (1 << 3),
 +	LOG_CONNECTION_ON =
 +		LOG_CONNECTION_RECEIPT |
 +		LOG_CONNECTION_AUTHENTICATION |
 +		LOG_CONNECTION_AUTHORIZATION,
 +	LOG_CONNECTION_ALL =
 +		LOG_CONNECTION_RECEIPT |
 +		LOG_CONNECTION_AUTHENTICATION |
 +		LOG_CONNECTION_AUTHORIZATION |
 +		LOG_CONNECTION_SETUP_DURATIONS,
 +} LogConnectionOption;
 +
 +/*
 + * A collection of timings of various stages of connection establishment and
 + * setup for client backends and WAL senders.
 + *
 + * Used to emit the setup_durations log message for the log_connections GUC.
 + */
 +typedef struct ConnectionTiming
 +{
 +	/*
 +	 * The time at which the client socket is created and the time at which
 +	 * the connection is fully set up and first ready for query. Together
 +	 * these represent the total connection establishment and setup time.
 +	 */
 +	TimestampTz socket_create;
 +	TimestampTz ready_for_use;
 +
 +	/* Time at which process creation was initiated */
 +	TimestampTz fork_start;
 +
 +	/* Time at which process creation was completed */
 +	TimestampTz fork_end;
 +
 +	/* Time at which authentication started */
 +	TimestampTz auth_start;
 +
 +	/* Time at which authentication was finished */
 +	TimestampTz auth_end;
 +} ConnectionTiming;
 +
 +extern void BackendMain(const void *startup_data, size_t startup_data_len) pg_attribute_noreturn();
++=======
+ pg_noreturn extern void BackendMain(const void *startup_data, size_t startup_data_len);
++>>>>>>> theirs
  
  #endif							/* BACKEND_STARTUP_H */