summaryrefslogtreecommitdiff
path: root/src/pack-objects.h
diff options
context:
space:
mode:
authorPhilip Kelley <phkelley@hotmail.com>2012-10-17 09:14:42 -0700
committerPhilip Kelley <phkelley@hotmail.com>2012-10-17 09:14:42 -0700
commit5300cd759d1da36893328ec28b30906edbca19bc (patch)
tree648097dd6c5209565675a0615f28e16401379a8c /src/pack-objects.h
parent70d41f6bcd248ebb7eaf65098a9495e9e54c67d0 (diff)
parentb4491b9911b4ceaa64b0fa7b94774affa3f41d43 (diff)
downloadlibgit2-5300cd759d1da36893328ec28b30906edbca19bc.tar.gz
Merge pull request #988 from pwkelley/pack-objects
Incremental improvements to pack-objects logic
Diffstat (limited to 'src/pack-objects.h')
-rw-r--r--src/pack-objects.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/pack-objects.h b/src/pack-objects.h
index 8e8012689..0d4854d0d 100644
--- a/src/pack-objects.h
+++ b/src/pack-objects.h
@@ -43,7 +43,6 @@ typedef struct git_pobject {
int written:1,
recursing:1,
- no_try_delta:1,
tagged:1,
filled:1;
} git_pobject;
@@ -65,6 +64,11 @@ struct git_packbuilder {
git_oid pack_oid; /* hash of written pack */
+ /* synchronization objects */
+ git_mutex cache_mutex;
+ git_mutex progress_mutex;
+ git_cond progress_cond;
+
/* configs */
unsigned long delta_cache_size;
unsigned long max_delta_cache_size;
@@ -77,8 +81,7 @@ struct git_packbuilder {
bool done;
};
-
int git_packbuilder_send(git_packbuilder *pb, git_transport *t);
int git_packbuilder_write_buf(git_buf *buf, git_packbuilder *pb);
-#endif
+#endif /* INCLUDE_pack_objects_h__ */