Module: kamailio Branch: master Commit: f221a3eaf29b78671fb1c603813fe7e6c2314fbf URL: https://github.com/kamailio/kamailio/commit/f221a3eaf29b78671fb1c603813fe7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-29T15:54:27+02:00 core: mem - defines for pkg/shm status filter functions --- Modified: src/core/mem/pkg.h Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/f221a3eaf29b78671fb1c603813fe7e… Patch: https://github.com/kamailio/kamailio/commit/f221a3eaf29b78671fb1c603813fe7e… --- diff --git a/src/core/mem/pkg.h b/src/core/mem/pkg.h index 9b0e5087d1d..9a6b9dac2b1 100644 --- a/src/core/mem/pkg.h +++ b/src/core/mem/pkg.h @@ -65,6 +65,8 @@ void pkg_print_manager(void); #endif #define pkg_status() _pkg_root.xstatus(_pkg_root.mem_block) +#define pkg_status_filter(fmatch, fp) \ + _pkg_root.xstatus_filter(_pkg_root.mem_block, fmatch, fp) #define pkg_info(mi) _pkg_root.xinfo(_pkg_root.mem_block, mi) #define pkg_report(mr) _pkg_root.xreport(_pkg_root.mem_block, mr) #define pkg_available() _pkg_root.xavailable(_pkg_root.mem_block) diff --git a/src/core/mem/shm.h b/src/core/mem/shm.h index c83c9dd48a6..9cdadc10618 100644 --- a/src/core/mem/shm.h +++ b/src/core/mem/shm.h @@ -53,9 +53,8 @@ extern sr_shm_api_t _shm_root; #define shm_mallocxz(s) \ _shm_root.xmallocxz(_shm_root.mem_block, (s), _SRC_LOC_, _SRC_FUNCTION_, \ _SRC_LINE_, _SRC_MODULE_) -#define shm_mallocxp(s, loc, fname, nline, mname) \ - _shm_root.xmalloc(_shm_root.mem_block, (s), loc, fname, \ - nline, mname) +#define shm_mallocxp(s, loc, fname, nline, mname) \ + _shm_root.xmalloc(_shm_root.mem_block, (s), loc, fname, nline, mname) #define shm_malloc_unsafe(s) \ _shm_root.xmalloc_unsafe(_shm_root.mem_block, (s), _SRC_LOC_, \ _SRC_FUNCTION_, _SRC_LINE_, _SRC_MODULE_) @@ -65,9 +64,8 @@ extern sr_shm_api_t _shm_root; #define shm_reallocxf(p, s) \ _shm_root.xreallocxf(_shm_root.mem_block, (p), (s), _SRC_LOC_, \ _SRC_FUNCTION_, _SRC_LINE_, _SRC_MODULE_) -#define shm_reallocxp(p, s, loc, fname, nline, mname) \ - _shm_root.xrealloc(_shm_root.mem_block, (p), (s), loc, \ - fname, nline, mname) +#define shm_reallocxp(p, s, loc, fname, nline, mname) \ + _shm_root.xrealloc(_shm_root.mem_block, (p), (s), loc, fname, nline, mname) #define shm_resize(p, s) \ _shm_root.xresize(_shm_root.mem_block, (p), (s), _SRC_LOC_, \ _SRC_FUNCTION_, _SRC_LINE_, _SRC_MODULE_) @@ -89,6 +87,8 @@ extern sr_shm_api_t _shm_root; #endif #define shm_status() _shm_root.xstatus(_shm_root.mem_block) +#define shm_status_filter(fmatch, fp) \ + _shm_root.xstatus_filter(_shm_root.mem_block, fmatch, fp) #define shm_info(mi) _shm_root.xinfo(_shm_root.mem_block, mi) #define shm_report(mr) _shm_root.xreport(_shm_root.mem_block, mr) #define shm_available() _shm_root.xavailable(_shm_root.mem_block)