mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Commit: 39559213cd
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
This commit is contained in:
gixxpunk
2017-06-13 18:32:25 +02:00
parent 61182c50e2 ee3c3bb268
commit 58da03034b
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/driver/pictureviewer/pictureviewer.cpp
View File

@@ -883,12 +883,38 @@ unsigned char * CPictureViewer::ResizeA(unsigned char *orgin, int ox, int oy, in
return int_Resize(orgin, ox, oy, dx, dy, COLOR, NULL, true);
}
static size_t getCachedMemSize(void)
{
FILE *procmeminfo = fopen("/proc/meminfo", "r");
size_t cached = 0;
if (procmeminfo) {
char buf[80] = {0}, a[80] = {0};
size_t v = 0;
while (fgets(buf, sizeof(buf), procmeminfo)) {
char unit[10];
*unit = 0;
if ((3 == sscanf(buf, "%[^:]: %zu %s", a, &v, unit))
|| (2 == sscanf(buf, "%[^:]: %zu", a, &v))) {
if (*unit == 'k')
v <<= 10;
if (!strcasecmp(a, "Cached")){
cached = v;
break;
}
}
}
fclose(procmeminfo);
}
return cached;
}
bool CPictureViewer::checkfreemem(size_t bufsize)
{
struct sysinfo info;
sysinfo( &info );
if(bufsize + 4096 > (size_t)info.freeram + (size_t)info.freeswap){
dprintf(DEBUG_NORMAL, "[CPictureViewer] [%s - %d] Error: Out of memory: need %zu > free %zu\n", __func__, __LINE__,bufsize,(size_t)info.freeram + (size_t)info.freeswap);
size_t cached = getCachedMemSize();
if(bufsize + sysconf(_SC_PAGESIZE) > (size_t)info.freeram + (size_t)info.freeswap + (size_t)info.bufferram + cached){
dprintf(DEBUG_NORMAL, "[CPictureViewer] [%s - %d] Error: Out of memory: need %zu > free %zu\n", __func__, __LINE__,bufsize,(size_t)info.freeram + (size_t)info.freeswap + (size_t)info.bufferram + cached);
return false;
}
return true;