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

lib/repo-pull: Factor out enqueue function for FetchObjectData 

This introduces no functional changes, but will make upcoming support
for retrying downloads easier to add.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Closes: #1599
Approved by: jlebon
This commit is contained in:
Philip Withnall 2018-05-22 12:19:15 +01:00 committed by Atomic Bot
parent 8b8952ebee
commit dc1fde704d
1 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,6 +224,9 @@ static void queue_scan_one_metadata_object_c (OtPullData *pull_da
guint recursion_depth, guint recursion_depth,
const OstreeCollectionRef *ref); const OstreeCollectionRef *ref);
static void enqueue_one_object_request_s (OtPullData *pull_data,
FetchObjectData *fetch_data);
static gboolean scan_one_metadata_object (OtPullData *pull_data, static gboolean scan_one_metadata_object (OtPullData *pull_data,
const char *checksum, const char *checksum,
OstreeObjectType objtype, OstreeObjectType objtype,
@ -1917,31 +1920,14 @@ scan_one_metadata_object (OtPullData *pull_data,
} }
static void static void
enqueue_one_object_request (OtPullData *pull_data, enqueue_one_object_request_s (OtPullData *pull_data,
const char *checksum, FetchObjectData *fetch_data)
OstreeObjectType objtype,
const char *path,
gboolean is_detached_meta,
gboolean object_is_stored,
const OstreeCollectionRef *ref)
{ {
gboolean is_meta; const char *checksum;
FetchObjectData *fetch_data; OstreeObjectType objtype;
is_meta = OSTREE_OBJECT_TYPE_IS_META (objtype); ostree_object_name_deserialize (fetch_data->object, &checksum, &objtype);
gboolean is_meta = OSTREE_OBJECT_TYPE_IS_META (objtype);
fetch_data = g_new0 (FetchObjectData, 1);
fetch_data->pull_data = pull_data;
fetch_data->object = ostree_object_name_serialize (checksum, objtype);
fetch_data->path = g_strdup (path);
fetch_data->is_detached_meta = is_detached_meta;
fetch_data->object_is_stored = object_is_stored;
fetch_data->requested_ref = (ref != NULL) ? ostree_collection_ref_dup (ref) : NULL;
if (is_meta)
pull_data->n_requested_metadata++;
else
pull_data->n_requested_content++;
/* Are too many requests are in flight? */ /* Are too many requests are in flight? */
if (fetcher_queue_is_full (pull_data)) if (fetcher_queue_is_full (pull_data))
@ -1965,6 +1951,35 @@ enqueue_one_object_request (OtPullData *pull_data,
} }
} }
static void
enqueue_one_object_request (OtPullData *pull_data,
const char *checksum,
OstreeObjectType objtype,
const char *path,
gboolean is_detached_meta,
gboolean object_is_stored,
const OstreeCollectionRef *ref)
{
FetchObjectData *fetch_data;
fetch_data = g_new0 (FetchObjectData, 1);
fetch_data->pull_data = pull_data;
fetch_data->object = ostree_object_name_serialize (checksum, objtype);
fetch_data->path = g_strdup (path);
fetch_data->is_detached_meta = is_detached_meta;
fetch_data->object_is_stored = object_is_stored;
fetch_data->requested_ref = (ref != NULL) ? ostree_collection_ref_dup (ref) : NULL;
gboolean is_meta = OSTREE_OBJECT_TYPE_IS_META (objtype);
if (is_meta)
pull_data->n_requested_metadata++;
else
pull_data->n_requested_content++;
enqueue_one_object_request_s (pull_data, g_steal_pointer (&fetch_data));
}
static void static void
start_fetch (OtPullData *pull_data, start_fetch (OtPullData *pull_data,
FetchObjectData *fetch) FetchObjectData *fetch)