[ostree/wip/delta-continuation: 6/7] wip



commit ecbe86c40a3bb9755220d59bdea7945f04d42bdb
Author: Colin Walters <walters verbum org>
Date:   Sat Apr 12 15:33:15 2014 -0400

    wip

 src/libostree/ostree-repo-pull.c                   |    8 ++++----
 .../ostree-repo-static-delta-processing.c          |    5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index 4ac18c0..7128b11 100644
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -712,7 +712,7 @@ fetch_static_delta_data_free (gpointer  data)
 {
   FetchStaticDeltaData *fetch_data = data;
   g_free (fetch_data->expected_checksum);
-  g_variant_unref (fetch_data->headers);
+  g_variant_unref (fetch_data->objects);
   g_free (fetch_data);
 }
 
@@ -726,12 +726,12 @@ on_static_delta_written (GObject           *object,
   GError *local_error = NULL;
   GError **error = &local_error;
 
+  if (8
+
 
  out:
   g_assert (pull_data->n_outstanding_deltapart_fetches > 0);
-  pull_data->n_outstanding_deltapart_fetches--;
-  pull_data->n_fetched_deltaparts++;
-  pull_data->n_outstanding_deltapart_write_requests++;
+  pull_data->n_outstanding_deltapart_write_requests--;
   throw_async_error (pull_data, local_error);
   if (local_error)
     fetch_static_delta_data_free (fetch_data);
diff --git a/src/libostree/ostree-repo-static-delta-processing.c 
b/src/libostree/ostree-repo-static-delta-processing.c
index 5ed9074..2abfb22 100644
--- a/src/libostree/ostree-repo-static-delta-processing.c
+++ b/src/libostree/ostree-repo-static-delta-processing.c
@@ -294,7 +294,7 @@ typedef struct {
   GVariant *header;
   GBytes *partdata;
   GCancellable *cancellable;
-  GAsyncResult *result;
+  GSimpleAsyncResult *result;
 } StaticDeltaPartExecuteAsyncData;
 
 static void
@@ -341,7 +341,7 @@ _ostree_static_delta_part_execute_async (OstreeRepo      *repo,
   asyncdata->partdata = g_bytes_ref (partdata);
   asyncdata->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
 
-  asyncdata->result = g_simple_async_result_new ((GObject*) self,
+  asyncdata->result = g_simple_async_result_new ((GObject*) repo,
                                                  callback, user_data,
                                                  _ostree_static_delta_part_execute_async);
 
@@ -357,7 +357,6 @@ _ostree_static_delta_part_execute_finish (OstreeRepo      *repo,
                                           GError         **error) 
 {
   GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
-  StaticDeltaPartExecuteAsyncData *asyncdata;
 
   g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == _ostree_static_delta_part_execute_async);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]