projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix use of setlocale all over the place ...
[rrdtool.git]
/
src
/
rrd_create.c
diff --git
a/src/rrd_create.c
b/src/rrd_create.c
index
f636961
..
c8996ce
100644
(file)
--- a/
src/rrd_create.c
+++ b/
src/rrd_create.c
@@
-1,9
+1,11
@@
/*****************************************************************************
/*****************************************************************************
- * RRDtool 1.
2.99907080300 Copyright by Tobi Oetiker, 1997-2007
+ * RRDtool 1.
4.3 Copyright by Tobi Oetiker, 1997-2010
*****************************************************************************
* rrd_create.c creates new rrds
*****************************************************************************/
*****************************************************************************
* rrd_create.c creates new rrds
*****************************************************************************/
+#include <stdlib.h>
+#include <time.h>
#include <locale.h>
#include "rrd_tool.h"
#include <locale.h>
#include "rrd_tool.h"
@@
-11,6
+13,11
@@
#include "rrd_hw.h"
#include "rrd_is_thread_safe.h"
#include "rrd_hw.h"
#include "rrd_is_thread_safe.h"
+static int opt_no_overwrite = 0;
+
+#ifdef WIN32
+# include <process.h>
+#endif
unsigned long FnvHash(
const char *str);
unsigned long FnvHash(
const char *str);
@@
-23,6
+30,9
@@
void parseGENERIC_DS(
rrd_t *rrd,
int ds_idx);
rrd_t *rrd,
int ds_idx);
+static void rrd_free2(
+ rrd_t *rrd); /* our onwn copy, immmune to mmap */
+
int rrd_create(
int argc,
char **argv)
int rrd_create(
int argc,
char **argv)
@@
-30,13
+40,14
@@
int rrd_create(
struct option long_options[] = {
{"start", required_argument, 0, 'b'},
{"step", required_argument, 0, 's'},
struct option long_options[] = {
{"start", required_argument, 0, 'b'},
{"step", required_argument, 0, 's'},
+ {"no-overwrite", no_argument, 0, 'O'},
{0, 0, 0, 0}
};
int option_index = 0;
int opt;
time_t last_up = time(NULL) - 10;
unsigned long pdp_step = 300;
{0, 0, 0, 0}
};
int option_index = 0;
int opt;
time_t last_up = time(NULL) - 10;
unsigned long pdp_step = 300;
-
struct rrd_time_value
last_up_tv;
+
rrd_time_value_t
last_up_tv;
char *parsetime_error = NULL;
long long_tmp;
int rc;
char *parsetime_error = NULL;
long long_tmp;
int rc;
@@
-45,14
+56,14
@@
int rrd_create(
opterr = 0; /* initialize getopt */
while (1) {
opterr = 0; /* initialize getopt */
while (1) {
- opt = getopt_long(argc, argv, "b:s:", long_options, &option_index);
+ opt = getopt_long(argc, argv, "
O
b:s:", long_options, &option_index);
if (opt == EOF)
break;
switch (opt) {
case 'b':
if (opt == EOF)
break;
switch (opt) {
case 'b':
- if ((parsetime_error = parsetime(optarg, &last_up_tv))) {
+ if ((parsetime_error =
rrd_
parsetime(optarg, &last_up_tv))) {
rrd_set_error("start time: %s", parsetime_error);
return (-1);
}
rrd_set_error("start time: %s", parsetime_error);
return (-1);
}
@@
-81,6
+92,10
@@
int rrd_create(
pdp_step = long_tmp;
break;
pdp_step = long_tmp;
break;
+ case 'O':
+ opt_no_overwrite = 1;
+ break;
+
case '?':
if (optopt != 0)
rrd_set_error("unknown option '%c'", optopt);
case '?':
if (optopt != 0)
rrd_set_error("unknown option '%c'", optopt);
@@
-119,16
+134,16
@@
int rrd_create_r(
/* init rrd clean */
rrd_init(&rrd);
/* static header */
/* init rrd clean */
rrd_init(&rrd);
/* static header */
- if ((rrd.stat_head = calloc(1, sizeof(stat_head_t))) == NULL) {
+ if ((rrd.stat_head =
(stat_head_t*)
calloc(1, sizeof(stat_head_t))) == NULL) {
rrd_set_error("allocating rrd.stat_head");
rrd_set_error("allocating rrd.stat_head");
- rrd_free(&rrd);
+ rrd_free
2
(&rrd);
return (-1);
}
/* live header */
return (-1);
}
/* live header */
- if ((rrd.live_head = calloc(1, sizeof(live_head_t))) == NULL) {
+ if ((rrd.live_head =
(live_head_t*)
calloc(1, sizeof(live_head_t))) == NULL) {
rrd_set_error("allocating rrd.live_head");
rrd_set_error("allocating rrd.live_head");
- rrd_free(&rrd);
+ rrd_free
2
(&rrd);
return (-1);
}
return (-1);
}
@@
-157,11
+172,11
@@
int rrd_create_r(
if (strncmp(argv[i], "DS:", 3) == 0) {
size_t old_size = sizeof(ds_def_t) * (rrd.stat_head->ds_cnt);
if (strncmp(argv[i], "DS:", 3) == 0) {
size_t old_size = sizeof(ds_def_t) * (rrd.stat_head->ds_cnt);
- if ((rrd.ds_def = rrd_realloc(rrd.ds_def,
+ if ((rrd.ds_def =
(ds_def_t*)
rrd_realloc(rrd.ds_def,
old_size + sizeof(ds_def_t))) ==
NULL) {
rrd_set_error("allocating rrd.ds_def");
old_size + sizeof(ds_def_t))) ==
NULL) {
rrd_set_error("allocating rrd.ds_def");
- rrd_free(&rrd);
+ rrd_free
2
(&rrd);
return (-1);
}
memset(&rrd.ds_def[rrd.stat_head->ds_cnt], 0, sizeof(ds_def_t));
return (-1);
}
memset(&rrd.ds_def[rrd.stat_head->ds_cnt], 0, sizeof(ds_def_t));
@@
-193,7
+208,7
@@
int rrd_create_r(
rrd_set_error("invalid DS format");
}
if (rrd_test_error()) {
rrd_set_error("invalid DS format");
}
if (rrd_test_error()) {
- rrd_free(&rrd);
+ rrd_free
2
(&rrd);
return -1;
}
return -1;
}
@@
-216,20
+231,21
@@
int rrd_create_r(
}
if (rrd_test_error()) {
}
if (rrd_test_error()) {
- rrd_free(&rrd);
+ rrd_free
2
(&rrd);
return -1;
}
rrd.stat_head->ds_cnt++;
} else if (strncmp(argv[i], "RRA:", 4) == 0) {
char *argvcopy;
return -1;
}
rrd.stat_head->ds_cnt++;
} else if (strncmp(argv[i], "RRA:", 4) == 0) {
char *argvcopy;
- char *tokptr;
+ char *tokptr
= ""
;
size_t old_size = sizeof(rra_def_t) * (rrd.stat_head->rra_cnt);
size_t old_size = sizeof(rra_def_t) * (rrd.stat_head->rra_cnt);
+ int row_cnt;
- if ((rrd.rra_def = rrd_realloc(rrd.rra_def,
+ if ((rrd.rra_def =
(rra_def_t*)
rrd_realloc(rrd.rra_def,
old_size + sizeof(rra_def_t))) ==
NULL) {
rrd_set_error("allocating rrd.rra_def");
old_size + sizeof(rra_def_t))) ==
NULL) {
rrd_set_error("allocating rrd.rra_def");
- rrd_free(&rrd);
+ rrd_free
2
(&rrd);
return (-1);
}
memset(&rrd.rra_def[rrd.stat_head->rra_cnt], 0,
return (-1);
}
memset(&rrd.rra_def[rrd.stat_head->rra_cnt], 0,
@@
-303,8
+319,10
@@
int rrd_create_r(
case CF_SEASONAL:
case CF_DEVPREDICT:
case CF_FAILURES:
case CF_SEASONAL:
case CF_DEVPREDICT:
case CF_FAILURES:
- rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt =
- atoi(token);
+ row_cnt = atoi(token);
+ if (row_cnt <= 0)
+ rrd_set_error("Invalid row count: %i", row_cnt);
+ rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt = row_cnt;
break;
default:
rrd.rra_def[rrd.stat_head->rra_cnt].
break;
default:
rrd.rra_def[rrd.stat_head->rra_cnt].
@@
-361,6
+379,8
@@
int rrd_create_r(
default:
rrd.rra_def[rrd.stat_head->rra_cnt].pdp_cnt =
atoi(token);
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;
break;
}
break;
@@
-407,8
+427,10
@@
int rrd_create_r(
("Unexpected extra argument for consolidation function DEVPREDICT");
break;
default:
("Unexpected extra argument for consolidation function DEVPREDICT");
break;
default:
- rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt =
- atoi(token);
+ row_cnt = atoi(token);
+ if (row_cnt <= 0)
+ rrd_set_error("Invalid row count: %i", row_cnt);
+ rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt = row_cnt;
break;
}
break;
break;
}
break;
@@
-480,7
+502,7
@@
int rrd_create_r(
if (rrd_test_error()) {
/* all errors are unrecoverable */
free(argvcopy);
if (rrd_test_error()) {
/* all errors are unrecoverable */
free(argvcopy);
- rrd_free(&rrd);
+ rrd_free
2
(&rrd);
return (-1);
}
token = strtok_r(NULL, ":", &tokptr);
return (-1);
}
token = strtok_r(NULL, ":", &tokptr);
@@
-507,14
+529,14
@@
int rrd_create_r(
if (create_hw_contingent_rras(&rrd, period, hashed_name) ==
-1) {
rrd_set_error("creating contingent RRA");
if (create_hw_contingent_rras(&rrd, period, hashed_name) ==
-1) {
rrd_set_error("creating contingent RRA");
- rrd_free(&rrd);
+ rrd_free
2
(&rrd);
return -1;
}
}
rrd.stat_head->rra_cnt++;
} else {
rrd_set_error("can't parse argument '%s'", argv[i]);
return -1;
}
}
rrd.stat_head->rra_cnt++;
} else {
rrd_set_error("can't parse argument '%s'", argv[i]);
- rrd_free(&rrd);
+ rrd_free
2
(&rrd);
return -1;
}
}
return -1;
}
}
@@
-522,13
+544,13
@@
int rrd_create_r(
if (rrd.stat_head->rra_cnt < 1) {
rrd_set_error("you must define at least one Round Robin Archive");
if (rrd.stat_head->rra_cnt < 1) {
rrd_set_error("you must define at least one Round Robin Archive");
- rrd_free(&rrd);
+ rrd_free
2
(&rrd);
return (-1);
}
if (rrd.stat_head->ds_cnt < 1) {
rrd_set_error("you must define at least one Data Source");
return (-1);
}
if (rrd.stat_head->ds_cnt < 1) {
rrd_set_error("you must define at least one Data Source");
- rrd_free(&rrd);
+ rrd_free
2
(&rrd);
return (-1);
}
return rrd_create_fn(filename, &rrd);
return (-1);
}
return rrd_create_fn(filename, &rrd);
@@
-549,7
+571,8
@@
void parseGENERIC_DS(
&(rrd -> ds_def[ds_idx].par[DS_mrhb_cnt].u_cnt),
minstr,maxstr);
*/
&(rrd -> ds_def[ds_idx].par[DS_mrhb_cnt].u_cnt),
minstr,maxstr);
*/
- old_locale = setlocale(LC_NUMERIC, "C");
+ old_locale = setlocale(LC_NUMERIC, NULL);
+ setlocale(LC_NUMERIC, "C");
if (sscanf(def, "%lu:%18[^:]:%18[^:]",
&(rrd->ds_def[ds_idx].par[DS_mrhb_cnt].u_cnt),
minstr, maxstr) == 3) {
if (sscanf(def, "%lu:%18[^:]:%18[^:]",
&(rrd->ds_def[ds_idx].par[DS_mrhb_cnt].u_cnt),
minstr, maxstr) == 3) {
@@
-594,9
+617,10
@@
int create_hw_contingent_rras(
(rrd->stat_head->rra_cnt)++;
/* allocate the memory for the 4 contingent RRAs */
old_size = sizeof(rra_def_t) * (rrd->stat_head->rra_cnt);
(rrd->stat_head->rra_cnt)++;
/* allocate the memory for the 4 contingent RRAs */
old_size = sizeof(rra_def_t) * (rrd->stat_head->rra_cnt);
- if ((rrd->rra_def = rrd_realloc(rrd->rra_def,
+ if ((rrd->rra_def =
(rra_def_t*)
rrd_realloc(rrd->rra_def,
old_size + 4 * sizeof(rra_def_t))) ==
NULL) {
old_size + 4 * sizeof(rra_def_t))) ==
NULL) {
+ rrd_free2(rrd);
rrd_set_error("allocating rrd.rra_def");
return (-1);
}
rrd_set_error("allocating rrd.rra_def");
return (-1);
}
@@
-656,48
+680,55
@@
int rrd_create_fn(
rrd_t *rrd)
{
unsigned long i, ii;
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;
rrd_value_t *unknown;
int unkn_cnt;
rrd_file_t *rrd_file_dn;
rrd_t rrd_dn;
+ unsigned rrd_flags = RRD_READWRITE | RRD_CREAT;
- if ((rrd_file =
- open(file_name, O_WRONLY | O_CREAT | O_TRUNC, 0666)) == NULL) {
+ if (opt_no_overwrite) {
+ rrd_flags |= RRD_EXCL ;
+ }
+
+ unkn_cnt = 0;
+ for (i = 0; i < rrd->stat_head->rra_cnt; i++)
+ unkn_cnt += rrd->stat_head->ds_cnt * rrd->rra_def[i].row_cnt;
+
+ if ((rrd_file_dn = rrd_open(file_name, rrd, rrd_flags)) == NULL) {
rrd_set_error("creating '%s': %s", file_name, rrd_strerror(errno));
rrd_set_error("creating '%s': %s", file_name, rrd_strerror(errno));
- rrd_free(rrd);
+ rrd_free
2
(rrd);
return (-1);
}
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);
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) {
+ if ((rrd->pdp_prep =
(pdp_prep_t*)
calloc(1, sizeof(pdp_prep_t))) == NULL) {
rrd_set_error("allocating pdp_prep");
rrd_set_error("allocating pdp_prep");
- rrd_free(rrd);
-
close(rrd_file
);
+ rrd_free
2
(rrd);
+
rrd_close(rrd_file_dn
);
return (-1);
}
return (-1);
}
- strcpy(rrd->pdp_prep->last_ds, "U
NKN
");
+ strcpy(rrd->pdp_prep->last_ds, "U");
rrd->pdp_prep->scratch[PDP_val].u_val = 0.0;
rrd->pdp_prep->scratch[PDP_unkn_sec_cnt].u_cnt =
rrd->live_head->last_up % rrd->stat_head->pdp_step;
for (i = 0; i < rrd->stat_head->ds_cnt; i++)
rrd->pdp_prep->scratch[PDP_val].u_val = 0.0;
rrd->pdp_prep->scratch[PDP_unkn_sec_cnt].u_cnt =
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) {
+ if ((rrd->cdp_prep =
(cdp_prep_t*)
calloc(1, sizeof(cdp_prep_t))) == NULL) {
rrd_set_error("allocating cdp_prep");
rrd_set_error("allocating cdp_prep");
- rrd_free(rrd);
-
close(rrd_file
);
+ rrd_free
2
(rrd);
+
rrd_close(rrd_file_dn
);
return (-1);
}
return (-1);
}
@@
-734,17
+765,17
@@
int rrd_create_fn(
}
for (ii = 0; ii < rrd->stat_head->ds_cnt; ii++) {
}
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));
}
}
/* now, we must make sure that the rest of the rrd
struct is properly initialized */
}
}
/* now, we must make sure that the rest of the rrd
struct is properly initialized */
- if ((rrd->rra_ptr = calloc(1, sizeof(rra_ptr_t))) == NULL) {
+ if ((rrd->rra_ptr =
(rra_ptr_t*)
calloc(1, sizeof(rra_ptr_t))) == NULL) {
rrd_set_error("allocating rra_ptr");
rrd_set_error("allocating rra_ptr");
- rrd_free(rrd);
-
close(rrd_file
);
+ rrd_free
2
(rrd);
+
rrd_close(rrd_file_dn
);
return (-1);
}
return (-1);
}
@@
-753,39
+784,57
@@
int rrd_create_fn(
* would occur for cur_row = 1 because rrd_update increments
* the pointer a priori. */
for (i = 0; i < rrd->stat_head->rra_cnt; i++) {
* 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 = rrd
->rra_def[i].row_cnt - 1
;
-
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");
}
/* write the empty data area */
if ((unknown = (rrd_value_t *) malloc(512 * sizeof(rrd_value_t))) == NULL) {
rrd_set_error("allocating unknown");
- rrd_free(rrd);
-
close(rrd_file
);
+ rrd_free
2
(rrd);
+
rrd_close(rrd_file_dn
);
return (-1);
}
for (i = 0; i < 512; ++i)
unknown[i] = DNAN;
return (-1);
}
for (i = 0; i < 512; ++i)
unknown[i] = DNAN;
- unkn_cnt = 0;
- for (i = 0; i < rrd->stat_head->rra_cnt; i++)
- unkn_cnt += rrd->stat_head->ds_cnt * rrd->rra_def[i].row_cnt;
-
while (unkn_cnt > 0) {
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);
unkn_cnt -= 512;
}
free(unknown);
- fdatasync(rrd_file);
- rrd_free(rrd);
- 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_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_close(rrd_file_dn);
+ rrd_init(&rrd_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);
}
return (0);
}
+
+
+static void rrd_free2(
+ rrd_t *rrd)
+{
+ 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);
+}
+