xplist: Improve writing of large PLIST_DATA nodes by growing buffer in advance
Instead of letting the buffer grow by just the amount of bytes currently
transformed to base64 - which is basically line by line - we now calculate
the size of the output blob in advance and grow the buffer accordingly.
This will reduce the amount of reallocs to just one, which is especially
important for large data blobs.
While this is a general improvement for all platforms, it is on platforms
like Windows where realloc() can be REALLY slow; converting a 20mb blob to
XML can easily take up to a minute (due to the several hundred thousand
calls to realloc()). With this commit, it will be fast again.
diff --git a/src/bytearray.c b/src/bytearray.c
index 861890e..fff5089 100644
--- a/src/bytearray.c
+++ b/src/bytearray.c
@@ -41,15 +41,20 @@
free(ba);
}
+void byte_array_grow(bytearray_t *ba, size_t amount)
+{
+ size_t increase = (amount > PAGE_SIZE) ? (amount+(PAGE_SIZE-1)) & (~(PAGE_SIZE-1)) : PAGE_SIZE;
+ ba->data = realloc(ba->data, ba->capacity + increase);
+ ba->capacity += increase;
+}
+
void byte_array_append(bytearray_t *ba, void *buf, size_t len)
{
if (!ba || !ba->data || (len <= 0)) return;
size_t remaining = ba->capacity-ba->len;
if (len > remaining) {
size_t needed = len - remaining;
- size_t increase = (needed > PAGE_SIZE) ? (needed+(PAGE_SIZE-1)) & (~(PAGE_SIZE-1)) : PAGE_SIZE;
- ba->data = realloc(ba->data, ba->capacity + increase);
- ba->capacity += increase;
+ byte_array_grow(ba, needed);
}
memcpy(((char*)ba->data) + ba->len, buf, len);
ba->len += len;
diff --git a/src/bytearray.h b/src/bytearray.h
index 1613143..aae8c31 100644
--- a/src/bytearray.h
+++ b/src/bytearray.h
@@ -30,6 +30,7 @@
bytearray_t *byte_array_new();
void byte_array_free(bytearray_t *ba);
+void byte_array_grow(bytearray_t *ba, size_t amount);
void byte_array_append(bytearray_t *ba, void *buf, size_t len);
#endif
diff --git a/src/strbuf.h b/src/strbuf.h
index 6b7f9d3..ba2c909 100644
--- a/src/strbuf.h
+++ b/src/strbuf.h
@@ -28,6 +28,7 @@
#define str_buf_new() byte_array_new()
#define str_buf_free(__ba) byte_array_free(__ba)
+#define str_buf_grow(__ba, __am) byte_array_grow(__ba, __am)
#define str_buf_append(__ba, __str, __len) byte_array_append(__ba, (void*)(__str), __len)
#endif
diff --git a/src/xplist.c b/src/xplist.c
index 0e9b007..7f20ef2 100644
--- a/src/xplist.c
+++ b/src/xplist.c
@@ -294,6 +294,7 @@
uint32_t maxread = ((76 - indent*8) / 4) * 3;
size_t count = 0;
size_t b64count = 0;
+ str_buf_grow(*outbuf, (node_data->length / 3 * 4) + 4 + (((node_data->length / maxread) + 1) * (indent+1)));
while (j < node_data->length) {
for (i = 0; i < indent; i++) {
str_buf_append(*outbuf, "\t", 1);
