projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure that response_read() always calls fflush() or fclose().
[rrdtool.git]
/
src
/
rrd_create.c
diff --git
a/src/rrd_create.c
b/src/rrd_create.c
index
9a971cc
..
707e601
100644
(file)
--- a/
src/rrd_create.c
+++ b/
src/rrd_create.c
@@
-1,5
+1,5
@@
/*****************************************************************************
/*****************************************************************************
- * RRDtool 1.4.
2 Copyright by Tobi Oetiker, 1997-2009
+ * RRDtool 1.4.
3 Copyright by Tobi Oetiker, 1997-2010
*****************************************************************************
* rrd_create.c creates new rrds
*****************************************************************************/
*****************************************************************************
* rrd_create.c creates new rrds
*****************************************************************************/
@@
-11,8
+11,10
@@
#include "rrd_tool.h"
#include "rrd_rpncalc.h"
#include "rrd_hw.h"
#include "rrd_tool.h"
#include "rrd_rpncalc.h"
#include "rrd_hw.h"
+#include "rrd_client.h"
#include "rrd_is_thread_safe.h"
#include "rrd_is_thread_safe.h"
+static int opt_no_overwrite = 0;
#ifdef WIN32
# include <process.h>
#ifdef WIN32
# include <process.h>
@@
-32,6
+34,12
@@
void parseGENERIC_DS(
static void rrd_free2(
rrd_t *rrd); /* our onwn copy, immmune to mmap */
static void rrd_free2(
rrd_t *rrd); /* our onwn copy, immmune to mmap */
+void rrd_create_set_no_overwrite(
+ int opt )
+{
+ opt_no_overwrite = (opt?1:0);
+}
+
int rrd_create(
int argc,
char **argv)
int rrd_create(
int argc,
char **argv)
@@
-39,6
+47,8
@@
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'},
+ {"daemon", required_argument, 0, 'd'},
+ {"no-overwrite", no_argument, 0, 'O'},
{0, 0, 0, 0}
};
int option_index = 0;
{0, 0, 0, 0}
};
int option_index = 0;
@@
-49,17
+59,29
@@
int rrd_create(
char *parsetime_error = NULL;
long long_tmp;
int rc;
char *parsetime_error = NULL;
long long_tmp;
int rc;
+ char * opt_daemon = NULL;
optind = 0;
opterr = 0; /* initialize getopt */
while (1) {
optind = 0;
opterr = 0; /* initialize getopt */
while (1) {
- opt = getopt_long(argc, argv, "
b:s
:", long_options, &option_index);
+ opt = getopt_long(argc, argv, "
Ob:s:d
:", long_options, &option_index);
if (opt == EOF)
break;
switch (opt) {
if (opt == EOF)
break;
switch (opt) {
+ case 'd':
+ if (opt_daemon != NULL)
+ free (opt_daemon);
+ opt_daemon = strdup (optarg);
+ if (opt_daemon == NULL)
+ {
+ rrd_set_error ("strdup failed.");
+ return (-1);
+ }
+ break;
+
case 'b':
if ((parsetime_error = rrd_parsetime(optarg, &last_up_tv))) {
rrd_set_error("start time: %s", parsetime_error);
case 'b':
if ((parsetime_error = rrd_parsetime(optarg, &last_up_tv))) {
rrd_set_error("start time: %s", parsetime_error);
@@
-90,6
+112,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);
@@
-102,9
+128,17
@@
int rrd_create(
rrd_set_error("need name of an rrd file to create");
return -1;
}
rrd_set_error("need name of an rrd file to create");
return -1;
}
+
+ rrdc_connect (opt_daemon);
+ if (rrdc_is_connected (opt_daemon)) {
+ rc = rrdc_create (argv[optind],
+ pdp_step, last_up, opt_no_overwrite,
+ argc - optind - 1, (const char **) (argv + optind + 1));
+ } else {
rc = rrd_create_r(argv[optind],
pdp_step, last_up,
argc - optind - 1, (const char **) (argv + optind + 1));
rc = rrd_create_r(argv[optind],
pdp_step, last_up,
argc - optind - 1, (const char **) (argv + optind + 1));
+ }
return rc;
}
return rc;
}
@@
-125,6
+159,9
@@
int rrd_create_r(
unsigned short token_idx, error_flag, period = 0;
unsigned long hashed_name;
unsigned short token_idx, error_flag, period = 0;
unsigned long hashed_name;
+ /* clear any previous errors */
+ rrd_clear_error();
+
/* init rrd clean */
rrd_init(&rrd);
/* static header */
/* init rrd clean */
rrd_init(&rrd);
/* static header */
@@
-183,11
+220,11
@@
int rrd_create_r(
dummychar2, &offset)) {
case 0:
case 1:
dummychar2, &offset)) {
case 0:
case 1:
- rrd_set_error("Invalid DS name
"
);
+ rrd_set_error("Invalid DS name
in [%s]",&argv[i][3]
);
break;
case 2:
case 3:
break;
case 2:
case 3:
- rrd_set_error("Invalid DS type
"
);
+ rrd_set_error("Invalid DS type
in [%s]",&argv[i][3]
);
break;
case 4: /* (%n may or may not be counted) */
case 5: /* check for duplicate datasource names */
break;
case 4: /* (%n may or may not be counted) */
case 5: /* check for duplicate datasource names */
@@
-565,7
+602,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) {
@@
-679,6
+717,10
@@
int rrd_create_fn(
rrd_t rrd_dn;
unsigned rrd_flags = RRD_READWRITE | RRD_CREAT;
rrd_t rrd_dn;
unsigned rrd_flags = RRD_READWRITE | RRD_CREAT;
+ 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;
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;