/*****************************************************************************
- * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2002
+ * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2004
*****************************************************************************
* rrd_update.c RRD Update Function
*****************************************************************************
* $Id$
* $Log$
+ * Revision 1.17 2004/05/26 22:11:12 oetiker
+ * reduce compiler warnings. Many small fixes. -- Mike Slifcak <slif@bellsouth.net>
+ *
+ * Revision 1.16 2004/05/25 20:52:16 oetiker
+ * fix spelling and syntax, especially in messages that are printed -- Mike Slifcak
+ *
+ * Revision 1.15 2004/05/25 20:51:49 oetiker
+ * Update displayed copyright messages to be consistent. -- Mike Slifcak
+ *
+ * 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
*
#include "rrd_tool.h"
#include <sys/types.h>
#include <fcntl.h>
+#ifdef HAVE_MMAP
+ #include <sys/mman.h>
+#endif
#ifdef WIN32
#include <sys/locking.h>
/* Local prototypes */
int LockRRD(FILE *rrd_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,
+ 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,
info_t *pcdp_summary, time_t *rra_time);
+#endif
int rrd_update_r(char *filename, char *template, int argc, char **argv);
int _rrd_update(char *filename, char *template, int argc, char **argv,
info_t*);
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"
+ printf("RRDtool 1.1.x Copyright (C) 1997-2004 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"
rpnstack_t rpnstack; /* used for COMPUTE DS */
int version; /* rrd version */
char *endptr; /* used in the conversion */
+#ifdef HAVE_MMAP
+ void *rrd_mmaped_file;
+ unsigned long rrd_filesize;
+#endif
rpnstack_init(&rpnstack);
followed by output without an intervening call to a file
positioning function, unless the input oepration encounters
end-of-file. */
+#ifdef HAVE_MMAP
+ fseek(rrd_file, 0, SEEK_END);
+ rrd_filesize = ftell(rrd_file);
+ fseek(rrd_file, rra_current, SEEK_SET);
+#else
fseek(rrd_file, 0, SEEK_CUR);
+#endif
/* get exclusive lock to whole file.
return(-1);
}
+#ifdef HAVE_MMAP
+ rrd_mmaped_file = mmap(0,
+ rrd_filesize,
+ PROT_READ | PROT_WRITE,
+ MAP_SHARED,
+ fileno(rrd_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);
+ fclose(rrd_file);
+ return(-1);
+ }
+#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 *p;
char *parsetime_error = NULL;
enum {atstyle, normal} timesyntax;
- struct time_value ds_tv;
+ struct rrd_time_value ds_tv;
if (stepper == NULL){
rrd_set_error("failed duplication argv entry");
free(updvals);
free(pdp_temp);
free(tmpl_idx);
rrd_free(&rrd);
+#ifdef HAVE_MMAP
+ munmap(rrd_mmaped_file, rrd_filesize);
+#endif
fclose(rrd_file);
return(-1);
}
/* seek to the beginning of the rra's */
if (rra_current != rra_begin) {
+#ifndef HAVE_MMAP
if(fseek(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;
}
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 )
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) {
+#ifndef HAVE_MMAP
if(fseek(rrd_file, rra_pos_tmp, SEEK_SET) != 0){
rrd_set_error("seek error in rrd");
break;
}
+#endif
rra_current = rra_pos_tmp;
}
% (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);
}
+#ifdef HAVE_MMAP
+ pcdp_summary = write_RRA_row(&rrd, i, &rra_current, scratch_idx, rrd_file,
+ pcdp_summary, &rra_time, rrd_mmaped_file);
+#else
pcdp_summary = write_RRA_row(&rrd, i, &rra_current, scratch_idx, rrd_file,
pcdp_summary, &rra_time);
+#endif
if (rrd_test_error()) break;
/* write other rows of the bulk update, if any */
scratch_idx = CDP_secondary_val;
- for ( ; rra_step_cnt[i] > 1;
- rra_step_cnt[i]--, rrd.rra_ptr[i].cur_row++)
+ for ( ; rra_step_cnt[i] > 1; rra_step_cnt[i]--)
{
- if (rrd.rra_ptr[i].cur_row == rrd.rra_def[i].row_cnt)
+ if (++rrd.rra_ptr[i].cur_row == rrd.rra_def[i].row_cnt)
{
#ifdef DEBUG
fprintf(stderr,"Wraparound for RRA %s, %lu updates left\n",
% (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);
}
+#ifdef HAVE_MMAP
+ pcdp_summary = write_RRA_row(&rrd, i, &rra_current, scratch_idx, rrd_file,
+ pcdp_summary, &rra_time, rrd_mmaped_file);
+#else
pcdp_summary = write_RRA_row(&rrd, i, &rra_current, scratch_idx, rrd_file,
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_mmaped_file, rrd_filesize) == -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()) {
LockRRD(FILE *rrdfile)
{
int rrd_fd; /* File descriptor for RRD */
- int stat;
+ int rcstat;
rrd_fd = fileno(rrdfile);
{
#ifndef WIN32
- struct flock lock;
+ 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);
+ rcstat = fcntl(rrd_fd, F_SETLK, &lock);
#else
- struct _stat st;
+ struct _stat st;
- if ( _fstat( rrd_fd, &st ) == 0 ) {
- stat = _locking ( rrd_fd, _LK_NBLCK, st.st_size );
- } else {
- stat = -1;
- }
+ if ( _fstat( rrd_fd, &st ) == 0 ) {
+ rcstat = _locking ( rrd_fd, _LK_NBLCK, st.st_size );
+ } else {
+ rcstat = -1;
+ }
#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, FILE *rrd_file,
+ 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,
info_t *pcdp_summary, time_t *rra_time)
+#endif
{
unsigned long ds_idx, cdp_idx;
infoval iv;
rrd->rra_def[rra_idx].pdp_cnt, rrd->ds_def[ds_idx].ds_nam),
RD_I_VAL, iv);
}
+#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(fwrite(&(rrd -> cdp_prep[cdp_idx].scratch[CDP_scratch_idx].u_val),
sizeof(rrd_value_t),1,rrd_file) != 1)
{
rrd_set_error("writing rrd");
return 0;
}
+#endif
*rra_current += sizeof(rrd_value_t);
}
return (pcdp_summary);
projects / rrdtool.git / blobdiff