Commit becf1cc

nsxivbecf1cc

fix: build failure when _SC_PHYS_PAGES is not defined

_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.

Author: NRK
Date: 2022-08-07 19:53 +0600
Committer: Gitea · 2022-08-11 03:58 +0200
Parent: fb9686c
Commit: becf1cc858d1590d75f00124b77f04578da7fae0

+6 −3

2 files changed

Browse files Patch

−Context 3+

M config.def.h +3 −0
M image.c +3 −3

M config.def.h View

M image.c View

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

		@@ -49,14 +49,14 @@ enum { DEF_WEBP_DELAY = 75 };
49	49
50	50		static int calc_cache_size(void)
51	51		{
52		−	int cache;
53		−	long pages, page_size;
	52	+	long cache, pages = -1, page_size = -1;
54	53
55	54		if (CACHE_SIZE_MEM_PERCENTAGE <= 0)
56	55		return 0;
57		−
	56	+	#ifdef _SC_PHYS_PAGES /* _SC_PHYS_PAGES isn't POSIX */
58	57		pages = sysconf(_SC_PHYS_PAGES);
59	58		page_size = sysconf(_SC_PAGE_SIZE);
	59	+	#endif
60	60		if (pages < 0 \|\| page_size < 0)
61	61		return CACHE_SIZE_FALLBACK;
62	62		cache = (pages/100) * CACHE_SIZE_MEM_PERCENTAGE;

nsxiv/becf1cc

fix: build failure when _SC_PHYS_PAGES is not defined

nsxivbecf1cc