Commit4dec98c

committed

libpq: Move pg_cancel to fe-cancel.c

No other files need to access this struct, so there is no need to haveits definition in a header file.Author: Jelte Fennema-Nio <postgres@jeltef.nl>Discussion:https://postgr.es/m/202403061822.spfzqbf7dsgg@alvherre.pgsql

1 parentd6e171f commit4dec98cCopy full SHA for 4dec98c

File tree

+20

-18

lines changed

+20

-18

lines changed

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,26 @@`
`21`	`21`	`#include"libpq-int.h"`
`22`	`22`	`#include"port/pg_bswap.h"`
`23`	`23`
	`24`	`+`
	`25`	`+/*`
	`26`	`+ * pg_cancel (backing struct for PGcancel) stores all data necessary to send a`
	`27`	`+ * cancel request.`
	`28`	`+ */`
	`29`	`+structpg_cancel`
	`30`	`+{`
	`31`	`+SockAddrraddr;/* Remote address */`
	`32`	`+intbe_pid;/* PID of to-be-canceled backend */`
	`33`	`+intbe_key;/* cancel key of to-be-canceled backend */`
	`34`	`+intpgtcp_user_timeout;/* tcp user timeout */`
	`35`	`+intkeepalives;/* use TCP keepalives? */`
	`36`	`+intkeepalives_idle;/* time between TCP keepalives */`
	`37`	`+intkeepalives_interval;/* time between TCP keepalive`
	`38`	`+ * retransmits */`
	`39`	`+intkeepalives_count;/* maximum number of TCP keepalive`
	`40`	`+ * retransmits */`
	`41`	`+};`
	`42`	`+`
	`43`	`+`
`24`	`44`	`/*`
`25`	`45`	`* PQgetCancel: get a PGcancel structure corresponding to a connection.`
`26`	`46`	`*`

Lines changed: 0 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -621,24 +621,6 @@ struct pg_conn`
`621`	`621`	`PQExpBufferDataworkBuffer;/* expansible string */`
`622`	`622`	`};`
`623`	`623`
`624`		`-/* PGcancel stores all data necessary to cancel a connection. A copy of this`
`625`		`- * data is required to safely cancel a connection running on a different`
`626`		`- * thread.`
`627`		`- */`
`628`		`-structpg_cancel`
`629`		`-{`
`630`		`-SockAddrraddr;/* Remote address */`
`631`		`-intbe_pid;/* PID of backend --- needed for cancels */`
`632`		`-intbe_key;/* key of backend --- needed for cancels */`
`633`		`-intpgtcp_user_timeout;/* tcp user timeout */`
`634`		`-intkeepalives;/* use TCP keepalives? */`
`635`		`-intkeepalives_idle;/* time between TCP keepalives */`
`636`		`-intkeepalives_interval;/* time between TCP keepalive`
`637`		`- * retransmits */`
`638`		`-intkeepalives_count;/* maximum number of TCP keepalive`
`639`		`- * retransmits */`
`640`		`-};`
`641`		`-`
`642`	`624`
`643`	`625`	`/* String descriptions of the ExecStatusTypes.`
`644`	`626`	`* direct use of this array is deprecated; call PQresStatus() instead.`

Comments

(0)