diff --git a/src/rrd_info.c b/src/rrd_info.c
index 3b5364a392e4de587cc2ae6bdb4c838494cc8c47..2f6c07fff78c1806323807084d9e181e9afb337a 100644 (file)
--- a/src/rrd_info.c
+++ b/src/rrd_info.c
/*****************************************************************************
/*****************************************************************************
- * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.4.3 Copyright by Tobi Oetiker, 1997-2010
*****************************************************************************
* rrd_info Get Information about the configuration of an RRD
*****************************************************************************/
*****************************************************************************
* rrd_info Get Information about the configuration of an RRD
*****************************************************************************/
char *fmt,
...)
{
char *fmt,
...)
{
- int maxlen = 1024 + strlen(fmt);
char *str = NULL;
va_list argp;
char *str = NULL;
va_list argp;
- str = malloc(sizeof(char) * (maxlen + 1));
+#ifdef HAVE_VASPRINTF
+ va_start( argp, fmt );
+ if (vasprintf( &str, fmt, argp ) == -1){
+ va_end(argp);
+ rrd_set_error ("vasprintf failed.");
+ return(NULL);
+ }
+#else
+ int maxlen = 1024 + strlen(fmt);
+ str = (char*)malloc(sizeof(char) * (maxlen + 1));
if (str != NULL) {
va_start(argp, fmt);
#ifdef HAVE_VSNPRINTF
if (str != NULL) {
va_start(argp, fmt);
#ifdef HAVE_VSNPRINTF
vsprintf(str, fmt, argp);
#endif
}
vsprintf(str, fmt, argp);
#endif
}
+#endif /* HAVE_VASPRINTF */
va_end(argp);
return str;
}
va_end(argp);
return str;
}
{
rrd_info_t *next;
{
rrd_info_t *next;
- next = malloc(sizeof(*next));
+ next = (rrd_info_t*)malloc(sizeof(*next));
next->next = (rrd_info_t *) 0;
if (info)
info->next = next;
next->next = (rrd_info_t *) 0;
if (info)
info->next = next;
next->value.u_int = value.u_int;
break;
case RD_I_STR:
next->value.u_int = value.u_int;
break;
case RD_I_STR:
- next->value.u_str = malloc(sizeof(char) * (strlen(value.u_str) + 1));
+ next->value.u_str = (char*)malloc(sizeof(char) * (strlen(value.u_str) + 1));
strcpy(next->value.u_str, value.u_str);
break;
case RD_I_BLO:
next->value.u_blo.size = value.u_blo.size;
next->value.u_blo.ptr =
strcpy(next->value.u_str, value.u_str);
break;
case RD_I_BLO:
next->value.u_blo.size = value.u_blo.size;
next->value.u_blo.ptr =
- malloc(sizeof(unsigned char) * value.u_blo.size);
+ (unsigned char *)malloc(sizeof(unsigned char) * value.u_blo.size);
memcpy(next->value.u_blo.ptr, value.u_blo.ptr, value.u_blo.size);
break;
}
memcpy(next->value.u_blo.ptr, value.u_blo.ptr, value.u_blo.size);
break;
}
rrd_info_t *info;
char *opt_daemon = NULL;
int status;
rrd_info_t *info;
char *opt_daemon = NULL;
int status;
+ int flushfirst = 1;
optind = 0;
opterr = 0; /* initialize getopt */
optind = 0;
opterr = 0; /* initialize getopt */
int option_index = 0;
static struct option long_options[] = {
{"daemon", required_argument, 0, 'd'},
int option_index = 0;
static struct option long_options[] = {
{"daemon", required_argument, 0, 'd'},
+ {"noflush", no_argument, 0, 'F'},
{0, 0, 0, 0}
};
{0, 0, 0, 0}
};
- opt = getopt_long(argc, argv, "d:", long_options, &option_index);
+ opt = getopt_long(argc, argv, "d:F", long_options, &option_index);
if (opt == EOF)
break;
if (opt == EOF)
break;
}
break;
}
break;
+ case 'F':
+ flushfirst = 0;
+ break;
+
default:
default:
- rrd_set_error ("Usage: rrdtool %s [--daemon <addr>] <file>",
+ rrd_set_error ("Usage: rrdtool %s [--daemon <addr> [--noflush]] <file>",
argv[0]);
return (NULL);
break;
argv[0]);
return (NULL);
break;
} /* while (42) */
if ((argc - optind) != 1) {
} /* while (42) */
if ((argc - optind) != 1) {
- rrd_set_error ("Usage: rrdtool %s [--daemon <addr>] <file>",
+ rrd_set_error ("Usage: rrdtool %s [--daemon <addr> [--noflush]] <file>",
argv[0]);
return (NULL);
}
argv[0]);
return (NULL);
}
+ if( flushfirst ) {
status = rrdc_flush_if_daemon(opt_daemon, argv[optind]);
status = rrdc_flush_if_daemon(opt_daemon, argv[optind]);
- if (opt_daemon) free (opt_daemon);
if (status) return (NULL);
if (status) return (NULL);
+ }
+ rrdc_connect (opt_daemon);
+ if (rrdc_is_connected (opt_daemon))
+ info = rrdc_info (argv[optind]);
+ else
info = rrd_info_r(argv[optind]);
info = rrd_info_r(argv[optind]);
+ if (opt_daemon) free(opt_daemon);
return (info);
} /* rrd_info_t *rrd_info */
return (info);
} /* rrd_info_t *rrd_info */
info.u_cnt = rrd.live_head->last_up;
cd = rrd_info_push(cd, sprintf_alloc("last_update"), RD_I_CNT, info);
info.u_cnt = rrd.live_head->last_up;
cd = rrd_info_push(cd, sprintf_alloc("last_update"), RD_I_CNT, info);
+ info.u_cnt = rrd_get_header_size(&rrd);
+ cd = rrd_info_push(cd, sprintf_alloc("header_size"), RD_I_CNT, info);
+
for (i = 0; i < rrd.stat_head->ds_cnt; i++) {
for (i = 0; i < rrd.stat_head->ds_cnt; i++) {
+ info.u_cnt=i;
+ cd= rrd_info_push(cd,sprintf_alloc("ds[%s].index",
+ rrd.ds_def[i].ds_nam),
+ RD_I_CNT, info);
+
info.u_str = rrd.ds_def[i].dst;
cd = rrd_info_push(cd, sprintf_alloc("ds[%s].type",
rrd.ds_def[i].ds_nam),
info.u_str = rrd.ds_def[i].dst;
cd = rrd_info_push(cd, sprintf_alloc("ds[%s].type",
rrd.ds_def[i].ds_nam),