mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpq: Move pg_cancel to fe-cancel.c

Browse Source 
No other files need to access this struct, so there is no need to have
its definition in a header file.

Author: Jelte Fennema-Nio <postgres@jeltef.nl>
Discussion: https://postgr.es/m/202403061822.spfzqbf7dsgg@alvherre.pgsql
This commit is contained in:
Alvaro Herrera 2024-03-12 09:11:24 +01:00
parent d6e171fed6
commit 4dec98c2af
No known key found for this signature in database
GPG Key ID: 1C20ACB9D5C564AE
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/interfaces/libpq/fe-cancel.c
View File

@ -21,6 +21,26 @@
#include "libpq-int.h" #include "libpq-int.h"
#include "port/pg_bswap.h" #include "port/pg_bswap.h"
/*
* pg_cancel (backing struct for PGcancel) stores all data necessary to send a
* cancel request.
*/
struct pg_cancel
{
SockAddr raddr; /* Remote address */
int be_pid; /* PID of to-be-canceled backend */
int be_key; /* cancel key of to-be-canceled backend */
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. * PQgetCancel: get a PGcancel structure corresponding to a connection.
* *

18
src/interfaces/libpq/libpq-int.h
View File

@ -621,24 +621,6 @@ struct pg_conn
PQExpBufferData workBuffer; /* expansible string */ 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. /* String descriptions of the ExecStatusTypes.
* direct use of this array is deprecated; call PQresStatus() instead. * direct use of this array is deprecated; call PQresStatus() instead.