diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-17 12:54:17 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-17 12:54:17 +0000 |
| commit | 0b14d9ff3ac4f2e5bbd4e6056568076ef9e0894d (patch) | |
| tree | 9606b95ca2bc19edd5f396895fa78978eb65a662 /src | |
| parent | 706df4a919a955a760068d390ea2d9114ae78aef (diff) | |
Fixes for processing of delta items.
[svn merge -r4607:4610 svn://svn.zabbix.com/branches/1.4.2]
git-svn-id: svn://svn.zabbix.com/trunk@4611 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/zabbix_server/functions.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/zabbix_server/functions.c b/src/zabbix_server/functions.c index bae08a6b..0f1f564b 100644 --- a/src/zabbix_server/functions.c +++ b/src/zabbix_server/functions.c @@ -602,7 +602,7 @@ static void update_item(DB_ITEM *item, AGENT_RESULT *value, time_t now) (value->dbl - item->prevorgvalue_dbl)/(now-item->lastclock), (int)now, item->itemid); - value->dbl = (value->dbl - item->prevorgvalue_dbl)/(now-item->lastclock); + SET_DBL_RESULT(value, (double)(value->dbl - item->prevorgvalue_dbl)/(now-item->lastclock)); } else { @@ -613,7 +613,7 @@ static void update_item(DB_ITEM *item, AGENT_RESULT *value, time_t now) value->dbl - item->prevorgvalue_dbl, (int)now, item->itemid); - value->dbl = (value->dbl - item->prevorgvalue_dbl); + SET_DBL_RESULT(value, (double)(value->dbl - item->prevorgvalue_dbl)); } } else @@ -635,13 +635,13 @@ static void update_item(DB_ITEM *item, AGENT_RESULT *value, time_t now) if(now != item->lastclock) { DBexecute("update items set nextcheck=%d,prevvalue=lastvalue,prevorgvalue='" ZBX_FS_UI64 "'," - "lastvalue='" ZBX_FS_DBL "',lastclock=%d where itemid=" ZBX_FS_UI64, + "lastvalue='" ZBX_FS_UI64 "',lastclock=%d where itemid=" ZBX_FS_UI64, calculate_item_nextcheck(item->itemid, item->type, item->delay,item->delay_flex,now), value->ui64, - ((double)(value->ui64 - item->prevorgvalue_uint64))/(now-item->lastclock), + ((zbx_uint64_t)(value->ui64 - item->prevorgvalue_uint64))/(now-item->lastclock), (int)now, item->itemid); - value->dbl = ((double)(value->ui64 - item->prevorgvalue_uint64))/(now-item->lastclock); + SET_UI64_RESULT(value, (zbx_uint64_t)(value->ui64 - item->prevorgvalue_uint64)/(now-item->lastclock)); } else { @@ -652,7 +652,7 @@ static void update_item(DB_ITEM *item, AGENT_RESULT *value, time_t now) (double)(value->ui64 - item->prevorgvalue_uint64), (int)now, item->itemid); - value->dbl = (double)(value->ui64 - item->prevorgvalue_uint64); + SET_UI64_RESULT(value, (zbx_uint64_t)(value->ui64 - item->prevorgvalue_uint64)); } } else @@ -682,7 +682,7 @@ static void update_item(DB_ITEM *item, AGENT_RESULT *value, time_t now) (value->dbl - item->prevorgvalue_dbl), (int)now, item->itemid); - value->dbl = (double)(value->dbl - item->prevorgvalue_dbl); + SET_DBL_RESULT(value, (double)(value->dbl - item->prevorgvalue_dbl)); } else { @@ -707,7 +707,7 @@ static void update_item(DB_ITEM *item, AGENT_RESULT *value, time_t now) (value->ui64 - item->prevorgvalue_uint64), (int)now, item->itemid); - value->ui64 = value->ui64 - item->prevorgvalue_uint64; + SET_UI64_RESULT(value, (zbx_uint64_t)(value->ui64 - item->prevorgvalue_uint64)); } else { |