From 825b68047d516fc5ab3c54916e211075a08988fa Mon Sep 17 00:00:00 2001
From: Andrey Rachitskiy <a.rachitskiy@postgrespro.ru>
Date: Fri, 24 Jul 2026 11:17:45 +0500
Subject: [PATCH 1/1] Fix SystemTap dtrace warning for smgr probe argument
 types

Commits ca326e903d and 1f8c504e308 widened the byte-count arguments of
smgr__md__read__done and smgr__md__write__done to "long long int".
SystemTap's dtrace(1) pyparsing grammar rejects that multi-word type and
falls back with a warning (misreported near the previous probe).  Use
"long" instead, which matches ssize_t on our LP64 DTrace platforms and
is already used elsewhere in probes.d.

Author: Andrey Rachitskiy <pl0h0yp1@gmail.com>
Reported-by: Laurenz Albe <laurenz.albe@cybertec.at>
Discussion: https://postgr.es/m/697d3c88568442cd637d8453d129f1bb14bbd2a8.camel@cybertec.at
---
 doc/src/sgml/monitoring.sgml | 4 ++--
 src/backend/utils/probes.d   | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml
index 074a821a68e..be820040434 100644
--- a/doc/src/sgml/monitoring.sgml
+++ b/doc/src/sgml/monitoring.sgml
@@ -8595,7 +8595,7 @@ FROM pg_stat_get_backend_idset() AS backendid;
     </row>
     <row>
      <entry><literal>smgr-md-read-done</literal></entry>
-     <entry><literal>(ForkNumber, BlockNumber, Oid, Oid, Oid, int, int, int)</literal></entry>
+     <entry><literal>(ForkNumber, BlockNumber, Oid, Oid, Oid, int, long, long)</literal></entry>
      <entry>Probe that fires when a block read is complete.
       arg0 and arg1 contain the fork and block numbers of the page.
       arg2, arg3, and arg4 contain the tablespace, database, and relation OIDs
@@ -8617,7 +8617,7 @@ FROM pg_stat_get_backend_idset() AS backendid;
     </row>
     <row>
      <entry><literal>smgr-md-write-done</literal></entry>
-     <entry><literal>(ForkNumber, BlockNumber, Oid, Oid, Oid, int, int, int)</literal></entry>
+     <entry><literal>(ForkNumber, BlockNumber, Oid, Oid, Oid, int, long, long)</literal></entry>
      <entry>Probe that fires when a block write is complete.
       arg0 and arg1 contain the fork and block numbers of the page.
       arg2, arg3, and arg4 contain the tablespace, database, and relation OIDs
diff --git a/src/backend/utils/probes.d b/src/backend/utils/probes.d
index 2d8f12cbe30..c11d8d49581 100644
--- a/src/backend/utils/probes.d
+++ b/src/backend/utils/probes.d
@@ -13,6 +13,8 @@
  *
  * NOTE: Do not use system-provided typedefs (e.g. uintptr_t, uint32_t, etc)
  * in probe definitions, as they cause compilation errors on macOS.
+ * Also avoid "long long": SystemTap's dtrace(1) rejects it.  Use "long"
+ * for 64-bit quantities on our LP64 DTrace platforms.
  */
 #define LocalTransactionId unsigned int
 #define LWLockMode int
@@ -83,9 +85,9 @@ provider postgresql {
 	probe twophase__checkpoint__done();
 
 	probe smgr__md__read__start(ForkNumber, BlockNumber, Oid, Oid, Oid, int);
-	probe smgr__md__read__done(ForkNumber, BlockNumber, Oid, Oid, Oid, int, long long int, long long int);
+	probe smgr__md__read__done(ForkNumber, BlockNumber, Oid, Oid, Oid, int, long, long);
 	probe smgr__md__write__start(ForkNumber, BlockNumber, Oid, Oid, Oid, int);
-	probe smgr__md__write__done(ForkNumber, BlockNumber, Oid, Oid, Oid, int, long long int, long long int);
+	probe smgr__md__write__done(ForkNumber, BlockNumber, Oid, Oid, Oid, int, long, long);
 
 	probe wal__insert(unsigned char, unsigned char);
 	probe wal__switch();
-- 
2.53.0

