X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.c;h=f1eb11618e18b5a4b98dc8b01ddcd0233d675692;hb=5fc7ff89bdbced9c593c566fea9840a269935dcd;hp=8bd4ded24e84251ad2f1b369b3fee363bc025d4a;hpb=02f15efd404a828391c966322986457805f386a6;p=rrdtool.git diff --git a/src/rrd_tool.c b/src/rrd_tool.c index 8bd4ded..f1eb116 100644 --- a/src/rrd_tool.c +++ b/src/rrd_tool.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.12 Copyright by Tobi Oetiker, 1997-2005 + * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007 ***************************************************************************** * rrd_tool.c Startup wrapper *****************************************************************************/ @@ -22,16 +22,17 @@ void PrintUsage(char *cmd) { char help_main[] = - "RRDtool " PACKAGE_VERSION " Copyright 1997-2006 by Tobias Oetiker \n" + "RRDtool " PACKAGE_VERSION " Copyright 1997-2007 by Tobias Oetiker \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\n\n"; + "Valid remote commands: quit, ls, cd, mkdir, pwd\n\n"; char help_create[] = @@ -57,6 +58,11 @@ void PrintUsage(char *cmd) "* 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"; @@ -159,6 +165,7 @@ void PrintUsage(char *cmd) "\trrdtool xport [-s|--start seconds] [-e|--end seconds]\n" "\t\t[-m|--maxrows rows]\n" "\t\t[--step seconds]\n" + "\t\t[--enumds]\n" "\t\t[DEF:vname=rrd:ds-name:CF]\n" "\t\t[CDEF:vname=rpn-expression]\n" "\t\t[XPORT:vname:legend]\n\n"; @@ -179,15 +186,20 @@ void PrintUsage(char *cmd) " * mkdir - creates a new directory\n\n" "\trrdtool mkdir newdirectoryname\n\n"; + char help_pwd[] = + " * pwd - returns the current working directory\n\n" + "\trrdtool pwd\n\n"; + char help_lic[] = "RRDtool is distributed under the Terms of the GNU General\n" "Public License Version 2. (www.gnu.org/copyleft/gpl.html)\n\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_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; @@ -203,6 +215,8 @@ void PrintUsage(char *cmd) 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")) @@ -227,6 +241,8 @@ void PrintUsage(char *cmd) help_cmd = C_CD; else if (!strcmp(cmd,"mkdir")) help_cmd = C_MKDIR; + else if (!strcmp(cmd,"pwd")) + help_cmd = C_PWD; } fputs(help_main, stdout); switch (help_cmd) @@ -252,6 +268,9 @@ void PrintUsage(char *cmd) case C_LAST: fputs(help_last, stdout); break; + case C_LASTUPDATE: + fputs(help_lastupdate, stdout); + break; case C_FIRST: fputs(help_first, stdout); break; @@ -291,6 +310,9 @@ void PrintUsage(char *cmd) case C_MKDIR: fputs(help_mkdir, stdout); break; + case C_PWD: + fputs(help_pwd, stdout); + break; } fputs(help_lic, stdout); } @@ -342,11 +364,8 @@ int main(int argc, char *argv[]) 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])){ @@ -404,7 +423,7 @@ int main(int argc, char *argv[]) #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, @@ -450,6 +469,11 @@ int HandleInputLine(int argc, char **argv, FILE* out) #if defined(HAVE_SYS_STAT_H) struct stat st; #endif + char* cwd; /* To hold current working dir on call to pwd */ + + /* Reset errno to 0 before we start. + */ + errno = 0; if (RemoteMode){ if (argc>1 && strcmp("quit", argv[1]) == 0){ @@ -479,6 +503,20 @@ int HandleInputLine(int argc, char **argv, FILE* out) } return(0); } + if (argc>1 && strcmp("pwd", argv[1]) == 0){ + if (argc>2){ + printf("ERROR: invalid parameter count for pwd\n"); + return(1); + } + cwd = getcwd(NULL, MAXPATH); + if(cwd == NULL) { + printf("ERROR: %s\n",rrd_strerror(errno)); + return(1); + } + printf("%s\n", cwd); + free(cwd); + return(0); + } if (argc>1 && strcmp("mkdir", argv[1]) == 0){ if (argc>3){ printf("ERROR: invalid parameter count for mkdir\n"); @@ -517,6 +555,7 @@ int HandleInputLine(int argc, char **argv, FILE* out) } } } + closedir(curdir); } else{ printf("ERROR: %s\n",rrd_strerror(errno)); @@ -577,7 +616,7 @@ int HandleInputLine(int argc, char **argv, FILE* out) } free(data); } - + else if (strcmp("--version", argv[1]) == 0 || strcmp("version", argv[1]) == 0 || strcmp("v", argv[1]) == 0 || @@ -591,7 +630,28 @@ int HandleInputLine(int argc, char **argv, FILE* out) 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\n\n", XML_ENCODING); @@ -651,11 +720,16 @@ int HandleInputLine(int argc, char **argv, FILE* out) printf ("<%s>%lu", COL_TIME_TAG, ti, COL_TIME_TAG); for (j = 0; j < col_cnt; j++) { rrd_value_t newval = DNAN; + if (enumds == 1) + snprintf(vtag,vtag_s,"%s%lu", COL_DATA_TAG, j); + else + snprintf(vtag,vtag_s,"%s",COL_DATA_TAG); + newval = *ptr; if(isnan(newval)){ - printf("<%s>NaN", COL_DATA_TAG, COL_DATA_TAG); + printf("<%s>NaN", vtag,vtag); } else { - printf("<%s>%0.10e", COL_DATA_TAG, newval, COL_DATA_TAG); + printf("<%s>%0.10e", vtag, newval, vtag); }; ptr++; } @@ -665,6 +739,7 @@ int HandleInputLine(int argc, char **argv, FILE* out) printf(" \n", DATA_TAG); printf("\n", ROOT_TAG); } + free(vtag); } else if (strcmp("graph", argv[1]) == 0) { char **calcpr;