mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Instrument the git storage code

Browse source 
This allows fairly fine grained analysis on what part of loading from
and saving to git we are spending our time. Compute performance and
network speed play a significant role in how all this plays out.

The routine to check if we can reach the cloud server is modified to
send updates every second so we don't hang without any feedback for five
seconds when there is network but we can't reach the cloud server (not
an unlikely scenario in many dive locations with poor network quality)

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-04-03 19:26:05 -05:00
parent 904539024e
commit 5821c56da2
5 changed files with 106 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

16
subsurface-core/save-git.c
View file

@ -911,9 +911,19 @@ static int create_git_tree(git_repository *repo, struct dir *root, bool select_o
trip->index = 0;
/* save the dives */
int notify_increment = dive_table.nr > 10 ? dive_table.nr / 10 : 1;
int last_threshold = 0;
for_each_dive(i, dive) {
struct tm tm;
struct dir *tree;
char buf[] = "save dives x0%";
if (i / notify_increment > last_threshold) {
// notify of progress - we cover the range of 20..50
last_threshold = i / notify_increment;
buf[11] = last_threshold + '0';
git_storage_update_progress(20 + 3 * last_threshold, buf);
}
trip = dive->divetrip;
@ -1170,6 +1180,9 @@ int do_git_save(git_repository *repo, const char *branch, const char *remote, bo
if (verbose)
fprintf(stderr, "git storage: do git save\n");
if (!create_empty) // so we are actually saving the dives
git_storage_update_progress(19, "start git save");
/* Start with an empty tree: no subdirectories, no files */
tree.name[0] = 0;
tree.subdirs = NULL;
@ -1181,6 +1194,9 @@ int do_git_save(git_repository *repo, const char *branch, const char *remote, bo
if (create_git_tree(repo, &tree, select_only))
return -1;
if (verbose)
fprintf(stderr, "git storage, write git tree\n");
if (write_git_tree(repo, &tree, &id))
return report_error("git tree write failed");