packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump libglnx, use "n items" progress for fsck 

Sooo much nicer.  See also
https://github.com/projectatomic/rpm-ostree/pull/1143

Update submodule: libglnx

Closes: #1383
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-12-14 21:42:54 -05:00 committed by Atomic Bot
parent 8c42e81f12
commit 5a77b8dafe
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libglnx

@ -1 +1 @@
Subproject commit b36606b366d39c7ddb90ee21d622c0cb1da118ed Subproject commit 96b1fd9578b3d6ff2d8e0707068f5ef450eba98c

7
src/ostree/ot-builtin-fsck.c
View File

@ -111,8 +111,10 @@ fsck_reachable_objects_from_commits (OstreeRepo *repo,
return FALSE; return FALSE;
} }
g_auto(GLnxConsoleRef) console = { 0, };
glnx_console_lock (&console);
const guint count = g_hash_table_size (reachable_objects); const guint count = g_hash_table_size (reachable_objects);
const guint mod = count / 10;
guint i = 0; guint i = 0;
g_hash_table_iter_init (&hash_iter, reachable_objects); g_hash_table_iter_init (&hash_iter, reachable_objects);
while (g_hash_table_iter_next (&hash_iter, &key, &value)) while (g_hash_table_iter_next (&hash_iter, &key, &value))
@ -127,9 +129,8 @@ fsck_reachable_objects_from_commits (OstreeRepo *repo,
cancellable, error)) cancellable, error))
return FALSE; return FALSE;
if (mod == 0 || (i % mod == 0))
g_print ("%u/%u objects\n", i + 1, count);
i++; i++;
glnx_console_progress_n_items ("fsck objects", i, count);
} }
return TRUE; return TRUE;