KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

otrx: optimize memory usage when creating TRX image

Browse source 
There is no need to allocate buffer as big as the whole image in order
to calculate CRC32. It's enough to use small buffer and just read file
content block by block.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
Rafał Miłecki 2017-11-13 23:07:46 +01:00
parent c6761e7c8e
commit 6d283b8029
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
package/utils/otrx/src/otrx.c
View file

@ -284,7 +284,7 @@ static ssize_t otrx_create_align(FILE *trx, size_t curr_offset, size_t alignment
static int otrx_create_write_hdr(FILE *trx, struct trx_header *hdr) { static int otrx_create_write_hdr(FILE *trx, struct trx_header *hdr) {
size_t bytes, length; size_t bytes, length;
uint8_t *buf; uint8_t buf[1024];
uint32_t crc32; uint32_t crc32;
hdr->magic = cpu_to_le32(TRX_MAGIC); hdr->magic = cpu_to_le32(TRX_MAGIC);
@ -299,20 +299,13 @@ static int otrx_create_write_hdr(FILE *trx, struct trx_header *hdr) {
length = le32_to_cpu(hdr->length); length = le32_to_cpu(hdr->length);
buf = malloc(length); crc32 = 0xffffffff;
if (!buf) { fseek(trx, TRX_FLAGS_OFFSET, SEEK_SET);
fprintf(stderr, "Couldn't alloc %zu B buffer\n", length); length -= TRX_FLAGS_OFFSET;
return -ENOMEM; while ((bytes = fread(buf, 1, otrx_min(sizeof(buf), length), trx)) > 0) {
crc32 = otrx_crc32(crc32, buf, bytes);
length -= bytes;
} }
fseek(trx, 0, SEEK_SET);
bytes = fread(buf, 1, length, trx);
if (bytes != length) {
fprintf(stderr, "Couldn't read %zu B of data from %s\n", length, trx_path);
return -ENOMEM;
}
crc32 = otrx_crc32(0xffffffff, buf + TRX_FLAGS_OFFSET, length - TRX_FLAGS_OFFSET);
hdr->crc32 = cpu_to_le32(crc32); hdr->crc32 = cpu_to_le32(crc32);
fseek(trx, 0, SEEK_SET); fseek(trx, 0, SEEK_SET);