yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Zero-copy read for 0-compression archives (#809)

Browse Source 
* Zero-copy read for 0-compression archives

* Refine

---------

Co-authored-by: GG Bond <whatever@tagkong.com>
This commit is contained in:
renovate[bot]andGG Bond authored and GitHub committed 2024-02-28 09:04:17 +00:00
1 parent d0fbb3539f
commit 5982bd2d4b
1 file changed
+25 -9
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/cpp/archive.c
+25 -9
View File
@@ -387,15 +387,31 @@ Java_com_hippo_ehviewer_jni_ArchiveKt_extractToByteBuffer(JNIEnv *env, jclass th
int ret;
ret = archive_get_ctx(&ctx, index);
if (ret) return 0;
ret = archive_read_data(ctx->arc, addr, size);
ctx->using = 0;
if (ret == size)
return (*env)->NewDirectByteBuffer(env, addr, size);
if (ret != size)
LOGE("%s", "No enough data read, WTF?");
if (ret < 0)
LOGE("%s%s", "Archive read failed:", archive_error_string(ctx->arc));
mempool_release_pages(addr, size);
void *inner_buff = NULL;
size_t inner_buff_len = 0;
la_int64_t output_ofs = 0;
archive_read_data_block(ctx->arc, (const void **) &inner_buff, &inner_buff_len, &output_ofs);
bool zero_copy = !output_ofs && inner_buff_len == size;
if (zero_copy) {
ctx->using = 0;
return (*env)->NewDirectByteBuffer(env, inner_buff, inner_buff_len);
} else {
size_t bytes = 0;
do {
memcpy(addr + output_ofs, inner_buff, inner_buff_len);
bytes += inner_buff_len;
ret = archive_read_data_block(ctx->arc, (const void **) &inner_buff, &inner_buff_len, &output_ofs);
} while (inner_buff_len && !ret);
ctx->using = 0;
if (bytes == size) {
return (*env)->NewDirectByteBuffer(env, addr, size);
} else {
LOGE("%s", "No enough data read, WTF?");
}
if (ret < 0)
LOGE("%s%s", "Archive read failed:", archive_error_string(ctx->arc));
mempool_release_pages(addr, size);
}
} else {
return (*env)->NewDirectByteBuffer(env, addr, size);
}