diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-12-01 17:27:57 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-12-01 17:27:57 +0000 |
| commit | d891cf94e0d947153725e558d5f3f7f55256a8df (patch) | |
| tree | 3e72ac8b73fdba9f99a41008c9c1c4aea1128351 /src/zabbix_server/functions.c | |
| parent | 9a6c2b055631f727a6f599e709574455d7fc8b80 (diff) | |
| download | zabbix-d891cf94e0d947153725e558d5f3f7f55256a8df.tar.gz zabbix-d891cf94e0d947153725e558d5f3f7f55256a8df.tar.xz zabbix-d891cf94e0d947153725e558d5f3f7f55256a8df.zip | |
Minor fixes.
git-svn-id: svn://svn.zabbix.com/trunk@2382 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/zabbix_server/functions.c')
| -rw-r--r-- | src/zabbix_server/functions.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/zabbix_server/functions.c b/src/zabbix_server/functions.c index e3ae44e6..feb83ccc 100644 --- a/src/zabbix_server/functions.c +++ b/src/zabbix_server/functions.c @@ -589,11 +589,11 @@ static int add_history(DB_ITEM *item, AGENT_RESULT *value, int now) /* Should we store delta or original value? */ if(item->delta == ITEM_STORE_AS_IS) { - if(value->type & AR_UINT64) + if( (item->value_type==ITEM_VALUE_TYPE_UINT64) && (value->type & AR_UINT64)) { DBadd_history_uint(item->itemid,value->ui64,now); } - if(value->type & AR_DOUBLE) + if( (item->value_type==ITEM_VALUE_TYPE_FLOAT) && (value->type & AR_DOUBLE)) { DBadd_history(item->itemid,value->dbl,now); } @@ -602,12 +602,12 @@ static int add_history(DB_ITEM *item, AGENT_RESULT *value, int now) else if(item->delta == ITEM_STORE_SPEED_PER_SECOND) { /* Save delta */ - if(value->type & AR_DOUBLE) + if( (item->value_type==ITEM_VALUE_TYPE_FLOAT) && (value->type & AR_DOUBLE)) if((item->prevorgvalue_null == 0) && (item->prevorgvalue <= value->dbl)) { DBadd_history(item->itemid, (value->dbl - item->prevorgvalue)/(now-item->lastclock), now); } - if(value->type & AR_UINT64) + if((item->value_type==ITEM_VALUE_TYPE_UINT64) && (value->type & AR_UINT64)) if((item->prevorgvalue_null == 0) && (item->prevorgvalue <= value->ui64)) { DBadd_history_uint(item->itemid, (zbx_uint64_t)(value->ui64 - item->prevorgvalue)/(now-item->lastclock), now); @@ -617,12 +617,12 @@ static int add_history(DB_ITEM *item, AGENT_RESULT *value, int now) else if(item->delta == ITEM_STORE_SIMPLE_CHANGE) { /* Save delta */ - if(value->type & AR_DOUBLE) + if((item->value_type==ITEM_VALUE_TYPE_FLOAT) && (value->type & AR_DOUBLE)) if((item->prevorgvalue_null == 0) && (item->prevorgvalue <= value->dbl) ) { DBadd_history(item->itemid, (value->dbl - item->prevorgvalue), now); } - if(value->type & AR_UINT64) + if((item->value_type==ITEM_VALUE_TYPE_UINT64) && (value->type & AR_UINT64)) if((item->prevorgvalue_null == 0) && (item->prevorgvalue <= value->ui64) ) { DBadd_history_uint(item->itemid, (value->ui64 - item->prevorgvalue), now); |