![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/program/src/rrd_tool.c b/program/src/rrd_tool.c
index f393f860d6f8749f69550b2e8df85c81f754cf4f..bcb1d07cb8751700d4db7b7a3ccb35cee60a3ca2 100644 (file)
--- a/program/src/rrd_tool.c
+++ b/program/src/rrd_tool.c
/*****************************************************************************
- * RRDtool 1.2.15 Copyright by Tobi Oetiker, 1997-2006
+ * RRDtool 1.2.28 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_tool.c Startup wrapper
*****************************************************************************/
{
char help_main[] =
- "RRDtool " PACKAGE_VERSION " Copyright 1997-2006 by Tobias Oetiker <tobi@oetiker.ch>\n"
+ "RRDtool " PACKAGE_VERSION " Copyright 1997-2008 by Tobias Oetiker <tobi@oetiker.ch>\n"
" Compiled " __DATE__ " " __TIME__ "\n\n"
"Usage: rrdtool [options] command command_options\n\n";
char help_list[] =
"Valid commands: create, update, updatev, graph, dump, restore,\n"
- "\t\tlast, first, info, fetch, tune, resize, xport\n\n";
+ "\t\tlast, lastupdate, first, info, fetch, tune,\n"
+ "\t\tresize, xport\n\n";
char help_listremote[] =
"Valid remote commands: quit, ls, cd, mkdir, pwd\n\n";
"* last - show last update time for RRD\n\n"
"\trrdtool last filename.rrd\n\n";
+ char help_lastupdate[] =
+ "* lastupdate - returns the most recent datum stored for\n"
+ " each DS in an RRD\n\n"
+ "\trrdtool lastupdate filename.rrd\n\n";
+
char help_first[] =
"* first - show first update time for RRA within an RRD\n\n"
"\trrdtool first filename.rrd [--rraindex number]\n\n";
"\t\t[-Y|--alt-y-grid]\n"
"\t\t[-y|--y-grid y-axis grid and label]\n"
"\t\t[-v|--vertical-label string] [-w|--width pixels]\n"
+ "\t\t[--right-axis scale:shift] [--right-axis-label label]\n"
"\t\t[-h|--height pixels] [-o|--logarithmic]\n"
"\t\t[-u|--upper-limit value] [-z|--lazy]\n"
"\t\t[-l|--lower-limit value] [-r|--rigid]\n"
"For more information read the RRD manpages\n\n";
- enum { C_NONE, C_CREATE, C_DUMP, C_INFO, C_RESTORE, C_LAST, C_FIRST,
- C_UPDATE, C_FETCH, C_GRAPH, C_TUNE, C_RESIZE, C_XPORT,
- C_QUIT, C_LS, C_CD, C_MKDIR, C_PWD, C_UPDATEV };
+ enum { C_NONE, C_CREATE, C_DUMP, C_INFO, C_RESTORE, C_LAST,
+ C_LASTUPDATE, C_FIRST, C_UPDATE, C_FETCH, C_GRAPH, C_TUNE,
+ C_RESIZE, C_XPORT, C_QUIT, C_LS, C_CD, C_MKDIR, C_PWD,
+ C_UPDATEV };
int help_cmd = C_NONE;
help_cmd = C_RESTORE;
else if (!strcmp(cmd,"last"))
help_cmd = C_LAST;
+ else if (!strcmp(cmd,"lastupdate"))
+ help_cmd = C_LASTUPDATE;
else if (!strcmp(cmd,"first"))
help_cmd = C_FIRST;
else if (!strcmp(cmd,"update"))
case C_LAST:
fputs(help_last, stdout);
break;
+ case C_LASTUPDATE:
+ fputs(help_lastupdate, stdout);
+ break;
case C_FIRST:
fputs(help_first, stdout);
break;
struct rusage myusage;
struct timeval starttime;
struct timeval currenttime;
- struct timezone tz;
- tz.tz_minuteswest =0;
- tz.tz_dsttime=0;
- gettimeofday(&starttime,&tz);
+ gettimeofday(&starttime, NULL);
#endif
RemoteMode=1;
if ((argc == 3) && strcmp("",argv[2])){
== 0 ){
#ifdef HAVE_CHROOT
- chroot(argv[2]);
- if (errno!=0){
+ if (chroot(argv[2]) != 0){
fprintf(stderr,"ERROR: can't change root to '%s' errno=%d\n",
argv[2],errno);
exit(errno);
}
}
if (strcmp(firstdir,"")){
- chdir(firstdir);
- if (errno!=0){
+ if (chdir(firstdir)!=0){
fprintf(stderr,"ERROR: %s\n",rrd_strerror(errno));
exit(errno);
}
#if HAVE_GETRUSAGE
getrusage(RUSAGE_SELF,&myusage);
- gettimeofday(¤ttime,&tz);
+ gettimeofday(¤ttime,NULL);
printf("OK u:%1.2f s:%1.2f r:%1.2f\n",
(double)myusage.ru_utime.tv_sec+
(double)myusage.ru_utime.tv_usec/1000000.0,
return(1);
}
#endif
- chdir(argv[2]);
- if (errno!=0){
+ if (chdir(argv[2]) != 0){
printf("ERROR: %s\n",rrd_strerror(errno));
return(1);
}
return(1);
}
#endif
- mkdir(argv[2],0777);
- if (errno!=0){
+ if (mkdir(argv[2],0777) != 0){
printf("ERROR: %s\n",rrd_strerror(errno));
return(1);
}
}
free(data);
}
-
+
else if (strcmp("--version", argv[1]) == 0 ||
strcmp("version", argv[1]) == 0 ||
strcmp("v", argv[1]) == 0 ||
rrd_resize(argc-1, &argv[1]);
else if (strcmp("last", argv[1]) == 0)
printf("%ld\n",rrd_last(argc-1, &argv[1]));
- else if (strcmp("first", argv[1]) == 0)
+ else if (strcmp("lastupdate", argv[1]) == 0) {
+ time_t last_update;
+ char **ds_namv;
+ char **last_ds;
+ unsigned long ds_cnt,
+ i;
+ if (rrd_lastupdate(argc-1, &argv[1], &last_update,
+ &ds_cnt, &ds_namv, &last_ds) == 0) {
+ for (i=0; i<ds_cnt; i++)
+ printf(" %s", ds_namv[i]);
+ printf("\n\n");
+ printf("%10lu:", last_update);
+ for (i=0; i<ds_cnt; i++) {
+ printf(" %s", last_ds[i]);
+ free(last_ds[i]);
+ free(ds_namv[i]);
+ }
+ printf("\n");
+ free(last_ds);
+ free(ds_namv);
+ }
+ } else if (strcmp("first", argv[1]) == 0)
printf("%ld\n",rrd_first(argc-1, &argv[1]));
else if (strcmp("update", argv[1]) == 0)
rrd_update(argc-1, &argv[1]);
char **legend_v;
int enumds = 0;
int i;
- char *vtag = NULL;
- vtag = malloc( strlen(COL_DATA_TAG)+10);
+ size_t vtag_s = strlen(COL_DATA_TAG) + 10;
+ char *vtag = malloc(vtag_s);
for ( i = 2; i < argc; i++){
if (strcmp("--enumds", argv[i]) == 0)
enumds = 1;
for (j = 0; j < col_cnt; j++) {
rrd_value_t newval = DNAN;
if (enumds == 1)
- snprintf(vtag,15,"%s%lu", COL_DATA_TAG, j);
+ snprintf(vtag,vtag_s,"%s%lu", COL_DATA_TAG, j);
else
- snprintf(vtag,15,"%s",COL_DATA_TAG);
+ snprintf(vtag,vtag_s,"%s",COL_DATA_TAG);
newval = *ptr;
if(isnan(newval)){