TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-10-21 17:28:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimize stream for full-file writes

Browse Source
This commit is contained in:
topjohnwu
2021-11-23 18:08:14 -08:00
parent 048b2af0fc
commit 24984ea4f2
5 changed files with 50 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
native/jni/utils/include/stream.hpp
View File

@@ -26,6 +26,7 @@ public:
ssize_t read(void *buf, size_t len) override;
bool write(const void *buf, size_t len) override;
virtual bool write(const void *buf, size_t len, bool final);
// Seeking while filtering does not make sense
off_t seek(off_t off, int whence) final { return stream::seek(off, whence); }
@@ -34,6 +35,8 @@ protected:
stream_ptr base;
};
using filter_strm_ptr = std::unique_ptr<filter_stream>;
// Buffered output stream, writing in chunks
class chunk_out_stream : public filter_stream {
public:
@@ -48,11 +51,12 @@ public:
// Reading does not make sense
ssize_t read(void *buf, size_t len) final { return stream::read(buf, len); }
bool write(const void *buf, size_t len) final;
bool write(const void *buf, size_t len, bool final) final;
protected:
// Classes inheriting this class has to call finalize() in its destructor
void finalize();
virtual bool write_chunk(const void *buf, size_t len) = 0;
virtual bool write_chunk(const void *buf, size_t len, bool final) = 0;
size_t chunk_sz;

29
native/jni/utils/stream.cpp
View File

@@ -107,13 +107,21 @@ bool filter_stream::write(const void *buf, size_t len) {
return base->write(buf, len);
}
bool chunk_out_stream::write(const void *_in, size_t len) {
bool filter_stream::write(const void *buf, size_t len, bool final) {
return write(buf, len);
}
bool chunk_out_stream::write(const void *buf, size_t len) {
return write(buf, len, false);
}
bool chunk_out_stream::write(const void *_in, size_t len, bool final) {
auto in = static_cast<const uint8_t *>(_in);
while (len) {
if (buf_off + len >= chunk_sz) {
// Enough input for a chunk
const uint8_t *src;
if (buf_off) {
// Copy the rest of the chunk to internal buffer
src = _buf;
auto copy = chunk_sz - buf_off;
memcpy(_buf + buf_off, in, copy);
@@ -125,8 +133,21 @@ bool chunk_out_stream::write(const void *_in, size_t len) {
in += chunk_sz;
len -= chunk_sz;
}
if (!write_chunk(src, chunk_sz))
if (!write_chunk(src, chunk_sz, final && len == 0))
return false;
} else if (final) {
// Final input data, write regardless whether it is chunk sized
if (buf_off) {
memcpy(_buf + buf_off, in, len);
auto avail = buf_off + len;
buf_off = 0;
if (!write_chunk(_buf, avail, true))
return false;
} else {
if (!write_chunk(in, len, true))
return false;
}
break;
} else {
// Buffer internally
if (!_buf) {
@@ -142,7 +163,7 @@ bool chunk_out_stream::write(const void *_in, size_t len) {
void chunk_out_stream::finalize() {
if (buf_off) {
write_chunk(_buf, buf_off);
write_chunk(_buf, buf_off, true);
delete[] _buf;
_buf = nullptr;
buf_off = 0;