Alexander/nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: build failure when _SC_PHYS_PAGES is not defined

Browse Source 
_SC_PHYS_PAGES isn't POSIX and might not be defined. in such case, just
return back `CACHE_SIZE_FALLBACK`.

NOTE: POSIX says the `names` in `sysconf()` are "symbolic constants" not
necessarily macros. So we might end up returning the fallback in some
cases where `_SC_PHYS_PAGES` *was* available, but not defined as a
macro. which is not ideal, but nothing fatal.

in practice, this shouldn't be an issue since most systems seems to
define them to be macros, i've checked Glibc, Musl, OpenBSD, FreeBSD and
Haiku.

also add a (useful) comment on `config.h` describing the effect higher
cache size has.

Closes: https://codeberg.org/nsxiv/nsxiv/issues/354
This commit is contained in:
NRK 2022-08-07 19:53:26 +06:00 committed by Gitea
parent fb9686c650
commit becf1cc858
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.def.h
View File

@ -56,6 +56,9 @@ static const bool ALPHA_LAYER = false;
* 3 means use 3% of total memory which is about 245MiB on 8GiB machine. * 3 means use 3% of total memory which is about 245MiB on 8GiB machine.
* 0 or less means disable cache. * 0 or less means disable cache.
* 100 means use all available memory (but not above CACHE_SIZE_LIMIT). * 100 means use all available memory (but not above CACHE_SIZE_LIMIT).
*
* NOTE: higher cache size means better image reloading performance, but also
* higher memory usage.
*/ */
static const int CACHE_SIZE_MEM_PERCENTAGE = 3; /* use 3% of total memory for cache */ static const int CACHE_SIZE_MEM_PERCENTAGE = 3; /* use 3% of total memory for cache */
static const int CACHE_SIZE_LIMIT = 256 * 1024 * 1024; /* but not above 256MiB */ static const int CACHE_SIZE_LIMIT = 256 * 1024 * 1024; /* but not above 256MiB */

6
image.c
View File

@ -49,14 +49,14 @@ enum { DEF_WEBP_DELAY = 75 };
static int calc_cache_size(void) static int calc_cache_size(void)
{ {
int cache; long cache, pages = -1, page_size = -1;
long pages, page_size;
if (CACHE_SIZE_MEM_PERCENTAGE <= 0) if (CACHE_SIZE_MEM_PERCENTAGE <= 0)
return 0; return 0;
#ifdef _SC_PHYS_PAGES /* _SC_PHYS_PAGES isn't POSIX */
pages = sysconf(_SC_PHYS_PAGES); pages = sysconf(_SC_PHYS_PAGES);
page_size = sysconf(_SC_PAGE_SIZE); page_size = sysconf(_SC_PAGE_SIZE);
#endif
if (pages < 0 || page_size < 0) if (pages < 0 || page_size < 0)
return CACHE_SIZE_FALLBACK; return CACHE_SIZE_FALLBACK;
cache = (pages/100) * CACHE_SIZE_MEM_PERCENTAGE; cache = (pages/100) * CACHE_SIZE_MEM_PERCENTAGE;