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

pull: Incrementally write into temporary file 

Rather than downloading into one big chunk in memory, then writing all
at once.
This commit is contained in:
Colin Walters 2012-02-23 19:20:36 -05:00
parent b2ad353b42
commit 7907a853b4
1 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/ostree/ostree-pull.c
View File

@ -54,6 +54,29 @@ log_verbose (const char *fmt,
g_free (msg); g_free (msg);
} }
typedef struct {
SoupSession *session;
GOutputStream *stream;
gboolean had_error;
GError **error;
} OstreeSoupChunkData;
static void
on_got_chunk (SoupMessage *msg,
SoupBuffer *buf,
gpointer user_data)
{
OstreeSoupChunkData *data = user_data;
gsize bytes_written;
if (!g_output_stream_write_all (data->stream, buf->data, buf->length,
&bytes_written, NULL, data->error))
{
data->had_error = TRUE;
soup_session_cancel_message (data->session, msg, 500);
}
}
static gboolean static gboolean
fetch_uri (OstreeRepo *repo, fetch_uri (OstreeRepo *repo,
SoupSession *soup, SoupSession *soup,
@ -65,15 +88,30 @@ fetch_uri (OstreeRepo *repo,
gboolean ret = FALSE; gboolean ret = FALSE;
SoupMessage *msg = NULL; SoupMessage *msg = NULL;
guint response; guint response;
SoupBuffer *buf = NULL;
char *uri_string = NULL; char *uri_string = NULL;
GFile *ret_temp_filename = NULL; GFile *ret_temp_filename = NULL;
GOutputStream *output_stream = NULL; GOutputStream *output_stream = NULL;
gsize bytes_written; OstreeSoupChunkData chunkdata;
if (!ostree_create_temp_regular_file (ostree_repo_get_tmpdir (repo),
tmp_prefix, NULL,
&ret_temp_filename,
&output_stream,
NULL, error))
goto out;
chunkdata.session = soup;
chunkdata.stream = output_stream;
chunkdata.had_error = FALSE;
chunkdata.error = error;
uri_string = soup_uri_to_string (uri, FALSE); uri_string = soup_uri_to_string (uri, FALSE);
log_verbose ("Fetching %s", uri_string); log_verbose ("Fetching %s", uri_string);
msg = soup_message_new_from_uri (SOUP_METHOD_GET, uri); msg = soup_message_new_from_uri (SOUP_METHOD_GET, uri);
soup_message_body_set_accumulate (msg->response_body, FALSE);
g_signal_connect (msg, "got-chunk", G_CALLBACK (on_got_chunk), &chunkdata);
response = soup_session_send_message (soup, msg); response = soup_session_send_message (soup, msg);
if (response != 200) if (response != 200)
@ -84,19 +122,6 @@ fetch_uri (OstreeRepo *repo,
goto out; goto out;
} }
if (!ostree_create_temp_regular_file (ostree_repo_get_tmpdir (repo),
tmp_prefix, NULL,
&ret_temp_filename,
&output_stream,
NULL, error))
goto out;
buf = soup_message_body_flatten (msg->response_body);
if (!g_output_stream_write_all (output_stream, buf->data, buf->length,
&bytes_written, NULL, error))
goto out;
if (!g_output_stream_close (output_stream, NULL, error)) if (!g_output_stream_close (output_stream, NULL, error))
goto out; goto out;