/*****************************************************************************
- * RRDtool 1.3rc9 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_create.c creates new rrds
*****************************************************************************/
const char *def,
rrd_t *rrd,
int ds_idx);
-long int rra_random_row(
- rra_def_t *);
+
+static void rrd_free2(
+ rrd_t *rrd); /* our onwn copy, immmune to mmap */
int rrd_create(
int argc,
/* static header */
if ((rrd.stat_head = calloc(1, sizeof(stat_head_t))) == NULL) {
rrd_set_error("allocating rrd.stat_head");
- free(rrd.stat_head);
+ rrd_free2(&rrd);
return (-1);
}
/* live header */
if ((rrd.live_head = calloc(1, sizeof(live_head_t))) == NULL) {
rrd_set_error("allocating rrd.live_head");
- free(rrd.stat_head);
- free(rrd.live_head);
+ rrd_free2(&rrd);
return (-1);
}
old_size + sizeof(ds_def_t))) ==
NULL) {
rrd_set_error("allocating rrd.ds_def");
- free(rrd.stat_head);
- free(rrd.live_head);
+ rrd_free2(&rrd);
return (-1);
}
memset(&rrd.ds_def[rrd.stat_head->ds_cnt], 0, sizeof(ds_def_t));
rrd_set_error("invalid DS format");
}
if (rrd_test_error()) {
- free(rrd.stat_head);
- free(rrd.live_head);
+ rrd_free2(&rrd);
return -1;
}
}
if (rrd_test_error()) {
- free(rrd.stat_head);
- free(rrd.live_head);
+ rrd_free2(&rrd);
return -1;
}
rrd.stat_head->ds_cnt++;
old_size + sizeof(rra_def_t))) ==
NULL) {
rrd_set_error("allocating rrd.rra_def");
- free(rrd.stat_head);
- free(rrd.live_head);
+ rrd_free2(&rrd);
return (-1);
}
memset(&rrd.rra_def[rrd.stat_head->rra_cnt], 0,
default:
rrd.rra_def[rrd.stat_head->rra_cnt].pdp_cnt =
atoi(token);
+ if (atoi(token) < 1)
+ rrd_set_error("Invalid step: must be >= 1");
break;
}
break;
if (rrd_test_error()) {
/* all errors are unrecoverable */
free(argvcopy);
- free(rrd.stat_head);
- free(rrd.live_head);
+ rrd_free2(&rrd);
return (-1);
}
token = strtok_r(NULL, ":", &tokptr);
if (create_hw_contingent_rras(&rrd, period, hashed_name) ==
-1) {
rrd_set_error("creating contingent RRA");
- free(rrd.stat_head);
- free(rrd.live_head);
+ rrd_free2(&rrd);
return -1;
}
}
rrd.stat_head->rra_cnt++;
} else {
rrd_set_error("can't parse argument '%s'", argv[i]);
- free(rrd.stat_head);
- free(rrd.live_head);
+ rrd_free2(&rrd);
return -1;
}
}
if (rrd.stat_head->rra_cnt < 1) {
rrd_set_error("you must define at least one Round Robin Archive");
- free(rrd.stat_head);
- free(rrd.live_head);
+ rrd_free2(&rrd);
return (-1);
}
if (rrd.stat_head->ds_cnt < 1) {
rrd_set_error("you must define at least one Data Source");
- free(rrd.stat_head);
- free(rrd.live_head);
+ rrd_free2(&rrd);
return (-1);
}
return rrd_create_fn(filename, &rrd);
if ((rrd->rra_def = rrd_realloc(rrd->rra_def,
old_size + 4 * sizeof(rra_def_t))) ==
NULL) {
+ rrd_free2(rrd);
rrd_set_error("allocating rrd.rra_def");
return (-1);
}
rrd_t *rrd)
{
unsigned long i, ii;
- int rrd_file;
rrd_value_t *unknown;
int unkn_cnt;
rrd_file_t *rrd_file_dn;
rrd_t rrd_dn;
- unsigned flags = O_WRONLY | O_CREAT | O_TRUNC;
-#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
- flags |= O_BINARY;
-#endif
+ unsigned rrd_flags = RRD_READWRITE | RRD_CREAT;
- if ((rrd_file = open(file_name, flags, 0666)) < 0) {
+ if ((rrd_file_dn = rrd_open(file_name, rrd, rrd_flags)) == NULL) {
rrd_set_error("creating '%s': %s", file_name, rrd_strerror(errno));
- free(rrd->stat_head);
- free(rrd->live_head);
+ rrd_free2(rrd);
return (-1);
}
- write(rrd_file, rrd->stat_head, sizeof(stat_head_t));
+ rrd_write(rrd_file_dn, rrd->stat_head, sizeof(stat_head_t));
- write(rrd_file, rrd->ds_def, sizeof(ds_def_t) * rrd->stat_head->ds_cnt);
+ rrd_write(rrd_file_dn, rrd->ds_def, sizeof(ds_def_t) * rrd->stat_head->ds_cnt);
- write(rrd_file, rrd->rra_def,
+ rrd_write(rrd_file_dn, rrd->rra_def,
sizeof(rra_def_t) * rrd->stat_head->rra_cnt);
- write(rrd_file, rrd->live_head, sizeof(live_head_t));
+ rrd_write(rrd_file_dn, rrd->live_head, sizeof(live_head_t));
if ((rrd->pdp_prep = calloc(1, sizeof(pdp_prep_t))) == NULL) {
rrd_set_error("allocating pdp_prep");
- free(rrd->stat_head);
- free(rrd->live_head);
- close(rrd_file);
+ rrd_free2(rrd);
+ rrd_close(rrd_file_dn);
return (-1);
}
rrd->live_head->last_up % rrd->stat_head->pdp_step;
for (i = 0; i < rrd->stat_head->ds_cnt; i++)
- write(rrd_file, rrd->pdp_prep, sizeof(pdp_prep_t));
+ rrd_write(rrd_file_dn, rrd->pdp_prep, sizeof(pdp_prep_t));
if ((rrd->cdp_prep = calloc(1, sizeof(cdp_prep_t))) == NULL) {
rrd_set_error("allocating cdp_prep");
- free(rrd->stat_head);
- free(rrd->live_head);
- close(rrd_file);
+ rrd_free2(rrd);
+ rrd_close(rrd_file_dn);
return (-1);
}
}
for (ii = 0; ii < rrd->stat_head->ds_cnt; ii++) {
- write(rrd_file, rrd->cdp_prep, sizeof(cdp_prep_t));
+ rrd_write(rrd_file_dn, rrd->cdp_prep, sizeof(cdp_prep_t));
}
}
if ((rrd->rra_ptr = calloc(1, sizeof(rra_ptr_t))) == NULL) {
rrd_set_error("allocating rra_ptr");
- free(rrd->stat_head);
- free(rrd->live_head);
- close(rrd_file);
+ rrd_free2(rrd);
+ rrd_close(rrd_file_dn);
return (-1);
}
* would occur for cur_row = 1 because rrd_update increments
* the pointer a priori. */
for (i = 0; i < rrd->stat_head->rra_cnt; i++) {
- rrd->rra_ptr->cur_row = rra_random_row(&rrd->rra_def[i]);
- write(rrd_file, rrd->rra_ptr, sizeof(rra_ptr_t));
+ rrd->rra_ptr->cur_row = rrd_select_initial_row(rrd_file_dn, i, &rrd->rra_def[i]);
+ rrd_write(rrd_file_dn, rrd->rra_ptr, sizeof(rra_ptr_t));
}
/* write the empty data area */
if ((unknown = (rrd_value_t *) malloc(512 * sizeof(rrd_value_t))) == NULL) {
rrd_set_error("allocating unknown");
- free(rrd->stat_head);
- free(rrd->live_head);
- close(rrd_file);
+ rrd_free2(rrd);
+ rrd_close(rrd_file_dn);
return (-1);
}
for (i = 0; i < 512; ++i)
unkn_cnt += rrd->stat_head->ds_cnt * rrd->rra_def[i].row_cnt;
while (unkn_cnt > 0) {
- write(rrd_file, unknown, sizeof(rrd_value_t) * min(unkn_cnt, 512));
+ if(rrd_write(rrd_file_dn, unknown, sizeof(rrd_value_t) * min(unkn_cnt, 512)) < 0)
+ {
+ rrd_set_error("creating rrd: %s", rrd_strerror(errno));
+ return -1;
+ }
unkn_cnt -= 512;
}
free(unknown);
- fdatasync(rrd_file);
- free(rrd->stat_head);
- free(rrd->live_head);
- if (close(rrd_file) == -1) {
+ rrd_free2(rrd);
+ if (rrd_close(rrd_file_dn) == -1) {
rrd_set_error("creating rrd: %s", rrd_strerror(errno));
return -1;
}
/* flush all we don't need out of the cache */
- rrd_file_dn = rrd_open(file_name, &rrd_dn, RRD_READONLY);
- rrd_dontneed(rrd_file_dn, &rrd_dn);
- rrd_free(&rrd_dn);
- rrd_close(rrd_file_dn);
+ if((rrd_file_dn = rrd_open(file_name, &rrd_dn, RRD_READONLY)) != NULL)
+ {
+ rrd_dontneed(rrd_file_dn, &rrd_dn);
+ /* rrd_free(&rrd_dn); */
+ rrd_close(rrd_file_dn);
+ }
return (0);
}
-static int rand_init = 0;
-long int rra_random_row(
- rra_def_t *rra)
+static void rrd_free2(
+ rrd_t *rrd)
{
- if (!rand_init) {
- srandom((unsigned int) time(NULL) + (unsigned int) getpid());
- rand_init++;
- }
-
- return random() % rra->row_cnt;
+ free(rrd->live_head);
+ free(rrd->stat_head);
+ free(rrd->ds_def);
+ free(rrd->rra_def);
+ free(rrd->rra_ptr);
+ free(rrd->pdp_prep);
+ free(rrd->cdp_prep);
+ free(rrd->rrd_value);
}
+
projects / rrdtool.git / blobdiff