diff options
| author | Vladislavs Sokurenko <vladislavs.sokurenko@zabbix.com> | 2022-02-17 14:25:50 +0300 |
|---|---|---|
| committer | Vladislavs Sokurenko <vladislavs.sokurenko@zabbix.com> | 2022-02-17 14:27:04 +0300 |
| commit | 01c6b26e1514e9390d7a6bf2b9ef5873ac3e87bc (patch) | |
| tree | 1d58b95e2398cc2c0f9db2f9c1e7f63e35a36870 /tests | |
| parent | 22e66ff4e7ae2b8a35e97de713388489b5bd54bf (diff) | |
.D.....PS. [ZBX-20506] improved performance of configuration syncer; increased default cache size to 32M
Merge in ZBX/zabbix from feature/ZBX-20506-5.5 to master
* commit 'e37666649503265e934aa6de974656a9de25bb08': (31 commits)
.......PS. [ZBX-20506] improved performance of configuration syncer when syncing preprocessing
.D.....PS. [ZBX-20506] increase default configuration cache size to 32M
.......PS. [ZBX-20506] fixed tracing of triggers
.......PS. [ZBX-20506] improved performance of configuration syncer in case there are many trigger prototypes
.......PS. [ZBX-20506] reverted last commit
.......PS. [ZBX-20506] improved performance of configuration syncer in case if there are many trigger prototypes
.D........ [ZBX-20506] added ChangeLog entry
.......PS. [ZBX-20506] increased default cache size to 16M
.......PS. [ZBX-20506] removed this should never happen
.......PS. [ZBX-20506] fixed tests
.......PS. [ZBX-20506] fixed warning
.......PS. [ZBX-20506] added this should never happen to the impossible case
.......PS. [ZBX-20506] style fix
.......PS. [ZBX-20506] added calculated item formula comparison
.......PS. [ZBX-20506] added handling of trigger prototypes and triggers on a template to status update
.......PS. [ZBX-20506] added handling of trigger prototypes and triggers on a template to status update
.......PS. [ZBX-20506] style fix
.......PS. [ZBX-20506] fixed function header
.......PS. [ZBX-20506] added debug of item discovery
.......PS. [ZBX-20506] added debug of item discovery
...
(cherry picked from commit 213231870366c6dd74ba94f85091c38f9d7130d8)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mocks/configcache/configcache.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/mocks/configcache/configcache.c b/tests/mocks/configcache/configcache.c index 4319cca2f23..72bb792f822 100644 --- a/tests/mocks/configcache/configcache.c +++ b/tests/mocks/configcache/configcache.c @@ -45,6 +45,13 @@ void *__wrap_zbx_hashset_search(zbx_hashset_t *hs, const void *data) { int i; + if (&mock_config.dc.items == hs) + { + static ZBX_DC_ITEM item = {.hostid = 1}; + + return &item; + } + if (0 != (mock_config.initialized & ZBX_MOCK_CONFIG_USERMACROS)) { if (hs == &mock_config.dc.hmacros_hm) |