Allow setting custom async progress callback timeout #725
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Can one of the admins verify this patch?
|
matthiasclasen
suggested changes
Mar 8, 2017
src/libostree/ostree-repo-pull.c
Outdated
| @@ -2589,6 +2589,7 @@ reinitialize_fetcher (OtPullData *pull_data, const char *remote_name, GError **e | |||
| * * override-url (s): Fetch objects from this URL if remote specifies no metalink in options | |||
| * * inherit-transaction (b): Don't initiate, finish or abort a transaction, usefult to do mutliple pulls in one transaction. | |||
| * * http-headers (a(ss)): Additional headers to add to all HTTP requests | |||
| * * update-frequency (i): Frequency to call the async progress callback, if any; only values higher than 0 are valid | |||
There was a problem hiding this comment.
You probably want to say "in milliseconds" here, just to make things clear
And why make it "i" if you only allow nonnegative values ?
|
I'm not sure how my changes are related to the test failures... |
|
bot, add author to whitelist |
jlebon
reviewed
Mar 8, 2017
src/libostree/ostree-repo-pull.c
Outdated
| @@ -2613,6 +2614,7 @@ ostree_repo_pull_with_options (OstreeRepo *self, | |||
| char **configured_branches = NULL; | |||
| guint64 bytes_transferred; | |||
| guint64 end_time; | |||
| guint update_frequency; | |||
There was a problem hiding this comment.
This needs to be initialized to 0, right? In case we don't unpack anything.
When using Flatpak with GNOME Software, it is important to show the progress of the download and install as close as possible to the real progress. However, OSTree forces the frequency to call the async progress callback to 1 second, which causes an unpleasant effect on the UI, specially when the download size is so small that everything happens in less than 1 second. Fix that by adding making OSTree read a custom 'update-frequency' option and set the timeout source timeout to that. If no custom frequency is passed, we assume the default 1 second timeout, maintaining the current behavior.
|
Fixed the build errors (thanks @jlebon!) |
jlebon
reviewed
Mar 8, 2017
src/ostree/ot-builtin-pull.c
Outdated
| @@ -252,6 +254,9 @@ ostree_builtin_pull (int argc, char **argv, GCancellable *cancellable, GError ** | |||
| g_variant_builder_add (&builder, "{s@v}", "depth", | |||
| g_variant_new_variant (g_variant_new_int32 (opt_depth))); | |||
|
|
|||
| g_variant_builder_add (&builder, "{s@v}", "update-frequency", | |||
| g_variant_new_variant (g_variant_new_int32 (opt_frequency))); | |||
After commit 80b3edc introducing the option to set a custom timeout, adapt the ostree program to be able to update that.
|
Looks sane to me. Just one small nit, and then I think we can get this in!
Yeah, the Travis tester is a bit flaky unfortunately. |
|
Nice catch, @jlebon. Updated the PR |
|
☀️ Test successful - status-atomicjenkins |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Flatpak is becoming a thing, and it makes heavy usage of OSTree, and GNOME Software allows managing Flatpak application. That exposed an issue where the progress is updated only once every 1 second, which works well for command line but not for so well for UIs.
This PR fixes that by adding an option to set the timeout to call the async progress callback.