Skip to content

gvfs-helper: move prefetch/since tracing to helper #850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
derrickstolee wants to merge 1 commit into
base: vfs-2.53.0
Choose a base branch
from
Open

gvfs-helper: move prefetch/since tracing to helper #850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions gvfs-helper-client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,10 +539,9 @@ int gh_client__get_immediate(const struct object_id *oid,
* Ask gvfs-helper to prefetch commits-and-trees packfiles since a
* given timestamp.
*
* If seconds_since_epoch is zero, gvfs-helper will scan the ODB for
* the last received prefetch and ask for ones newer than that.
* We ignore seconds_since_epoch and use the value from the ODB.
*/
int gh_client__prefetch(timestamp_t seconds_since_epoch,
int gh_client__prefetch(timestamp_t seconds_since_epoch UNUSED,
int *nr_packfiles_received)
{
struct gh_server__process *entry;
Expand All @@ -557,14 +556,12 @@ int gh_client__prefetch(timestamp_t seconds_since_epoch,
return -1;

trace2_region_enter("gh-client", "objects/prefetch", the_repository);
trace2_data_intmax("gh-client", the_repository, "prefetch/since",
seconds_since_epoch);

process = &entry->subprocess.process;

sigchain_push(SIGPIPE, SIG_IGN);

err = gh_client__send__objects_prefetch(process, seconds_since_epoch);
err = gh_client__send__objects_prefetch(process, /* seconds unknown */ 0);
if (!err)
err = gh_client__objects__receive_response(
process, &ghc, &nr_loose, &nr_packfile);
Expand Down
2 changes: 1 addition & 1 deletion gvfs-helper-client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ int gh_client__drain_queue(enum gh_client__created *p_ghc);
* Ask `gvfs-helper server` to fetch any "prefetch packs"
* available on the server more recent than the requested time.
*
* If seconds_since_epoch is zero, gvfs-helper will scan the ODB for
* seconds_since_epoch is ignored. the gvfs-helper will scan the ODB for
* the last received prefetch and ask for ones newer than that.
*
* A long-running background process is used to subsequent requests
Expand Down
4 changes: 4 additions & 0 deletions gvfs-helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3542,6 +3542,10 @@ static void do__http_get__gvfs_prefetch(struct gh__response_status *status,
strbuf_addf(&component_url, "?lastPackTimestamp=%"PRItime,
seconds_since_epoch);

trace2_data_intmax(TR2_CAT, the_repository,
"prefetch/since",
seconds_since_epoch);

params.b_is_post = 0;
params.b_write_to_file = 1;
params.b_permit_cache_server_if_defined = 1;
Expand Down
Loading