=== Applying patches on top of PostgreSQL commit ID 1c4b1de888559a47df599dcef356ea7fbf96fd0c === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Jul 12 09:49:32 UTC 2026 On branch cf/5622 nothing to commit, working tree clean === using 'git am' to apply patch ./v29-0001-pg_test_timing-Show-additional-TSC-clock-source-.patch === Applying: pg_test_timing: Show additional TSC clock source debug info Using index info to reconstruct a base tree... M doc/src/sgml/ref/pgtesttiming.sgml M src/bin/pg_test_timing/pg_test_timing.c M src/common/instr_time.c M src/include/port/pg_cpu.h M src/include/portability/instr_time.h M src/port/pg_cpu_x86.c M src/tools/pgindent/typedefs.list Falling back to patching base and 3-way merge... Auto-merging src/tools/pgindent/typedefs.list Auto-merging src/port/pg_cpu_x86.c Auto-merging src/include/portability/instr_time.h Auto-merging src/include/port/pg_cpu.h Auto-merging src/bin/pg_test_timing/pg_test_timing.c CONFLICT (content): Merge conflict in src/bin/pg_test_timing/pg_test_timing.c Auto-merging doc/src/sgml/ref/pgtesttiming.sgml 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_test_timing: Show additional TSC clock source debug info 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". === using patch(1) to apply patch ./v29-0001-pg_test_timing-Show-additional-TSC-clock-source-.patch === patching file doc/src/sgml/ref/pgtesttiming.sgml Hunk #1 FAILED at 283. 1 out of 1 hunk FAILED -- saving rejects to file doc/src/sgml/ref/pgtesttiming.sgml.rej patching file src/bin/pg_test_timing/pg_test_timing.c Hunk #1 FAILED at 7. Hunk #2 FAILED at 184. Hunk #3 FAILED at 197. Hunk #4 succeeded at 376 with fuzz 2 (offset 35 lines). 3 out of 4 hunks FAILED -- saving rejects to file src/bin/pg_test_timing/pg_test_timing.c.rej patching file src/common/instr_time.c Hunk #1 FAILED at 70. Hunk #2 FAILED at 166. Hunk #3 FAILED at 202. Hunk #4 FAILED at 282. Hunk #5 succeeded at 421 with fuzz 1 (offset 52 lines). 4 out of 5 hunks FAILED -- saving rejects to file src/common/instr_time.c.rej patching file src/include/port/pg_cpu.h Hunk #1 FAILED at 56. 1 out of 1 hunk FAILED -- saving rejects to file src/include/port/pg_cpu.h.rej patching file src/include/portability/instr_time.h Hunk #1 FAILED at 165. 1 out of 1 hunk FAILED -- saving rejects to file src/include/portability/instr_time.h.rej patching file src/port/pg_cpu_x86.c Hunk #1 FAILED at 13. Hunk #2 FAILED at 159. Hunk #3 FAILED at 174. Hunk #4 succeeded at 226 with fuzz 2 (offset 19 lines). Hunk #5 FAILED at 220. 4 out of 5 hunks FAILED -- saving rejects to file src/port/pg_cpu_x86.c.rej patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 3116 (offset 25 lines). Unstaged changes after reset: M src/bin/pg_test_timing/pg_test_timing.c M src/common/instr_time.c M src/port/pg_cpu_x86.c M src/tools/pgindent/typedefs.list Removing doc/src/sgml/ref/pgtesttiming.sgml.rej Removing src/bin/pg_test_timing/pg_test_timing.c.rej Removing src/common/instr_time.c.rej Removing src/include/port/pg_cpu.h.rej Removing src/include/portability/instr_time.h.rej Removing src/port/pg_cpu_x86.c.rej === using 'git apply' to apply patch ./v29-0001-pg_test_timing-Show-additional-TSC-clock-source-.patch === Applied patch to 'doc/src/sgml/ref/pgtesttiming.sgml' cleanly. Applied patch to 'src/bin/pg_test_timing/pg_test_timing.c' with conflicts. Applied patch to 'src/common/instr_time.c' cleanly. Applied patch to 'src/include/port/pg_cpu.h' cleanly. Applied patch to 'src/include/portability/instr_time.h' cleanly. Applied patch to 'src/port/pg_cpu_x86.c' cleanly. Applied patch to 'src/tools/pgindent/typedefs.list' cleanly. U src/bin/pg_test_timing/pg_test_timing.c diff --cc src/bin/pg_test_timing/pg_test_timing.c index d63018f270f,53a181105ec..00000000000 --- a/src/bin/pg_test_timing/pg_test_timing.c +++ b/src/bin/pg_test_timing/pg_test_timing.c @@@ -212,23 -212,23 +212,43 @@@ test_tsc_timing(void if (info->calibrated_frequency_khz > 0) { double diff_pct; ++<<<<<<< ours + + printf(_("TSC frequency from calibration: %d kHz\n"), info->calibrated_frequency_khz); + + diff_pct = fabs((double) info->calibrated_frequency_khz - info->frequency_khz) / + info->frequency_khz * 100.0; + + if (diff_pct > 10.0) + { + printf(_("WARNING: Calibrated TSC frequency differs by %.1f%% from the TSC frequency in use\n"), + diff_pct); + printf(_("HINT: Consider setting timing_clock_source to 'system'. Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); + exit(1); + } + } + else + printf(_("TSC calibration did not converge\n")); + ++======= + + printf(_("TSC frequency from calibration: %d kHz\n"), info->calibrated_frequency_khz); + + diff_pct = fabs((double) info->calibrated_frequency_khz - info->frequency_khz) / + info->frequency_khz * 100.0; + + if (diff_pct > 10.0) + { + printf(_("WARNING: Calibrated TSC frequency differs by %.1f%% from the TSC frequency in use\n"), + diff_pct); + printf(_("HINT: Consider setting timing_clock_source to 'system'. Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); + exit(1); + } + } + else + printf(_("TSC calibration did not converge\n")); + ++>>>>>>> theirs /* * Report whether TSC was usable and, if so, whether it will be used * automatically.