From: Nathan Bossart <nathandbossart@gmail.com>
To: Max Johnson <max.johnson@novatechautomation.com>
Cc: tgl@sss.pgh.pa.us <tgl@sss.pgh.pa.us>
Cc: pgsql-hackers@postgresql.org <pgsql-hackers@postgresql.org>
Subject: Re: pg_ctl/miscinit: print "MyStartTime" as a long long instead of long to avoid 2038 problem.
Date: Wed, 25 Sep 2024 13:48:35 -0500
Message-ID: <ZvRbA1BXCC4nadX7@nathan> (raw)
In-Reply-To: <CO1PR07MB90521D419ABB8EB3E74BC1028D692@CO1PR07MB9052.namprd07.prod.outlook.com>
References: <CO1PR07MB905262E8AC270FAAACED66008D682@CO1PR07MB9052.namprd07.prod.outlook.com>
<ZvMghxsFyYM9e9kT@nathan>
<3486094.1727210681@sss.pgh.pa.us>
<ZvMn4K2PO2_7iavy@nathan>
<CO1PR07MB90521D419ABB8EB3E74BC1028D692@CO1PR07MB9052.namprd07.prod.outlook.com>
On Wed, Sep 25, 2024 at 03:17:45PM +0000, Max Johnson wrote:
> I have amended my patch to reflect the changes that were discussed and
> have verified on my system that it works the same as before. I have also
> fixed a typo and changed the name of the patch to more accurately reflect
> what it does now. Please let me know if there is anything else you'd like
> me to do.
Thanks! I went through all the other uses of MyStartTime and fixed those
as needed, too. Please let me know what you think.
--
nathan
Attachments:fix_mystarttime_y2k38_bugs.patch (text/plain, 4.5K) downloaddiff --git a/contrib/postgres_fdw/option.c b/contrib/postgres_fdw/option.cindex 630b304338..da16fc78d4 100644--- a/contrib/postgres_fdw/option.c+++ b/contrib/postgres_fdw/option.c@@ -522,7 +522,8 @@ process_pgfdw_appname(const char *appname)
appendStringInfoString(&buf, application_name);
break;
case 'c':
- appendStringInfo(&buf, "%lx.%x", (long) (MyStartTime), MyProcPid);+ appendStringInfo(&buf, INT64_HEX_FORMAT ".%x",+ MyStartTime, MyProcPid);
break;
case 'C':
appendStringInfoString(&buf, cluster_name);
diff --git a/src/backend/utils/error/csvlog.c b/src/backend/utils/error/csvlog.cindex 855e130a97..acdffb6d06 100644--- a/src/backend/utils/error/csvlog.c+++ b/src/backend/utils/error/csvlog.c@@ -120,7 +120,7 @@ write_csvlog(ErrorData *edata)
appendStringInfoChar(&buf, ',');
/* session id */
- appendStringInfo(&buf, "%lx.%x", (long) MyStartTime, MyProcPid);+ appendStringInfo(&buf, INT64_HEX_FORMAT ".%x", MyStartTime, MyProcPid);
appendStringInfoChar(&buf, ',');
/* Line number */
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.cindex 5cbb5b5416..70e4c30df3 100644--- a/src/backend/utils/error/elog.c+++ b/src/backend/utils/error/elog.c@@ -2944,12 +2944,13 @@ log_status_format(StringInfo buf, const char *format, ErrorData *edata)
{
char strfbuf[128];
- snprintf(strfbuf, sizeof(strfbuf) - 1, "%lx.%x",- (long) (MyStartTime), MyProcPid);+ snprintf(strfbuf, sizeof(strfbuf) - 1, INT64_HEX_FORMAT ".%x",+ MyStartTime, MyProcPid);
appendStringInfo(buf, "%*s", padding, strfbuf);
}
else
- appendStringInfo(buf, "%lx.%x", (long) (MyStartTime), MyProcPid);+ appendStringInfo(buf, INT64_HEX_FORMAT ".%x",+ MyStartTime, MyProcPid);
break;
case 'p':
if (padding != 0)
diff --git a/src/backend/utils/error/jsonlog.c b/src/backend/utils/error/jsonlog.cindex bd0124869d..492383a89e 100644--- a/src/backend/utils/error/jsonlog.c+++ b/src/backend/utils/error/jsonlog.c@@ -168,8 +168,8 @@ write_jsonlog(ErrorData *edata)
}
/* Session id */
- appendJSONKeyValueFmt(&buf, "session_id", true, "%lx.%x",- (long) MyStartTime, MyProcPid);+ appendJSONKeyValueFmt(&buf, "session_id", true, INT64_HEX_FORMAT ".%x",+ MyStartTime, MyProcPid);
/* Line number */
appendJSONKeyValueFmt(&buf, "line_num", false, "%ld", log_line_number);
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.cindex 537d92c0cf..ef60f41b8c 100644--- a/src/backend/utils/init/miscinit.c+++ b/src/backend/utils/init/miscinit.c@@ -1372,10 +1372,10 @@ CreateLockFile(const char *filename, bool amPostmaster,
* both datadir and socket lockfiles; although more stuff may get added to
* the datadir lockfile later.
*/
- snprintf(buffer, sizeof(buffer), "%d\n%s\n%ld\n%d\n%s\n",+ snprintf(buffer, sizeof(buffer), "%d\n%s\n" INT64_FORMAT "\n%d\n%s\n",
amPostmaster ? (int) my_pid : -((int) my_pid),
DataDir,
- (long) MyStartTime,+ MyStartTime,
PostPortNumber,
socketDir);
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.cindex e7e878c22f..d6bb2c3311 100644--- a/src/bin/pg_ctl/pg_ctl.c+++ b/src/bin/pg_ctl/pg_ctl.c@@ -618,7 +618,7 @@ wait_for_postmaster_start(pid_t pm_pid, bool do_checkpoint)
* Allow 2 seconds slop for possible cross-process clock skew.
*/
pmpid = atol(optlines[LOCK_FILE_LINE_PID - 1]);
- pmstart = atol(optlines[LOCK_FILE_LINE_START_TIME - 1]);+ pmstart = atoll(optlines[LOCK_FILE_LINE_START_TIME - 1]);
if (pmstart >= start_time - 2 &&
#ifndef WIN32
pmpid == pm_pid
diff --git a/src/include/c.h b/src/include/c.hindex dc1841346c..400c527397 100644--- a/src/include/c.h+++ b/src/include/c.h@@ -547,6 +547,8 @@ typedef unsigned long long int uint64;
/* snprintf format strings to use for 64-bit integers */
#define INT64_FORMAT "%" INT64_MODIFIER "d"
#define UINT64_FORMAT "%" INT64_MODIFIER "u"
+#define INT64_HEX_FORMAT "%" INT64_MODIFIER "x"+#define UINT64_HEX_FORMAT "%" INT64_MODIFIER "x"
/*
* 128-bit signed and unsigned integers
diff --git a/src/test/modules/test_radixtree/test_radixtree.c b/src/test/modules/test_radixtree/test_radixtree.cindex 1d9165a3a2..3e6863f660 100644--- a/src/test/modules/test_radixtree/test_radixtree.c+++ b/src/test/modules/test_radixtree/test_radixtree.c@@ -23,8 +23,6 @@
/* uncomment to use shared memory for the tree */
/* #define TEST_SHARED_RT */
-#define UINT64_HEX_FORMAT "%" INT64_MODIFIER "X"-
/* Convenient macros to test results */
#define EXPECT_TRUE(expr) \
do { \
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-hackers@postgresql.org
Cc: nathandbossart@gmail.com, max.johnson@novatechautomation.com, tgl@sss.pgh.pa.us
Subject: Re: pg_ctl/miscinit: print "MyStartTime" as a long long instead of long to avoid 2038 problem.
In-Reply-To: <ZvRbA1BXCC4nadX7@nathan>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox