From 54cb4e8a42b0f8342b765a1e3e222f8d24b432a8 Mon Sep 17 00:00:00 2001 From: Jelte Fennema-Nio Date: Thu, 7 Mar 2024 10:11:32 +0100 Subject: [PATCH v33 3/5] libpq: Move pg_cancel to fe-cancel.c No other files need to access this structs. So there is no need to have its definition in a header file. --- src/interfaces/libpq/fe-cancel.c | 19 +++++++++++++++++++ src/interfaces/libpq/libpq-int.h | 18 ------------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/interfaces/libpq/fe-cancel.c b/src/interfaces/libpq/fe-cancel.c index 51f8d8a78c4..29e66608be6 100644 --- a/src/interfaces/libpq/fe-cancel.c +++ b/src/interfaces/libpq/fe-cancel.c @@ -21,6 +21,25 @@ #include "libpq-int.h" #include "port/pg_bswap.h" +/* PGcancel stores all data necessary to cancel a connection. A copy of this + * data is required to safely cancel a connection running on a different + * thread. + */ +struct pg_cancel +{ + SockAddr raddr; /* Remote address */ + int be_pid; /* PID of backend --- needed for cancels */ + int be_key; /* key of backend --- needed for cancels */ + int pgtcp_user_timeout; /* tcp user timeout */ + int keepalives; /* use TCP keepalives? */ + int keepalives_idle; /* time between TCP keepalives */ + int keepalives_interval; /* time between TCP keepalive + * retransmits */ + int keepalives_count; /* maximum number of TCP keepalive + * retransmits */ +}; + + /* * PQgetCancel: get a PGcancel structure corresponding to a connection. * diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h index 82c18f870d2..3abcd180d6d 100644 --- a/src/interfaces/libpq/libpq-int.h +++ b/src/interfaces/libpq/libpq-int.h @@ -621,24 +621,6 @@ struct pg_conn PQExpBufferData workBuffer; /* expansible string */ }; -/* PGcancel stores all data necessary to cancel a connection. A copy of this - * data is required to safely cancel a connection running on a different - * thread. - */ -struct pg_cancel -{ - SockAddr raddr; /* Remote address */ - int be_pid; /* PID of backend --- needed for cancels */ - int be_key; /* key of backend --- needed for cancels */ - int pgtcp_user_timeout; /* tcp user timeout */ - int keepalives; /* use TCP keepalives? */ - int keepalives_idle; /* time between TCP keepalives */ - int keepalives_interval; /* time between TCP keepalive - * retransmits */ - int keepalives_count; /* maximum number of TCP keepalive - * retransmits */ -}; - /* String descriptions of the ExecStatusTypes. * direct use of this array is deprecated; call PQresStatus() instead. -- 2.34.1