/*****************************************************************************
- * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2002
+ * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007
*****************************************************************************
* rrd_update.c RRD Update Function
*****************************************************************************
* $Id$
- * $Log$
- * Revision 1.14 2003/11/11 19:46:21 oetiker
- * replaced time_value with rrd_time_value as MacOS X introduced a struct of that name in their standard headers
- *
- * Revision 1.13 2003/11/11 19:38:03 oetiker
- * rrd files should NOT change size ever ... bulk update code wa buggy.
- * -- David M. Grimes <dgrimes@navisite.com>
- *
- * Revision 1.12 2003/09/04 13:16:12 oetiker
- * should not assigne but compare ... grrrrr
- *
- * Revision 1.11 2003/09/02 21:58:35 oetiker
- * be pickier about what we accept in rrd_update. Complain if things do not work out
- *
- * Revision 1.10 2003/04/29 19:14:12 jake
- * Change updatev RRA return from index_number to cf_nam, pdp_cnt.
- * Also revert accidental addition of -I to aclocal MakeMakefile.
- *
- * Revision 1.9 2003/04/25 18:35:08 jake
- * Alternate update interface, updatev. Returns info about CDPs written to disk as result of update. Output format is similar to rrd_info, a hash of key-values.
- *
- * Revision 1.8 2003/03/31 21:22:12 oetiker
- * enables RRDtool updates with microsecond or in case of windows millisecond
- * precision. This is needed to reduce time measurement error when archive step
- * is small. (<30s) -- Sasha Mikheev <sasha@avalon-net.co.il>
- *
- * Revision 1.7 2003/02/13 07:05:27 oetiker
- * Find attached the patch I promised to send to you. Please note that there
- * are three new source files (src/rrd_is_thread_safe.h, src/rrd_thread_safe.c
- * and src/rrd_not_thread_safe.c) and the introduction of librrd_th. This
- * library is identical to librrd, but it contains support code for per-thread
- * global variables currently used for error information only. This is similar
- * to how errno per-thread variables are implemented. librrd_th must be linked
- * alongside of libpthred
- *
- * There is also a new file "THREADS", holding some documentation.
- *
- * -- Peter Stamfest <peter@stamfest.at>
- *
- * Revision 1.6 2002/02/01 20:34:49 oetiker
- * fixed version number and date/time
- *
- * Revision 1.5 2001/05/09 05:31:01 oetiker
- * Bug fix: when update of multiple PDP/CDP RRAs coincided
- * with interpolation of multiple PDPs an incorrect value was
- * stored as the CDP. Especially evident for GAUGE data sources.
- * Minor changes to rrdcreate.pod. -- Jake Brutlag <jakeb@corp.webtv.net>
- *
- * Revision 1.4 2001/03/10 23:54:41 oetiker
- * Support for COMPUTE data sources (CDEF data sources). Removes the RPN
- * parser and calculator from rrd_graph and puts then in a new file,
- * rrd_rpncalc.c. Changes to core files rrd_create and rrd_update. Some
- * clean-up of aberrant behavior stuff, including a bug fix.
- * Documentation update (rrdcreate.pod, rrdupdate.pod). Change xml format.
- * -- Jake Brutlag <jakeb@corp.webtv.net>
- *
- * Revision 1.3 2001/03/04 13:01:55 oetiker
- * Aberrant Behavior Detection support. A brief overview added to rrdtool.pod.
- * Major updates to rrd_update.c, rrd_create.c. Minor update to other core files.
- * This is backwards compatible! But new files using the Aberrant stuff are not readable
- * by old rrdtool versions. See http://cricket.sourceforge.net/aberrant/rrd_hw.htm
- * -- Jake Brutlag <jakeb@corp.webtv.net>
- *
- * Revision 1.2 2001/03/04 11:14:25 oetiker
- * added at-style-time@value:value syntax to rrd_update
- * -- Dave Bodenstab <imdave@mcs.net>
- *
- * Revision 1.1.1.1 2001/02/25 22:25:06 oetiker
- * checkin
- *
*****************************************************************************/
#include "rrd_tool.h"
#include <sys/types.h>
#include <fcntl.h>
+#ifdef HAVE_MMAP
+# include <sys/mman.h>
+#endif
-#ifdef WIN32
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
#include <sys/locking.h>
#include <sys/stat.h>
#include <io.h>
#include "rrd_rpncalc.h"
#include "rrd_is_thread_safe.h"
+#include "unused.h"
-#ifdef WIN32
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
/*
* WIN32 does not have gettimeofday and struct timeval. This is a quick and dirty
* replacement.
*/
#include <sys/timeb.h>
+#ifndef __MINGW32__
struct timeval {
time_t tv_sec; /* seconds */
long tv_usec; /* microseconds */
};
+#endif
struct __timezone {
int tz_minuteswest; /* minutes W of Greenwich */
int tz_dsttime; /* type of dst correction */
};
-static gettimeofday(struct timeval *t, struct __timezone *tz) {
-
- struct timeb current_time;
+static int gettimeofday(struct timeval *t, struct __timezone *tz) {
+
+ struct _timeb current_time;
_ftime(¤t_time);
-
+
t->tv_sec = current_time.time;
t->tv_usec = current_time.millitm * 1000;
+
+ return 0;
}
#endif
}
/* Local prototypes */
-int LockRRD(FILE *rrd_file);
+int LockRRD(int in_file);
+#ifdef HAVE_MMAP
info_t *write_RRA_row (rrd_t *rrd, unsigned long rra_idx,
unsigned long *rra_current,
- unsigned short CDP_scratch_idx, FILE *rrd_file,
+ unsigned short CDP_scratch_idx,
+#ifndef DEBUG
+int UNUSED(in_file),
+#else
+int in_file,
+#endif
+ info_t *pcdp_summary, time_t *rra_time, void *rrd_mmaped_file);
+#else
+info_t *write_RRA_row (rrd_t *rrd, unsigned long rra_idx,
+ unsigned long *rra_current,
+ unsigned short CDP_scratch_idx, int in_file,
info_t *pcdp_summary, time_t *rra_time);
-int rrd_update_r(char *filename, char *template, int argc, char **argv);
-int _rrd_update(char *filename, char *template, int argc, char **argv,
+#endif
+int rrd_update_r(const char *filename, const char *tmplt, int argc, const char **argv);
+int _rrd_update(const char *filename, const char *tmplt, int argc, const char **argv,
info_t*);
#define IFDNAN(X,Y) (isnan(X) ? (Y) : (X));
-#ifdef STANDALONE
-int
-main(int argc, char **argv){
- rrd_update(argc,argv);
- if (rrd_test_error()) {
- printf("RRDtool 1.1.x Copyright 1997-2000 by Tobias Oetiker <tobi@oetiker.ch>\n\n"
- "Usage: rrdupdate filename\n"
- "\t\t\t[--template|-t ds-name:ds-name:...]\n"
- "\t\t\ttime|N:value[:value...]\n\n"
- "\t\t\tat-time@value[:value...]\n\n"
- "\t\t\t[ time:value[:value...] ..]\n\n");
-
- printf("ERROR: %s\n",rrd_get_error());
- rrd_clear_error();
- return 1;
- }
- return 0;
-}
-#endif
-
info_t *rrd_update_v(int argc, char **argv)
{
- char *template = NULL;
+ char *tmplt = NULL;
info_t *result = NULL;
infoval rc;
+ rc.u_int = -1;
+ optind = 0; opterr = 0; /* initialize getopt */
while (1) {
static struct option long_options[] =
switch(opt) {
case 't':
- template = optarg;
+ tmplt = optarg;
break;
case '?':
rrd_set_error("unknown option '%s'",argv[optind-1]);
- rc.u_int = -1;
goto end_tag;
}
}
/* need at least 2 arguments: filename, data. */
if (argc-optind < 2) {
rrd_set_error("Not enough arguments");
- rc.u_int = -1;
goto end_tag;
}
+ rc.u_int = 0;
result = info_push(NULL,sprintf_alloc("return_value"),RD_I_INT,rc);
- rc.u_int = _rrd_update(argv[optind], template,
- argc - optind - 1, argv + optind + 1, result);
+ rc.u_int = _rrd_update(argv[optind], tmplt,
+ argc - optind - 1, (const char **)(argv + optind + 1), result);
result->value.u_int = rc.u_int;
end_tag:
return result;
int
rrd_update(int argc, char **argv)
{
- char *template = NULL;
+ char *tmplt = NULL;
int rc;
+ optind = 0; opterr = 0; /* initialize getopt */
while (1) {
static struct option long_options[] =
switch(opt) {
case 't':
- template = optarg;
+ tmplt = optarg;
break;
case '?':
return -1;
}
- rc = rrd_update_r(argv[optind], template,
- argc - optind - 1, argv + optind + 1);
+ rc = rrd_update_r(argv[optind], tmplt,
+ argc - optind - 1, (const char **)(argv + optind + 1));
return rc;
}
int
-rrd_update_r(char *filename, char *template, int argc, char **argv)
+rrd_update_r(const char *filename, const char *tmplt, int argc, const char **argv)
{
- return _rrd_update(filename, template, argc, argv, NULL);
+ return _rrd_update(filename, tmplt, argc, argv, NULL);
}
int
-_rrd_update(char *filename, char *template, int argc, char **argv,
+_rrd_update(const char *filename, const char *tmplt, int argc, const char **argv,
info_t *pcdp_summary)
{
* spot in the rrd file. */
unsigned long rra_pos_tmp; /* temporary byte pointer. */
double interval,
- pre_int,post_int; /* interval between this and
+ pre_int,post_int; /* interval between this and
* the last run */
unsigned long proc_pdp_st; /* which pdp_st was the last
* to be processed */
* cdp values */
long *tmpl_idx; /* index representing the settings
- transported by the template index */
+ transported by the tmplt index */
unsigned long tmpl_cnt = 2; /* time and data */
- FILE *rrd_file;
rrd_t rrd;
- time_t current_time;
- time_t rra_time; /* time of update for a RRA */
- unsigned long current_time_usec; /* microseconds part of current time */
+ time_t current_time = 0;
+ time_t rra_time = 0; /* time of update for a RRA */
+ unsigned long current_time_usec=0;/* microseconds part of current time */
struct timeval tmp_time; /* used for time conversion */
char **updvals;
rpnstack_t rpnstack; /* used for COMPUTE DS */
int version; /* rrd version */
char *endptr; /* used in the conversion */
+ rrd_file_t* rrd_file;
rpnstack_init(&rpnstack);
rrd_set_error("Not enough arguments");
return -1;
}
-
-
- if(rrd_open(filename,&rrd_file,&rrd, RRD_READWRITE)==-1){
+ rrd_file = rrd_open(filename,&rrd, RRD_READWRITE);
+ if (rrd_file == NULL) {
return -1;
}
+
/* initialize time */
version = atoi(rrd.stat_head->version);
gettimeofday(&tmp_time, 0);
current_time_usec = 0;
}
- rra_current = rra_start = rra_begin = ftell(rrd_file);
+ rra_current = rra_start = rra_begin = rrd_file->header_len;
/* This is defined in the ANSI C standard, section 7.9.5.3:
When a file is opened with udpate mode ('+' as the second
or third character in the ... list of mode argument
- variables), both input and ouptut may be performed on the
+ variables), both input and output may be performed on the
associated stream. However, ... input may not be directly
followed by output without an intervening call to a file
- positioning function, unless the input oepration encounters
+ positioning function, unless the input operation encounters
end-of-file. */
- fseek(rrd_file, 0, SEEK_CUR);
+#if 0//def HAVE_MMAP
+rrd_filesize = rrd_file->file_size;
+ fseek(rrd_file->fd, 0, SEEK_END);
+ rrd_filesize = ftell(rrd_file->fd);
+ fseek(rrd_file->fd, rra_current, SEEK_SET);
+#else
+// fseek(rrd_file->fd, 0, SEEK_CUR);
+#endif
/* get exclusive lock to whole file.
* lock gets removed when we close the file.
*/
- if (LockRRD(rrd_file) != 0) {
+ if (LockRRD(rrd_file->fd) != 0) {
rrd_set_error("could not lock RRD");
rrd_free(&rrd);
- fclose(rrd_file);
+ close(rrd_file->fd);
return(-1);
}
if((updvals = malloc( sizeof(char*) * (rrd.stat_head->ds_cnt+1)))==NULL){
rrd_set_error("allocating updvals pointer array");
rrd_free(&rrd);
- fclose(rrd_file);
+ close(rrd_file->fd);
return(-1);
}
rrd_set_error("allocating pdp_temp ...");
free(updvals);
rrd_free(&rrd);
- fclose(rrd_file);
+ close(rrd_file->fd);
return(-1);
}
free(pdp_temp);
free(updvals);
rrd_free(&rrd);
- fclose(rrd_file);
+ close(rrd_file->fd);
return(-1);
}
- /* initialize template redirector */
+ /* initialize tmplt redirector */
/* default config example (assume DS 1 is a CDEF DS)
tmpl_idx[0] -> 0; (time)
tmpl_idx[1] -> 1; (DS 0)
}
tmpl_cnt= ii;
- if (template) {
+ if (tmplt) {
+ /* we should work on a writeable copy here */
char *dsname;
unsigned int tmpl_len;
- dsname = template;
+ char *tmplt_copy = strdup(tmplt);
+ dsname = tmplt_copy;
tmpl_cnt = 1; /* the first entry is the time */
- tmpl_len = strlen(template);
+ tmpl_len = strlen(tmplt_copy);
for(i=0;i<=tmpl_len ;i++) {
- if (template[i] == ':' || template[i] == '\0') {
- template[i] = '\0';
+ if (tmplt_copy[i] == ':' || tmplt_copy[i] == '\0') {
+ tmplt_copy[i] = '\0';
if (tmpl_cnt>rrd.stat_head->ds_cnt){
- rrd_set_error("Template contains more DS definitions than RRD");
+ rrd_set_error("tmplt contains more DS definitions than RRD");
free(updvals); free(pdp_temp);
free(tmpl_idx); rrd_free(&rrd);
- fclose(rrd_file); return(-1);
+ close(rrd_file->fd); return(-1);
}
if ((tmpl_idx[tmpl_cnt++] = ds_match(&rrd,dsname)) == -1){
rrd_set_error("unknown DS name '%s'",dsname);
free(updvals); free(pdp_temp);
+ free(tmplt_copy);
free(tmpl_idx); rrd_free(&rrd);
- fclose(rrd_file); return(-1);
+ close(rrd_file->fd); return(-1);
} else {
/* the first element is always the time */
tmpl_idx[tmpl_cnt-1]++;
- /* go to the next entry on the template */
- dsname = &template[i+1];
+ /* go to the next entry on the tmplt_copy */
+ dsname = &tmplt_copy[i+1];
/* fix the damage we did before */
if (i<tmpl_len) {
- template[i]=':';
+ tmplt_copy[i]=':';
}
}
}
}
+ free(tmplt_copy);
}
if ((pdp_new = malloc(sizeof(rrd_value_t)
*rrd.stat_head->ds_cnt))==NULL){
free(pdp_temp);
free(tmpl_idx);
rrd_free(&rrd);
- fclose(rrd_file);
+ close(rrd_file->fd);
return(-1);
}
+#if 0//def HAVE_MMAP
+ rrd_mmaped_file = mmap(0,
+ rrd_file->file_len,
+ PROT_READ | PROT_WRITE,
+ MAP_SHARED,
+ fileno(in_file),
+ 0);
+ if (rrd_mmaped_file == MAP_FAILED) {
+ rrd_set_error("error mmapping file %s", filename);
+ free(updvals);
+ free(pdp_temp);
+ free(tmpl_idx);
+ rrd_free(&rrd);
+ close(rrd_file->fd);
+ return(-1);
+ }
+#ifdef USE_MADVISE
+ /* when we use mmaping we tell the kernel the mmap equivalent
+ of POSIX_FADV_RANDOM */
+ madvise(rrd_mmaped_file,rrd_filesize,POSIX_MADV_RANDOM);
+#endif
+#endif
/* loop through the arguments. */
for(arg_i=0; arg_i<argc;arg_i++) {
- char *stepper = malloc((strlen(argv[arg_i])+1)*sizeof(char));
+ char *stepper = strdup(argv[arg_i]);
char *step_start = stepper;
char *p;
char *parsetime_error = NULL;
struct rrd_time_value ds_tv;
if (stepper == NULL){
rrd_set_error("failed duplication argv entry");
+ free(step_start);
free(updvals);
free(pdp_temp);
free(tmpl_idx);
rrd_free(&rrd);
- fclose(rrd_file);
+#ifdef HAVE_MMAP
+ rrd_close(rrd_file);
+#endif
+ close(rrd_file->fd);
return(-1);
}
/* initialize all ds input to unknown except the first one
which has always got to be set */
for(ii=1;ii<=rrd.stat_head->ds_cnt;ii++) updvals[ii] = "U";
- strcpy(stepper,argv[arg_i]);
updvals[0]=stepper;
/* separate all ds elements; first must be examined separately
due to alternate time syntax */
*p = '\0';
stepper = p+1;
} else {
- rrd_set_error("expected timestamp not found in data source from %s:...",
+ rrd_set_error("expected timestamp not found in data source from %s",
argv[arg_i]);
free(step_start);
break;
}
if (ii != tmpl_cnt-1) {
- rrd_set_error("expected %lu data source readings (got %lu) from %s:...",
+ rrd_set_error("expected %lu data source readings (got %lu) from %s",
tmpl_cnt-1, ii, argv[arg_i]);
free(step_start);
break;
double tmp;
tmp = strtod(updvals[0], 0);
current_time = floor(tmp);
- current_time_usec = (long)((tmp - current_time) * 1000000L);
+ current_time_usec = (long)((tmp-(double)current_time) * 1000000.0);
}
/* dont do any correction for old version RRDs */
if(version < 3)
current_time_usec = 0;
- if(current_time <= rrd.live_head->last_up){
+ if(current_time < rrd.live_head->last_up ||
+ (current_time == rrd.live_head->last_up &&
+ (long)current_time_usec <= (long)rrd.live_head->last_up_usec)) {
rrd_set_error("illegal attempt to update using time %ld when "
"last update time is %ld (minimum one second step)",
current_time, rrd.live_head->last_up);
/* seek to the beginning of the rra's */
if (rra_current != rra_begin) {
- if(fseek(rrd_file, rra_begin, SEEK_SET) != 0) {
+#ifndef HAVE_MMAP
+ if(rrd_seek(rrd_file, rra_begin, SEEK_SET) != 0) {
rrd_set_error("seek error in rrd");
free(step_start);
break;
}
+#endif
rra_current = rra_begin;
}
rra_start = rra_begin;
/* when did the last pdp_st occur */
occu_pdp_age = current_time % rrd.stat_head->pdp_step;
occu_pdp_st = current_time - occu_pdp_age;
+
/* interval = current_time - rrd.live_head->last_up; */
- interval = current_time + ((double)current_time_usec - (double)rrd.live_head->last_up_usec)/1000000.0 - rrd.live_head->last_up;
-
+ interval = (double)(current_time - rrd.live_head->last_up)
+ + (double)((long)current_time_usec - (long)rrd.live_head->last_up_usec)/1000000.0;
+
if (occu_pdp_st > proc_pdp_st){
/* OK we passed the pdp_st moment*/
- pre_int = occu_pdp_st - rrd.live_head->last_up; /* how much of the input data
+ pre_int = (long)occu_pdp_st - rrd.live_head->last_up; /* how much of the input data
* occurred before the latest
* pdp_st moment*/
pre_int -= ((double)rrd.live_head->last_up_usec)/1000000.0; /* adjust usecs */
for(i=0;i<rrd.stat_head->ds_cnt;i++){
enum dst_en dst_idx;
dst_idx= dst_conv(rrd.ds_def[i].dst);
- /* NOTE: DST_CDEF should never enter this if block, because
- * updvals[i+1][0] is initialized to 'U'; unless the caller
- * accidently specified a value for the DST_CDEF. To handle
- * this case, an extra check is required. */
+
+ /* make sure we do not build diffs with old last_ds values */
+ if(rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt < interval) {
+ strncpy(rrd.pdp_prep[i].last_ds,"U",LAST_DS_LEN-1);
+ rrd.pdp_prep[i].last_ds[LAST_DS_LEN-1]='\0';
+ }
+
+ /* NOTE: DST_CDEF should never enter this if block, because
+ * updvals[i+1][0] is initialized to 'U'; unless the caller
+ * accidently specified a value for the DST_CDEF. To handle
+ * this case, an extra check is required. */
+
if((updvals[i+1][0] != 'U') &&
(dst_idx != DST_CDEF) &&
rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt >= interval) {
double rate = DNAN;
- /* the data source type defines how to process the data */
+ /* the data source type defines how to process the data */
/* pdp_new contains rate * time ... eg the bytes
* transferred during the interval. Doing it this way saves
* a lot of math operations */
case DST_DERIVE:
if(rrd.pdp_prep[i].last_ds[0] != 'U'){
for(ii=0;updvals[i+1][ii] != '\0';ii++){
- if(updvals[i+1][ii] < '0' || updvals[i+1][ii] > '9' || (ii==0 && updvals[i+1][ii] == '-')){
+ if((updvals[i+1][ii] < '0' || updvals[i+1][ii] > '9') && (ii != 0 && updvals[i+1][ii] != '-')){
rrd_set_error("not a simple integer: '%s'",updvals[i+1]);
break;
}
}
pdp_new[i]= rrd_diff(updvals[i+1],rrd.pdp_prep[i].last_ds);
if(dst_idx == DST_COUNTER) {
- /* simple overflow catcher sugestet by andres kroonmaa */
+ /* simple overflow catcher suggested by Andres Kroonmaa */
/* this will fail terribly for non 32 or 64 bit counters ... */
/* are there any others in SNMP land ? */
if (pdp_new[i] < (double)0.0 )
/* no news is news all the same */
pdp_new[i] = DNAN;
}
+
/* make a copy of the command line argument for the next run */
#ifdef DEBUG
rrd.pdp_prep[i].last_ds,
updvals[i+1], pdp_new[i]);
#endif
- if(dst_idx == DST_COUNTER || dst_idx == DST_DERIVE){
- strncpy(rrd.pdp_prep[i].last_ds,
- updvals[i+1],LAST_DS_LEN-1);
- rrd.pdp_prep[i].last_ds[LAST_DS_LEN-1]='\0';
- }
+ strncpy(rrd.pdp_prep[i].last_ds, updvals[i+1],LAST_DS_LEN-1);
+ rrd.pdp_prep[i].last_ds[LAST_DS_LEN-1]='\0';
}
/* break out of the argument parsing loop if the error_string is set */
if (rrd_test_error()){
/* no we have not passed a pdp_st moment. therefore update is simple */
for(i=0;i<rrd.stat_head->ds_cnt;i++){
- if(isnan(pdp_new[i]))
- rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt += interval;
- else
- rrd.pdp_prep[i].scratch[PDP_val].u_val+= pdp_new[i];
+ if(isnan(pdp_new[i])) {
+ /* this is not realy accurate if we use subsecond data arival time
+ should have thought of it when going subsecond resolution ...
+ sorry next format change we will have it! */
+ rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt += floor(interval);
+ } else {
+ if (isnan( rrd.pdp_prep[i].scratch[PDP_val].u_val )){
+ rrd.pdp_prep[i].scratch[PDP_val].u_val= pdp_new[i];
+ } else {
+ rrd.pdp_prep[i].scratch[PDP_val].u_val+= pdp_new[i];
+ }
+ }
#ifdef DEBUG
fprintf(stderr,
"NO PDP ds[%lu]\t"
pdp_temp[] will contain the rate for cdp */
for(i=0;i<rrd.stat_head->ds_cnt;i++){
- /* update pdp_prep to the current pdp_st */
+ /* update pdp_prep to the current pdp_st. */
+ double pre_unknown = 0.0;
if(isnan(pdp_new[i]))
- rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt += pre_int;
- else
- rrd.pdp_prep[i].scratch[PDP_val].u_val +=
- pdp_new[i]/(double)interval*(double)pre_int;
+ /* a final bit of unkonwn to be added bevore calculation
+ * we use a tempaorary variable for this so that we
+ * don't have to turn integer lines before using the value */
+ pre_unknown = pre_int;
+ else {
+ if (isnan( rrd.pdp_prep[i].scratch[PDP_val].u_val )){
+ rrd.pdp_prep[i].scratch[PDP_val].u_val= pdp_new[i]/interval*pre_int;
+ } else {
+ rrd.pdp_prep[i].scratch[PDP_val].u_val+= pdp_new[i]/interval*pre_int;
+ }
+ }
+
/* if too much of the pdp_prep is unknown we dump it */
- if ((rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt
- > rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt) ||
+ if (
+ /* removed because this does not agree with the definition
+ a heart beat can be unknown */
+ /* (rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt
+ > rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt) || */
+ /* if the interval is larger thatn mrhb we get NAN */
+ (interval > rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt) ||
(occu_pdp_st-proc_pdp_st <=
rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt)) {
pdp_temp[i] = DNAN;
} else {
pdp_temp[i] = rrd.pdp_prep[i].scratch[PDP_val].u_val
- / (double)( occu_pdp_st
- - proc_pdp_st
- - rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt);
+ / ((double)(occu_pdp_st - proc_pdp_st
+ - rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt)
+ -pre_unknown);
}
/* process CDEF data sources; remember each CDEF DS can
/* make pdp_prep ready for the next run */
if(isnan(pdp_new[i])){
- rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt = post_int;
- rrd.pdp_prep[i].scratch[PDP_val].u_val = 0.0;
+ /* this is not realy accurate if we use subsecond data arival time
+ should have thought of it when going subsecond resolution ...
+ sorry next format change we will have it! */
+ rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt = floor(post_int);
+ rrd.pdp_prep[i].scratch[PDP_val].u_val = DNAN;
} else {
rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt = 0;
rrd.pdp_prep[i].scratch[PDP_val].u_val =
- pdp_new[i]/(double)interval*(double)post_int;
+ pdp_new[i]/interval*post_int;
}
#ifdef DEBUG
}
}
- rra_current = ftell(rrd_file);
+ rra_current = rrd_tell(rrd_file);
} /* if cf is DEVSEASONAL or SEASONAL */
if (rrd_test_error()) break;
lookup_seasonal(&rrd,i,rra_start,rrd_file,
elapsed_pdp_st + (scratch_idx == CDP_primary_val ? 1 : 2),
&seasonal_coef);
- rra_current = ftell(rrd_file);
+ rra_current = rrd_tell(rrd_file);
}
if (rrd_test_error()) break;
/* loop over data soures within each RRA */
i < rrd.stat_head->rra_cnt;
rra_start += rrd.rra_def[i].row_cnt * rrd.stat_head -> ds_cnt * sizeof(rrd_value_t),
i++) {
- /* is there anything to write for this RRA? If not, continue. */
+ /* is th5Aere anything to write for this RRA? If not, continue. */
if (rra_step_cnt[i] == 0) continue;
/* write the first row */
#ifdef DEBUG
- fprintf(stderr," -- RRA Preseek %ld\n",ftell(rrd_file));
+ fprintf(stderr," -- RRA Preseek %ld\n",rrd_file->pos);
#endif
rrd.rra_ptr[i].cur_row++;
if (rrd.rra_ptr[i].cur_row >= rrd.rra_def[i].row_cnt)
rra_pos_tmp = rra_start +
(rrd.stat_head->ds_cnt)*(rrd.rra_ptr[i].cur_row)*sizeof(rrd_value_t);
if(rra_pos_tmp != rra_current) {
- if(fseek(rrd_file, rra_pos_tmp, SEEK_SET) != 0){
+#ifndef HAVE_MMAP
+ if(rrd_seek(rrd_file, rra_pos_tmp, SEEK_SET) != 0){
rrd_set_error("seek error in rrd");
break;
}
+#endif
rra_current = rra_pos_tmp;
}
#ifdef DEBUG
- fprintf(stderr," -- RRA Postseek %ld\n",ftell(rrd_file));
+ fprintf(stderr," -- RRA Postseek %ld\n",rrd_file->pos);
#endif
scratch_idx = CDP_primary_val;
if (pcdp_summary != NULL)
% (rrd.rra_def[i].pdp_cnt*rrd.stat_head->pdp_step))
- ((rra_step_cnt[i]-1)*rrd.rra_def[i].pdp_cnt*rrd.stat_head->pdp_step);
}
- pcdp_summary = write_RRA_row(&rrd, i, &rra_current, scratch_idx, rrd_file,
+#ifdef HAVE_MMAP
+ pcdp_summary = write_RRA_row(&rrd, i, &rra_current, scratch_idx, rrd_file->fd,
+ pcdp_summary, &rra_time, rrd_file->file_start);
+#else
+ pcdp_summary = write_RRA_row(&rrd, i, &rra_current, scratch_idx, rrd_file->fd,
pcdp_summary, &rra_time);
+#endif
if (rrd_test_error()) break;
/* write other rows of the bulk update, if any */
/* wrap */
rrd.rra_ptr[i].cur_row = 0;
/* seek back to beginning of current rra */
- if (fseek(rrd_file, rra_start, SEEK_SET) != 0)
+ if (rrd_seek(rrd_file, rra_start, SEEK_SET) != 0)
{
rrd_set_error("seek error in rrd");
break;
}
#ifdef DEBUG
- fprintf(stderr," -- Wraparound Postseek %ld\n",ftell(rrd_file));
+ fprintf(stderr," -- Wraparound Postseek %ld\n",rrd_file->pos);
#endif
rra_current = rra_start;
}
% (rrd.rra_def[i].pdp_cnt*rrd.stat_head->pdp_step))
- ((rra_step_cnt[i]-2)*rrd.rra_def[i].pdp_cnt*rrd.stat_head->pdp_step);
}
- pcdp_summary = write_RRA_row(&rrd, i, &rra_current, scratch_idx, rrd_file,
+#ifdef HAVE_MMAP
+ pcdp_summary = write_RRA_row(&rrd, i, &rra_current, scratch_idx, rrd_file->fd,
+ pcdp_summary, &rra_time, rrd_file->file_start);
+#else
+ pcdp_summary = write_RRA_row(&rrd, i, &rra_current, scratch_idx, rrd_file->fd,
pcdp_summary, &rra_time);
+#endif
}
if (rrd_test_error())
if (rra_step_cnt != NULL) free(rra_step_cnt);
rpnstack_free(&rpnstack);
+#ifdef HAVE_MMAP
+ if (munmap(rrd_file->file_start, rrd_file->file_len) == -1) {
+ rrd_set_error("error writing(unmapping) file: %s", filename);
+ }
+#endif
/* if we got here and if there is an error and if the file has not been
* written to, then close things up and return. */
if (rrd_test_error()) {
rrd_free(&rrd);
free(pdp_temp);
free(pdp_new);
- fclose(rrd_file);
+ close(rrd_file->fd);
return(-1);
}
/* aargh ... that was tough ... so many loops ... anyway, its done.
* we just need to write back the live header portion now*/
- if (fseek(rrd_file, (sizeof(stat_head_t)
+ if (rrd_seek(rrd_file, (sizeof(stat_head_t)
+ sizeof(ds_def_t)*rrd.stat_head->ds_cnt
+ sizeof(rra_def_t)*rrd.stat_head->rra_cnt),
SEEK_SET) != 0) {
rrd_free(&rrd);
free(pdp_temp);
free(pdp_new);
- fclose(rrd_file);
+ close(rrd_file->fd);
return(-1);
}
if(version >= 3) {
- if(fwrite( rrd.live_head,
- sizeof(live_head_t), 1, rrd_file) != 1){
- rrd_set_error("fwrite live_head to rrd");
+ if(rrd_write(rrd_file, rrd.live_head,
+ sizeof(live_head_t)*1) != sizeof(live_head_t)*1){
+ rrd_set_error("rrd_write live_head to rrd");
free(updvals);
rrd_free(&rrd);
free(tmpl_idx);
free(pdp_temp);
free(pdp_new);
- fclose(rrd_file);
+ close(rrd_file->fd);
return(-1);
}
}
else {
- if(fwrite( &rrd.live_head->last_up,
- sizeof(time_t), 1, rrd_file) != 1){
- rrd_set_error("fwrite live_head to rrd");
+ if(rrd_write(rrd_file, &rrd.live_head->last_up,
+ sizeof(time_t)*1) != sizeof(time_t)*1){
+ rrd_set_error("rrd_write live_head to rrd");
free(updvals);
rrd_free(&rrd);
free(tmpl_idx);
free(pdp_temp);
free(pdp_new);
- fclose(rrd_file);
+ close(rrd_file->fd);
return(-1);
}
}
- if(fwrite( rrd.pdp_prep,
- sizeof(pdp_prep_t),
- rrd.stat_head->ds_cnt, rrd_file) != rrd.stat_head->ds_cnt){
- rrd_set_error("ftwrite pdp_prep to rrd");
+ if(rrd_write(rrd_file, rrd.pdp_prep,
+ sizeof(pdp_prep_t)*rrd.stat_head->ds_cnt)
+ != (ssize_t)(sizeof(pdp_prep_t)*rrd.stat_head->ds_cnt)){
+ rrd_set_error("rrd_write pdp_prep to rrd");
free(updvals);
rrd_free(&rrd);
free(tmpl_idx);
free(pdp_temp);
free(pdp_new);
- fclose(rrd_file);
+ close(rrd_file->fd);
return(-1);
}
- if(fwrite( rrd.cdp_prep,
- sizeof(cdp_prep_t),
- rrd.stat_head->rra_cnt *rrd.stat_head->ds_cnt, rrd_file)
- != rrd.stat_head->rra_cnt *rrd.stat_head->ds_cnt){
+ if(rrd_write(rrd_file, rrd.cdp_prep,
+ sizeof(cdp_prep_t)*rrd.stat_head->rra_cnt *rrd.stat_head->ds_cnt)
+ != (ssize_t)(sizeof(cdp_prep_t)*rrd.stat_head->rra_cnt *rrd.stat_head->ds_cnt)){
- rrd_set_error("ftwrite cdp_prep to rrd");
+ rrd_set_error("rrd_write cdp_prep to rrd");
free(updvals);
free(tmpl_idx);
rrd_free(&rrd);
free(pdp_temp);
free(pdp_new);
- fclose(rrd_file);
+ close(rrd_file->fd);
return(-1);
}
- if(fwrite( rrd.rra_ptr,
- sizeof(rra_ptr_t),
- rrd.stat_head->rra_cnt,rrd_file) != rrd.stat_head->rra_cnt){
- rrd_set_error("fwrite rra_ptr to rrd");
+ if(rrd_write(rrd_file, rrd.rra_ptr,
+ sizeof(rra_ptr_t)* rrd.stat_head->rra_cnt)
+ != (ssize_t)(sizeof(rra_ptr_t)*rrd.stat_head->rra_cnt)){
+ rrd_set_error("rrd_write rra_ptr to rrd");
free(updvals);
free(tmpl_idx);
rrd_free(&rrd);
free(pdp_temp);
free(pdp_new);
- fclose(rrd_file);
+ close(rrd_file->fd);
return(-1);
}
+
+#ifdef HAVE_POSIX_FADVISExxx
- /* OK now close the files and free the memory */
- if(fclose(rrd_file) != 0){
- rrd_set_error("closing rrd");
- free(updvals);
- free(tmpl_idx);
- rrd_free(&rrd);
- free(pdp_temp);
- free(pdp_new);
- return(-1);
- }
+ /* with update we have write ops, so they will probably not be done by now, this means
+ the buffers will not get freed. But calling this for the whole file - header
+ will let the data off the hook as soon as it is written when if it is from a previous
+ update cycle. Calling fdsync to force things is much too hard here. */
+
+ if (0 != posix_fadvise(rrd_file->fd, rra_begin, 0, POSIX_FADV_DONTNEED)) {
+ rrd_set_error("setting POSIX_FADV_DONTNEED on '%s': %s",filename, rrd_strerror(errno));
+ close(rrd_file->fd);
+ return(-1);
+ }
+#endif
+ /*XXX: ? */rrd_flush(rrd_file);
/* calling the smoothing code here guarantees at most
* one smoothing operation per rrd_update call. Unfortunately,
* critical except during the burning cycles. */
if (schedule_smooth)
{
-#ifndef WIN32
- rrd_file = fopen(filename,"r+");
-#else
- rrd_file = fopen(filename,"rb+");
-#endif
+// in_file = fopen(filename,"rb+");
+
+
rra_start = rra_begin;
for (i = 0; i < rrd.stat_head -> rra_cnt; ++i)
{
rra_start += rrd.rra_def[i].row_cnt
*rrd.stat_head->ds_cnt*sizeof(rrd_value_t);
}
- fclose(rrd_file);
+#ifdef HAVE_POSIX_FADVISExxx
+ /* same procedure as above ... */
+ if (0 != posix_fadvise(rrd_file->fd, rra_begin, 0, POSIX_FADV_DONTNEED)) {
+ rrd_set_error("setting POSIX_FADV_DONTNEED on '%s': %s",filename, rrd_strerror(errno));
+ close(rrd_file->fd);
+ return(-1);
+ }
+#endif
+ close(rrd_file->fd);
}
+
+ /* OK now close the files and free the memory */
+ if(close(rrd_file->fd) != 0){
+ rrd_set_error("closing rrd");
+ free(updvals);
+ free(tmpl_idx);
+ rrd_free(&rrd);
+ free(pdp_temp);
+ free(pdp_new);
+ return(-1);
+ }
+
rrd_free(&rrd);
free(updvals);
free(tmpl_idx);
* returns 0 on success
*/
int
-LockRRD(FILE *rrdfile)
+LockRRD(int in_file)
{
- int rrd_fd; /* File descriptor for RRD */
- int stat;
-
- rrd_fd = fileno(rrdfile);
+ int rcstat;
{
-#ifndef WIN32
- struct flock lock;
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+ struct _stat st;
+
+ if ( _fstat( in_file, &st ) == 0 ) {
+ rcstat = _locking ( in_file, _LK_NBLCK, st.st_size );
+ } else {
+ rcstat = -1;
+ }
+#else
+ struct flock lock;
lock.l_type = F_WRLCK; /* exclusive write lock */
lock.l_len = 0; /* whole file */
lock.l_start = 0; /* start of file */
lock.l_whence = SEEK_SET; /* end of file */
- stat = fcntl(rrd_fd, F_SETLK, &lock);
-#else
- struct _stat st;
-
- if ( _fstat( rrd_fd, &st ) == 0 ) {
- stat = _locking ( rrd_fd, _LK_NBLCK, st.st_size );
- } else {
- stat = -1;
- }
+ rcstat = fcntl(in_file, F_SETLK, &lock);
#endif
}
- return(stat);
+ return(rcstat);
}
+#ifdef HAVE_MMAP
+info_t
+*write_RRA_row (rrd_t *rrd, unsigned long rra_idx, unsigned long *rra_current,
+ unsigned short CDP_scratch_idx,
+#ifndef DEBUG
+int UNUSED(in_file),
+#else
+int in_file,
+#endif
+ info_t *pcdp_summary, time_t *rra_time, void *rrd_mmaped_file)
+#else
info_t
*write_RRA_row (rrd_t *rrd, unsigned long rra_idx, unsigned long *rra_current,
- unsigned short CDP_scratch_idx, FILE *rrd_file,
+ unsigned short CDP_scratch_idx, int in_file,
info_t *pcdp_summary, time_t *rra_time)
+#endif
{
unsigned long ds_idx, cdp_idx;
infoval iv;
cdp_idx =rra_idx * (rrd -> stat_head->ds_cnt) + ds_idx;
#ifdef DEBUG
fprintf(stderr," -- RRA WRITE VALUE %e, at %ld CF:%s\n",
- rrd -> cdp_prep[cdp_idx].scratch[CDP_scratch_idx].u_val,ftell(rrd_file),
+ rrd -> cdp_prep[cdp_idx].scratch[CDP_scratch_idx].u_val,rrd_file->pos,
rrd -> rra_def[rra_idx].cf_nam);
#endif
if (pcdp_summary != NULL)
rrd->rra_def[rra_idx].pdp_cnt, rrd->ds_def[ds_idx].ds_nam),
RD_I_VAL, iv);
}
- if(fwrite(&(rrd -> cdp_prep[cdp_idx].scratch[CDP_scratch_idx].u_val),
- sizeof(rrd_value_t),1,rrd_file) != 1)
+#ifdef HAVE_MMAP
+ memcpy((char *)rrd_mmaped_file + *rra_current,
+ &(rrd -> cdp_prep[cdp_idx].scratch[CDP_scratch_idx].u_val),
+ sizeof(rrd_value_t));
+#else
+ if(rrd_write(rrd_file,&(rrd -> cdp_prep[cdp_idx].scratch[CDP_scratch_idx].u_val),
+ sizeof(rrd_value_t)*1) != sizeof(rrd_value_t)*1)
{
rrd_set_error("writing rrd");
return 0;
}
+#endif
*rra_current += sizeof(rrd_value_t);
}
return (pcdp_summary);
projects / rrdtool.git / blobdiff