Make some functions and variables (from backup.c) accessible from other compilation units

Author: kulaginm

src/backup.c

@@ -27,7 +27,7 @@
 //const char *progname = "pg_probackup";
 
 /* list of files contained in backup */
-static parray *backup_files_list = NULL;
+parray *backup_files_list = NULL;
 
 /* We need critical section for datapagemap_add() in case of using threads */
 static pthread_mutex_t backup_pagemap_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -36,25 +36,7 @@ static pthread_mutex_t backup_pagemap_mutex = PTHREAD_MUTEX_INITIALIZER;
 bool exclusive_backup = false;
 
 /* Is pg_start_backup() was executed */
-static bool backup_in_progress = false;
-
-typedef struct PGStopBackupResult
-{
-	/*
-	 * We will use values of snapshot_xid and invocation_time if there are
-	 * no transactions between start_lsn and stop_lsn.
-	 */
-	TransactionId	snapshot_xid;
-	time_t		invocation_time;
-	/*
-	 * Fields that store pg_catalog.pg_stop_backup() result
-	 */
-	XLogRecPtr	lsn;
-	size_t		backup_label_content_len;
-	char		*backup_label_content;
-	size_t		tablespace_map_content_len;
-	char		*tablespace_map_content;
-} PGStopBackupResult;
+bool backup_in_progress = false;
 
 /*
  * Backup routines
@@ -66,18 +48,9 @@ static void *backup_files(void *arg);
 static void do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
 						 PGNodeInfo *nodeInfo, bool no_sync, bool backup_logs);
 
-static void pg_start_backup(const char *label, bool smooth, pgBackup *backup,
-							PGNodeInfo *nodeInfo, PGconn *conn);
 static void pg_switch_wal(PGconn *conn);
-static void pg_silent_client_messages(PGconn *conn);
-static void pg_create_restore_point(PGconn *conn, time_t backup_start_time);
 
 static void pg_stop_backup(InstanceState *instanceState, pgBackup *backup, PGconn *pg_startbackup_conn, PGNodeInfo *nodeInfo);
-static void pg_stop_backup_send(PGconn *conn, int server_version, bool is_started_on_replica, bool is_exclusive, char **query_text);
-
-static XLogRecPtr wait_wal_lsn(const char *wal_segment_dir, XLogRecPtr lsn, bool is_start_lsn, TimeLineID tli,
-								bool in_prev_segment, bool segment_only,
-								int timeout_elevel, bool in_stream_dir);
 
 static void check_external_for_tablespaces(parray *external_list,
 										   PGconn *backup_conn);
@@ -1062,7 +1035,7 @@ confirm_block_size(PGconn *conn, const char *name, int blcksz)
 /*
  * Notify start of backup to PostgreSQL server.
  */
-static void
+void
 pg_start_backup(const char *label, bool smooth, pgBackup *backup,
 				PGNodeInfo *nodeInfo, PGconn *conn)
 {
@@ -1297,7 +1270,7 @@ pg_is_superuser(PGconn *conn)
  * Returns target LSN if such is found, failing that returns LSN of record prior to target LSN.
  * Returns InvalidXLogRecPtr if 'segment_only' flag is used.
  */
-static XLogRecPtr
+XLogRecPtr
 wait_wal_lsn(const char *wal_segment_dir, XLogRecPtr target_lsn, bool is_start_lsn, TimeLineID tli,
 			 bool in_prev_segment, bool segment_only,
 			 int timeout_elevel, bool in_stream_dir)
@@ -1459,7 +1432,7 @@ wait_wal_lsn(const char *wal_segment_dir, XLogRecPtr target_lsn, bool is_start_l
 }
 
 /* Remove annoying NOTICE messages generated by backend */
-static void
+void
 pg_silent_client_messages(PGconn *conn)
 {
 	PGresult   *res;
@@ -1468,7 +1441,7 @@ pg_silent_client_messages(PGconn *conn)
 	PQclear(res);
 }
 
-static void
+void
 pg_create_restore_point(PGconn *conn, time_t backup_start_time)
 {
 	PGresult	*res;
@@ -1578,7 +1551,7 @@ pg_stop_backup_send(PGconn *conn, int server_version, bool is_started_on_replica
  * parameters:
  *  -
  */
-static void
+void
 pg_stop_backup_consume(PGconn *conn, int server_version,
 		bool is_exclusive, uint32 timeout, const char *query_text,
 		PGStopBackupResult *result)
@@ -1709,7 +1682,7 @@ pg_stop_backup_consume(PGconn *conn, int server_version,
 /*
  * helper routine used to write backup_label and tablespace_map in pg_stop_backup()
  */
-static void
+void
 pg_stop_backup_write_file_helper(const char *path, const char *filename, const char *error_msg_filename,
 		const void *data, size_t len, parray *file_list)
 {

src/pg_probackup.h

@@ -600,7 +600,6 @@ typedef struct
 	int			ret;
 } backup_files_arg;
 
-
 typedef struct timelineInfo timelineInfo;
 
 /* struct to collect info about timelines in WAL archive */
@@ -1260,4 +1259,42 @@ extern void start_WAL_streaming(PGconn *backup_conn, char *stream_dst_path,
 							   ConnectionOptions *conn_opt,
 							   XLogRecPtr startpos, TimeLineID starttli);
 extern int wait_WAL_streaming_end(parray *backup_files_list);
+
+/* external variables and functions, implemented in backup.c */
+typedef struct PGStopBackupResult
+{
+	/*
+	 * We will use values of snapshot_xid and invocation_time if there are
+	 * no transactions between start_lsn and stop_lsn.
+	 */
+	TransactionId	snapshot_xid;
+	time_t		invocation_time;
+	/*
+	 * Fields that store pg_catalog.pg_stop_backup() result
+	 */
+	XLogRecPtr	lsn;
+	size_t		backup_label_content_len;
+	char		*backup_label_content;
+	size_t		tablespace_map_content_len;
+	char		*tablespace_map_content;
+} PGStopBackupResult;
+
+extern bool backup_in_progress;
+extern parray *backup_files_list;
+
+extern void pg_start_backup(const char *label, bool smooth, pgBackup *backup,
+							PGNodeInfo *nodeInfo, PGconn *conn);
+extern void pg_silent_client_messages(PGconn *conn);
+extern void pg_create_restore_point(PGconn *conn, time_t backup_start_time);
+extern void pg_stop_backup_send(PGconn *conn, int server_version, bool is_started_on_replica, bool is_exclusive, char **query_text);
+extern void pg_stop_backup_consume(PGconn *conn, int server_version,
+		bool is_exclusive, uint32 timeout, const char *query_text,
+		PGStopBackupResult *result);
+extern void pg_stop_backup_write_file_helper(const char *path, const char *filename, const char *error_msg_filename,
+		const void *data, size_t len, parray *file_list);
+extern XLogRecPtr wait_wal_lsn(const char *wal_segment_dir, XLogRecPtr lsn, bool is_start_lsn, TimeLineID tli,
+								bool in_prev_segment, bool segment_only,
+								int timeout_elevel, bool in_stream_dir);
+
+
 #endif /* PG_PROBACKUP_H */