shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-09 01:18:35 +03:00
Code Issues Projects Releases Wiki Activity

test-rollsum: Process all input, print more statistics

Browse Source 
Copying the bup code, we need to loop over all chunks even after
hitting the rollsum returning 0.

Also print more statistics.
This commit is contained in:
Colin Walters 2014-06-24 07:58:13 -04:00 committed by Giuseppe Scrivano
parent ca678224be
commit 5c47389243
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libostree/ostree-repo-pull.c
View File

@ -1996,6 +1996,7 @@ ostree_repo_pull_with_options (OstreeRepo *self,
shift == 1 ? "B" : "KiB", shift == 1 ? "B" : "KiB",
pull_data->n_fetched_deltaparts, pull_data->n_fetched_deltaparts,
(guint) ((end_time - pull_data->start_time) / G_USEC_PER_SEC)); (guint) ((end_time - pull_data->start_time) / G_USEC_PER_SEC));
ostree_async_progress_set_status (pull_data->progress, msg); ostree_async_progress_set_status (pull_data->progress, msg);
} }

27
tests/test-rollsum.c
View File

@ -31,17 +31,27 @@ rollsum_checksums_for_data (GBytes *bytes)
{ {
const guint8 *start; const guint8 *start;
gsize len; gsize len;
gboolean rollsum_end = FALSE;
GPtrArray *ret = g_ptr_array_new_with_free_func ((GDestroyNotify)g_variant_unref); GPtrArray *ret = g_ptr_array_new_with_free_func ((GDestroyNotify)g_variant_unref);
start = g_bytes_get_data (bytes, &len); start = g_bytes_get_data (bytes, &len);
while (TRUE) while (len > 0)
{ {
int offset, bits; int offset, bits;
offset = bupsplit_find_ofs (start, MIN(G_MAXINT32, len), &bits); if (!rollsum_end)
if (offset == 0) {
break; offset = bupsplit_find_ofs (start, MIN(G_MAXINT32, len), &bits);
if (offset > BLOB_MAX) if (offset == 0)
offset = BLOB_MAX; {
rollsum_end = TRUE;
offset = MIN(BLOB_MAX, len);
}
else if (offset > BLOB_MAX)
offset = BLOB_MAX;
}
else
offset = MIN(BLOB_MAX, len);
{ {
gs_free char *blobcsum = gs_free char *blobcsum =
g_compute_checksum_for_data (G_CHECKSUM_SHA256, g_compute_checksum_for_data (G_CHECKSUM_SHA256,
@ -103,6 +113,7 @@ main (int argc, char **argv)
{ {
guint j; guint j;
gs_unref_ptrarray GPtrArray *rollsums = NULL; gs_unref_ptrarray GPtrArray *rollsums = NULL;
guint64 this_rollsum_size = 0;
path = g_file_new_for_path (argv[i]); path = g_file_new_for_path (argv[i]);
bytes = gs_file_map_readonly (path, cancellable, error); bytes = gs_file_map_readonly (path, cancellable, error);
@ -126,9 +137,11 @@ main (int argc, char **argv)
g_hash_table_add (sums, g_strdup (csum)); g_hash_table_add (sums, g_strdup (csum));
rollsum_size += ofs; rollsum_size += ofs;
} }
this_rollsum_size += ofs;
} }
g_print ("input: rollsum size: %" G_GUINT64_FORMAT "\n", this_rollsum_size);
} }
g_print ("rollsums:%u input:%" G_GUINT64_FORMAT " output: %" G_GUINT64_FORMAT " speedup:%f\n", g_print ("rollsum total:%u input:%" G_GUINT64_FORMAT " output: %" G_GUINT64_FORMAT " speedup:%f\n",
g_hash_table_size (sums), input_size, rollsum_size, g_hash_table_size (sums), input_size, rollsum_size,
(((double)(input_size+1)) / ((double) rollsum_size + 1))); (((double)(input_size+1)) / ((double) rollsum_size + 1)));
} }