Merge pull request #5340 from pks-t/pks/pack-zstream Refactor packfile code to use zstream abstraction
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326
diff --git a/src/pack.c b/src/pack.c
index 4c4eb9b..7c6fc2c 100644
--- a/src/pack.c
+++ b/src/pack.c
@@ -7,14 +7,12 @@
#include "pack.h"
-#include "odb.h"
#include "delta.h"
-#include "sha1_lookup.h"
-#include "mwindow.h"
#include "futils.h"
+#include "mwindow.h"
+#include "odb.h"
#include "oid.h"
-
-#include <zlib.h>
+#include "sha1_lookup.h"
/* Option to bypass checking existence of '.keep' files */
bool git_disable_pack_keep_file_checks = false;
@@ -765,31 +763,13 @@ cleanup:
return error;
}
-static void *use_git_alloc(void *opaq, unsigned int count, unsigned int size)
-{
- GIT_UNUSED(opaq);
- return git__calloc(count, size);
-}
-
-static void use_git_free(void *opaq, void *ptr)
-{
- GIT_UNUSED(opaq);
- git__free(ptr);
-}
-
int git_packfile_stream_open(git_packfile_stream *obj, struct git_pack_file *p, off64_t curpos)
{
- int st;
-
memset(obj, 0, sizeof(git_packfile_stream));
obj->curpos = curpos;
obj->p = p;
- obj->zstream.zalloc = use_git_alloc;
- obj->zstream.zfree = use_git_free;
- obj->zstream.next_in = Z_NULL;
- obj->zstream.next_out = Z_NULL;
- st = inflateInit(&obj->zstream);
- if (st != Z_OK) {
+
+ if (git_zstream_init(&obj->zstream, GIT_ZSTREAM_INFLATE) < 0) {
git_error_set(GIT_ERROR_ZLIB, "failed to init packfile stream");
return -1;
}
@@ -799,110 +779,100 @@ int git_packfile_stream_open(git_packfile_stream *obj, struct git_pack_file *p,
ssize_t git_packfile_stream_read(git_packfile_stream *obj, void *buffer, size_t len)
{
+ unsigned int window_len;
unsigned char *in;
- size_t written;
- int st;
+ int error;
if (obj->done)
return 0;
- in = pack_window_open(obj->p, &obj->mw, obj->curpos, &obj->zstream.avail_in);
- if (in == NULL)
+ if ((in = pack_window_open(obj->p, &obj->mw, obj->curpos, &window_len)) == NULL)
return GIT_EBUFS;
- obj->zstream.next_out = buffer;
- obj->zstream.avail_out = (unsigned int)len;
- obj->zstream.next_in = in;
-
- st = inflate(&obj->zstream, Z_SYNC_FLUSH);
- git_mwindow_close(&obj->mw);
-
- obj->curpos += obj->zstream.next_in - in;
- written = len - obj->zstream.avail_out;
-
- if (st != Z_OK && st != Z_STREAM_END) {
+ if ((error = git_zstream_set_input(&obj->zstream, in, window_len)) < 0 ||
+ (error = git_zstream_get_output_chunk(buffer, &len, &obj->zstream)) < 0) {
+ git_mwindow_close(&obj->mw);
git_error_set(GIT_ERROR_ZLIB, "error reading from the zlib stream");
return -1;
}
- if (st == Z_STREAM_END)
- obj->done = 1;
+ git_mwindow_close(&obj->mw);
+ obj->curpos += window_len - obj->zstream.in_len;
+
+ if (git_zstream_eos(&obj->zstream))
+ obj->done = 1;
/* If we didn't write anything out but we're not done, we need more data */
- if (!written && st != Z_STREAM_END)
+ if (!len && !git_zstream_eos(&obj->zstream))
return GIT_EBUFS;
- return written;
+ return len;
}
void git_packfile_stream_dispose(git_packfile_stream *obj)
{
- inflateEnd(&obj->zstream);
+ git_zstream_free(&obj->zstream);
}
static int packfile_unpack_compressed(
git_rawobj *obj,
struct git_pack_file *p,
- git_mwindow **w_curs,
- off64_t *curpos,
+ git_mwindow **mwindow,
+ off64_t *position,
size_t size,
git_object_t type)
{
- size_t buf_size;
- int st;
- z_stream stream;
- unsigned char *buffer, *in;
-
- GIT_ERROR_CHECK_ALLOC_ADD(&buf_size, size, 1);
- buffer = git__calloc(1, buf_size);
- GIT_ERROR_CHECK_ALLOC(buffer);
-
- memset(&stream, 0, sizeof(stream));
- stream.next_out = buffer;
- stream.avail_out = (uInt)buf_size;
- stream.zalloc = use_git_alloc;
- stream.zfree = use_git_free;
-
- st = inflateInit(&stream);
- if (st != Z_OK) {
- git__free(buffer);
- git_error_set(GIT_ERROR_ZLIB, "failed to init zlib stream on unpack");
+ git_zstream zstream = GIT_ZSTREAM_INIT;
+ size_t buffer_len, total = 0;
+ char *data = NULL;
+ int error;
- return -1;
+ GIT_ERROR_CHECK_ALLOC_ADD(&buffer_len, size, 1);
+ data = git__calloc(1, buffer_len);
+ GIT_ERROR_CHECK_ALLOC(data);
+
+ if ((error = git_zstream_init(&zstream, GIT_ZSTREAM_INFLATE)) < 0) {
+ git_error_set(GIT_ERROR_ZLIB, "failed to init zlib stream on unpack");
+ goto out;
}
do {
- in = pack_window_open(p, w_curs, *curpos, &stream.avail_in);
- stream.next_in = in;
- st = inflate(&stream, Z_FINISH);
- git_mwindow_close(w_curs);
+ size_t bytes = buffer_len - total;
+ unsigned int window_len;
+ unsigned char *in;
- if (!stream.avail_out)
- break; /* the payload is larger than it should be */
+ in = pack_window_open(p, mwindow, *position, &window_len);
- if (st == Z_BUF_ERROR && in == NULL) {
- inflateEnd(&stream);
- git__free(buffer);
- return GIT_EBUFS;
+ if ((error = git_zstream_set_input(&zstream, in, window_len)) < 0 ||
+ (error = git_zstream_get_output_chunk(data + total, &bytes, &zstream)) < 0) {
+ git_mwindow_close(mwindow);
+ goto out;
}
- *curpos += stream.next_in - in;
- } while (st == Z_OK || st == Z_BUF_ERROR);
+ git_mwindow_close(mwindow);
- inflateEnd(&stream);
+ *position += window_len - zstream.in_len;
+ total += bytes;
+ } while (total < size);
- if ((st != Z_STREAM_END) || stream.total_out != size) {
- git__free(buffer);
+ if (total != size || !git_zstream_eos(&zstream)) {
git_error_set(GIT_ERROR_ZLIB, "error inflating zlib stream");
- return -1;
+ error = -1;
+ goto out;
}
obj->type = type;
obj->len = size;
- obj->data = buffer;
- return 0;
+ obj->data = data;
+
+out:
+ git_zstream_free(&zstream);
+ if (error)
+ git__free(data);
+
+ return error;
}
/*
diff --git a/src/pack.h b/src/pack.h
index a294ecd..a6a32ff 100644
--- a/src/pack.h
+++ b/src/pack.h
@@ -10,16 +10,15 @@
#include "common.h"
-#include <zlib.h>
-
#include "git2/oid.h"
+#include "array.h"
#include "map.h"
#include "mwindow.h"
#include "odb.h"
#include "offmap.h"
#include "oidmap.h"
-#include "array.h"
+#include "zstream.h"
#define GIT_PACK_FILE_MODE 0444
@@ -116,7 +115,7 @@ struct git_pack_entry {
typedef struct git_packfile_stream {
off64_t curpos;
int done;
- z_stream zstream;
+ git_zstream zstream;
struct git_pack_file *p;
git_mwindow *mw;
} git_packfile_stream;
diff --git a/src/zstream.c b/src/zstream.c
index fc8bfb8..975ead2 100644
--- a/src/zstream.c
+++ b/src/zstream.c
@@ -77,6 +77,11 @@ bool git_zstream_done(git_zstream *zstream)
return (!zstream->in_len && zstream->zerr == Z_STREAM_END);
}
+bool git_zstream_eos(git_zstream *zstream)
+{
+ return zstream->zerr == Z_STREAM_END;
+}
+
size_t git_zstream_suggest_output_len(git_zstream *zstream)
{
if (zstream->in_len > ZSTREAM_BUFFER_SIZE)
diff --git a/src/zstream.h b/src/zstream.h
index 47ecc13..db0cc47 100644
--- a/src/zstream.h
+++ b/src/zstream.h
@@ -44,6 +44,7 @@ int git_zstream_get_output_chunk(
int git_zstream_get_output(void *out, size_t *out_len, git_zstream *zstream);
bool git_zstream_done(git_zstream *zstream);
+bool git_zstream_eos(git_zstream *zstream);
void git_zstream_reset(git_zstream *zstream);
diff --git a/tests/pack/packbuilder.c b/tests/pack/packbuilder.c
index 59eb3da..32f0612 100644
--- a/tests/pack/packbuilder.c
+++ b/tests/pack/packbuilder.c
@@ -145,7 +145,7 @@ void test_pack_packbuilder__get_hash(void)
seed_packbuilder();
- git_packbuilder_write(_packbuilder, ".", 0, NULL, NULL);
+ cl_git_pass(git_packbuilder_write(_packbuilder, ".", 0, NULL, NULL));
git_oid_fmt(hex, git_packbuilder_hash(_packbuilder));
cl_assert_equal_s(hex, "7f5fa362c664d68ba7221259be1cbd187434b2f0");
@@ -158,7 +158,7 @@ static void test_write_pack_permission(mode_t given, mode_t expected)
seed_packbuilder();
- git_packbuilder_write(_packbuilder, ".", given, NULL, NULL);
+ cl_git_pass(git_packbuilder_write(_packbuilder, ".", given, NULL, NULL));
/* Windows does not return group/user bits from stat,
* files are never executable.
@@ -197,7 +197,7 @@ void test_pack_packbuilder__permissions_readwrite(void)
void test_pack_packbuilder__does_not_fsync_by_default(void)
{
seed_packbuilder();
- git_packbuilder_write(_packbuilder, ".", 0666, NULL, NULL);
+ cl_git_pass(git_packbuilder_write(_packbuilder, ".", 0666, NULL, NULL));
cl_assert_equal_sz(0, p_fsync__cnt);
}
@@ -215,7 +215,7 @@ void test_pack_packbuilder__fsync_global_setting(void)
cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_FSYNC_GITDIR, 1));
p_fsync__cnt = 0;
seed_packbuilder();
- git_packbuilder_write(_packbuilder, ".", 0666, NULL, NULL);
+ cl_git_pass(git_packbuilder_write(_packbuilder, ".", 0666, NULL, NULL));
cl_assert_equal_sz(expected_fsyncs, p_fsync__cnt);
}
@@ -224,7 +224,7 @@ void test_pack_packbuilder__fsync_repo_setting(void)
cl_repo_set_bool(_repo, "core.fsyncObjectFiles", true);
p_fsync__cnt = 0;
seed_packbuilder();
- git_packbuilder_write(_packbuilder, ".", 0666, NULL, NULL);
+ cl_git_pass(git_packbuilder_write(_packbuilder, ".", 0666, NULL, NULL));
cl_assert_equal_sz(expected_fsyncs, p_fsync__cnt);
}