Add simple progress bar with option --progress.

stalkerg · stalkerg · commit 6ce7163a8a8e · 2016-09-02T20:16:00.000+03:00
diff --git a/backup.c b/backup.c
@@ -38,7 +38,9 @@ static XLogRecPtr stop_backup_lsn = InvalidXLogRecPtr;
 const char *progname = "pg_arman";
 
 /* list of files contained in backup */
-parray			*backup_files_list;
+parray	*backup_files_list;
+static volatile uint32	total_copy_files_increment;
+static uint32 total_files_num;
 
 typedef struct
 {
@@ -309,6 +311,10 @@ do_backup_database(parray *backup_list, pgBackupOption bkupopt)
 			if (!check)
 				dir_create_dir(dirpath, DIR_PERMISSION);
 		}
+		else
+		{
+			total_files_num++;
+		}
 	}
 
 	if (num_threads < 1)
@@ -337,6 +343,8 @@ do_backup_database(parray *backup_list, pgBackupOption bkupopt)
 					  parray_get(backup_files_list, i));
 	}
 
+	total_copy_files_increment = 0;
+
 	/* Run threads */
 	for (i = 0; i < num_threads; i++)
 	{
@@ -352,6 +360,9 @@ do_backup_database(parray *backup_list, pgBackupOption bkupopt)
 		pg_free(backup_threads_args[i]);
 	}
 
+	if (progress)
+		fprintf(stderr, "\n");
+
 	/* Notify end of backup */
 	pg_stop_backup(&current);
 
@@ -1014,6 +1025,9 @@ backup_files(void *arg)
 		}
 		else
 			elog(LOG, "unexpected file type %d", buf.st_mode);
+		if (progress)
+			fprintf(stderr, "\rProgress %i/%u", total_copy_files_increment, total_files_num-1);
+		 __sync_fetch_and_add(&total_copy_files_increment, 1);
 	}
 }
 
diff --git a/expected/option.out b/expected/option.out
@@ -18,6 +18,7 @@ Common Options:
   -c, --check               show what would have been done
   -j, --threads=NUM         num threads for backup and restore
   --stream                  use stream for save/restore WAL during backup
+  --progress                show progress copy files
 
 Backup options:
   -b, --backup-mode=MODE    full,page,ptrack
diff --git a/pg_arman.c b/pg_arman.c
@@ -39,6 +39,7 @@ bool			stream_wal = false;
 bool			disable_ptrack_clear = false;
 static bool		backup_logs = false;
 static bool		backup_validate = false;
+bool			progress = false;
 
 /* restore configuration */
 static char		   *target_time;
@@ -62,6 +63,7 @@ static pgut_option options[] =
 	{ 'b', 'c', "check",		&check },
 	{ 'i', 'j', "threads",		&num_threads },
 	{ 'b', 8, "stream",			&stream_wal },
+	{ 'b', 11, "progress",		&progress },
 	/* backup options */
 	{ 'b', 9, "disable-ptrack-clear",	&disable_ptrack_clear },
 	{ 'b', 10, "backup-pg-log",			&backup_logs },
@@ -239,6 +241,7 @@ pgut_help(bool details)
 	printf(_("  -c, --check               show what would have been done\n"));
 	printf(_("  -j, --threads=NUM         num threads for backup and restore\n"));
 	printf(_("  --stream                  use stream for save/restore WAL during backup\n"));
+	printf(_("  --progress                show progress copy files\n"));
 	printf(_("\nBackup options:\n"));
 	printf(_("  -b, --backup-mode=MODE    full,page,ptrack\n"));
 	printf(_("  -C, --smooth-checkpoint   do smooth checkpoint before backup\n"));
diff --git a/pg_arman.h b/pg_arman.h
@@ -211,6 +211,7 @@ extern parray *backup_files_list;
 extern int num_threads;
 extern bool stream_wal;
 extern bool disable_ptrack_clear;
+extern bool progress;
 
 /* in backup.c */
 extern int do_backup(pgBackupOption bkupopt);

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,9 @@ static XLogRecPtr stop_backup_lsn = InvalidXLogRecPtr;`
`38`	`38`	`const char *progname = "pg_arman";`
`39`	`39`
`40`	`40`	`/* list of files contained in backup */`
`41`		`-parray *backup_files_list;`
	`41`	`+parray *backup_files_list;`
	`42`	`+static volatile uint32 total_copy_files_increment;`
	`43`	`+static uint32 total_files_num;`
`42`	`44`
`43`	`45`	`typedef struct`
`44`	`46`	`{`
`@@ -309,6 +311,10 @@ do_backup_database(parray *backup_list, pgBackupOption bkupopt)`
`309`	`311`	`if (!check)`
`310`	`312`	`dir_create_dir(dirpath, DIR_PERMISSION);`
`311`	`313`	`}`
	`314`	`+ else`
	`315`	`+ {`
	`316`	`+ total_files_num++;`
	`317`	`+ }`
`312`	`318`	`}`
`313`	`319`
`314`	`320`	`if (num_threads < 1)`
`@@ -337,6 +343,8 @@ do_backup_database(parray *backup_list, pgBackupOption bkupopt)`
`337`	`343`	`parray_get(backup_files_list, i));`
`338`	`344`	`}`
`339`	`345`
	`346`	`+ total_copy_files_increment = 0;`
	`347`	`+`
`340`	`348`	`/* Run threads */`
`341`	`349`	`for (i = 0; i < num_threads; i++)`
`342`	`350`	`{`
`@@ -352,6 +360,9 @@ do_backup_database(parray *backup_list, pgBackupOption bkupopt)`
`352`	`360`	`pg_free(backup_threads_args[i]);`
`353`	`361`	`}`
`354`	`362`
	`363`	`+ if (progress)`
	`364`	`+ fprintf(stderr, "\n");`
	`365`	`+`
`355`	`366`	`/* Notify end of backup */`
`356`	`367`	`pg_stop_backup(&current);`
`357`	`368`
`@@ -1014,6 +1025,9 @@ backup_files(void *arg)`
`1014`	`1025`	`}`
`1015`	`1026`	`else`
`1016`	`1027`	`elog(LOG, "unexpected file type %d", buf.st_mode);`
	`1028`	`+ if (progress)`
	`1029`	`+ fprintf(stderr, "\rProgress %i/%u", total_copy_files_increment, total_files_num-1);`
	`1030`	`+ __sync_fetch_and_add(&total_copy_files_increment, 1);`
`1017`	`1031`	`}`
`1018`	`1032`	`}`
`1019`	`1033`