mika/nx-hbmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enabled using setvbuf with adjustments, improves netloader perf. Fixed issue with large-chunksize, chunksize is now uint32_t and initialized to 0. Minor other change.

Browse Source
This commit is contained in:
yellows8 2019-08-08 17:55:56 -04:00
parent ea4db4ff02
commit fa3d93d649
No known key found for this signature in database
GPG Key ID: 0AF90DA3F1E60E43
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/netloader.c
View File

@ -274,7 +274,7 @@ static int decompress(int sock, FILE *fh, size_t filesize) {
int ret; int ret;
unsigned have; unsigned have;
z_stream strm; z_stream strm;
size_t chunksize; uint32_t chunksize=0;
/* allocate inflate state */ /* allocate inflate state */
strm.zalloc = Z_NULL; strm.zalloc = Z_NULL;
@ -306,7 +306,7 @@ static int decompress(int sock, FILE *fh, size_t filesize) {
if (chunksize > sizeof(in)) { if (chunksize > sizeof(in)) {
(void)inflateEnd(&strm); (void)inflateEnd(&strm);
netloader_error("Invalid chunk size.",0); netloader_error("Invalid chunk size",chunksize);
return Z_DATA_ERROR; return Z_DATA_ERROR;
} }
@ -442,11 +442,18 @@ int loadnro(menuEntry_s *me, int sock, struct in_addr remote) {
send(sock,(char *)&response,sizeof(response),0); send(sock,(char *)&response,sizeof(response),0);
char *writebuffer = NULL;
if (response == 0 ) { if (response == 0 ) {
writebuffer = malloc(FILE_BUFFER_SIZE);
if (writebuffer==NULL) {
netloader_error("Failed to allocate memory",ENOMEM);
response = -1;
}
else
setvbuf(file,writebuffer,_IOFBF, FILE_BUFFER_SIZE);
}
//char *writebuffer=malloc(FILE_BUFFER_SIZE); if (response == 0 ) {
//setvbuf(file,writebuffer,_IOFBF, FILE_BUFFER_SIZE);
//printf("transferring %s\n%d bytes.\n", filename, filelen); //printf("transferring %s\n%d bytes.\n", filename, filelen);
if (decompress(sock,file,filelen)==Z_OK) { if (decompress(sock,file,filelen)==Z_OK) {
@ -493,9 +500,9 @@ int loadnro(menuEntry_s *me, int sock, struct in_addr remote) {
response = -1; response = -1;
} }
//free(writebuffer);
fflush(file); fflush(file);
fclose(file); fclose(file);
free(writebuffer);
if (response == -1) unlink(me->path); if (response == -1) unlink(me->path);
} }