X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.c;h=46a9e9c671bc2ec71e84ab798934a6b8fa3a4e5b;hb=ad994d046d175fec8f67cc3b7cddf3cb77d341be;hp=c4243557e6dd3d1816781b1c84d54b9131647b2d;hpb=c47bbeca17b665a5f60a1c328be0590a148ea5e8;p=rrdtool.git diff --git a/src/rrd_tool.c b/src/rrd_tool.c index c424355..46a9e9c 100644 --- a/src/rrd_tool.c +++ b/src/rrd_tool.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2002 + * RRDtool 1.2.0 Copyright by Tobi Oetiker, 1997-2005 ***************************************************************************** * rrd_tool.c Startup wrapper *****************************************************************************/ @@ -22,12 +22,17 @@ void PrintUsage(char *cmd) { char help_main[] = - "RRDtool 1.1.x Copyright 1997-2001 by Tobias Oetiker \n\n" + "RRDtool 1.2.0 Copyright 1997-2005 by Tobias Oetiker \n" +#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) + " Compiled " __DATE__ " " __TIME__ "\n\n" +#else + " Compiled " MAKE_TIMESTAMP "\n\n" +#endif "Usage: rrdtool [options] command command_options\n\n"; char help_list[] = - "Valid commands: create, update, graph, dump, restore,\n" - "\t\tlast, info, fetch, tune, resize, xport\n\n"; + "Valid commands: create, update, updatev, graph, dump, restore,\n" + "\t\tlast, first, info, fetch, tune, resize, xport\n\n"; char help_listremote[] = "Valid remote commands: quit, ls, cd, mkdir\n\n"; @@ -50,12 +55,16 @@ void PrintUsage(char *cmd) char help_restore[] = "* restore - restore an RRD file from its XML form\n\n" - "\trrdtool restore [--range-check|-r] filename.xml filename.rrd\n\n"; + "\trrdtool restore [--range-check|-r] [--force-overwrite|-f] filename.xml filename.rrd\n\n"; char help_last[] = "* last - show last update time for RRD\n\n" "\trrdtool last 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"; + char help_update[] = "* update - update an RRD\n\n" "\trrdtool update filename\n" @@ -63,6 +72,15 @@ void PrintUsage(char *cmd) "\t\ttime|N:value[:value...]\n\n" "\t\tat-time@value[:value...]\n\n" "\t\t[ time:value[:value...] ..]\n\n"; + + char help_updatev[] = + "* updatev - a verbose version of update\n" + "\treturns information about values, RRAs, and datasources updated\n\n" + "\trrdtool updatev filename\n" + "\t\t--template|-t ds-name:ds-name:...\n" + "\t\ttime|N:value[:value...]\n\n" + "\t\tat-time@value[:value...]\n\n" + "\t\t[ time:value[:value...] ..]\n\n"; char help_fetch[] = "* fetch - fetch data out of an RRD\n\n" @@ -70,7 +88,9 @@ void PrintUsage(char *cmd) "\t\t[--resolution|-r resolution]\n" "\t\t[--start|-s start] [--end|-e end]\n\n"; - char help_graph[] = +/* break up very large strings (help_graph, help_tune) for ISO C89 compliance*/ + + char help_graph1[] = "* graph - generate a graph from one or several RRD\n\n" "\trrdtool graph filename [-s|--start seconds] [-e|--end seconds]\n" "\t\t[-x|--x-grid x-axis grid and label]\n" @@ -81,26 +101,35 @@ void PrintUsage(char *cmd) "\t\t[-u|--upper-limit value] [-z|--lazy]\n" "\t\t[-l|--lower-limit value] [-r|--rigid]\n" "\t\t[-g|--no-legend]\n" + "\t\t[-F|--force-rules-legend]\n"; + char help_graph2[] = + "\t\t[-j|--only-graph]\n" "\t\t[--font FONTTAG:size:font]\n" "\t\t[--zoom factor]\n" "\t\t[--alt-autoscale]\n" "\t\t[--alt-autoscale-max]\n" - "\t\t[--units-exponent value]\n" + "\t\t[--no-gridfit]\n" + "\t\t[--units-exponent value]\n" + "\t\t[--units-length value]\n" "\t\t[--step seconds]\n" "\t\t[-f|--imginfo printfstr]\n" "\t\t[-a|--imgformat PNG]\n" - "\t\t[-c|--color COLORTAG#rrggbb[aa]] [-t|--title string]\n" + "\t\t[-c|--color COLORTAG#rrggbb[aa]] [-t|--title string]\n"; + char help_graph3[] = "\t\t[DEF:vname=rrd:ds-name:CF]\n" "\t\t[CDEF:vname=rpn-expression]\n" + "\t\t[VDEF:vdefname=rpn-expression]\n" "\t\t[PRINT:vname:CF:format]\n" "\t\t[GPRINT:vname:CF:format]\n" + "\t\t[PRINT:vdefname:format]\n" + "\t\t[GPRINT:vdefname:format]\n" "\t\t[HRULE:value#rrggbb[aa][:legend]]\n" "\t\t[VRULE:value#rrggbb[aa][:legend]]\n" - "\t\t[LINE{1|2|3}:vname[#rrggbb[aa][:legend]]]\n" - "\t\t[AREA:vname[#rrggbb[aa][:legend]]]\n" + "\t\t[LINE{1|2|3}:vname[#rrggbb[aa][:legend]][:STACK]]\n" + "\t\t[AREA:vname[#rrggbb[aa][:legend]][:STACK]]\n" "\t\t[STACK:vname[#rrggbb[aa][:legend]]]\n\n"; - char help_tune[] = + char help_tune1[] = " * tune - Modify some basic properties of an RRD\n\n" "\trrdtool tune filename\n" "\t\t[--heartbeat|-h ds-name:heartbeat]\n" @@ -110,14 +139,16 @@ void PrintUsage(char *cmd) "\t\t[--deltapos scale-value] [--deltaneg scale-value]\n" "\t\t[--failure-threshold integer]\n" "\t\t[--window-length integer]\n" - "\t\t[--alpha adaptation-parameter]\n" + "\t\t[--alpha adaptation-parameter]\n"; + char help_tune2[] = + " * tune - Modify some basic properties of an RRD\n\n" "\t\t[--beta adaptation-parameter]\n" "\t\t[--gamma adaptation-parameter]\n" "\t\t[--gamma-deviation adaptation-parameter]\n" "\t\t[--aberrant-reset ds-name]\n\n"; char help_resize[] = - " * resize - alter the lenght of one of the RRAs in an RRD\n\n" + " * resize - alter the length of one of the RRAs in an RRD\n\n" "\trrdtool resize filename rranum GROW|SHRINK rows\n\n"; char help_xport[] = @@ -130,7 +161,7 @@ void PrintUsage(char *cmd) "\t\t[XPORT:vname:legend]\n\n"; char help_quit[] = - " * quit - closeing a session in remote mode\n\n" + " * quit - closing a session in remote mode\n\n" "\trrdtool quit\n\n"; char help_ls[] = @@ -139,11 +170,11 @@ void PrintUsage(char *cmd) char help_cd[] = " * cd - changes the current directory\n\n" - "\trrdtool cd new direcotry\n\n"; + "\trrdtool cd new directory\n\n"; char help_mkdir[] = - " * mkdir - creates a new direcotry\n\n" - "\trrdtool mkdir newdirecotryname\n\n"; + " * mkdir - creates a new directory\n\n" + "\trrdtool mkdir newdirectoryname\n\n"; char help_lic[] = "RRDtool is distributed under the Terms of the GNU General\n" @@ -151,9 +182,9 @@ void PrintUsage(char *cmd) "For more information read the RRD manpages\n\n"; - enum { C_NONE, C_CREATE, C_DUMP, C_INFO, C_RESTORE, C_LAST, + 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_QUIT, C_LS, C_CD, C_MKDIR, C_UPDATEV }; int help_cmd = C_NONE; @@ -169,8 +200,12 @@ void PrintUsage(char *cmd) help_cmd = C_RESTORE; else if (!strcmp(cmd,"last")) help_cmd = C_LAST; + else if (!strcmp(cmd,"first")) + help_cmd = C_FIRST; else if (!strcmp(cmd,"update")) help_cmd = C_UPDATE; + else if (!strcmp(cmd,"updatev")) + help_cmd = C_UPDATEV; else if (!strcmp(cmd,"fetch")) help_cmd = C_FETCH; else if (!strcmp(cmd,"graph")) @@ -214,17 +249,26 @@ void PrintUsage(char *cmd) case C_LAST: fputs(help_last, stdout); break; + case C_FIRST: + fputs(help_first, stdout); + break; case C_UPDATE: fputs(help_update, stdout); break; + case C_UPDATEV: + fputs(help_updatev, stdout); + break; case C_FETCH: fputs(help_fetch, stdout); break; case C_GRAPH: - fputs(help_graph, stdout); + fputs(help_graph1, stdout); + fputs(help_graph2, stdout); + fputs(help_graph3, stdout); break; case C_TUNE: - fputs(help_tune, stdout); + fputs(help_tune1, stdout); + fputs(help_tune2, stdout); break; case C_RESIZE: fputs(help_resize, stdout); @@ -300,7 +344,7 @@ int main(int argc, char *argv[]) if (strcmp(firstdir,"")){ chdir(firstdir); if (errno!=0){ - fprintf(stderr,"ERROR: %s\n",strerror(errno)); + fprintf(stderr,"ERROR: %s\n",rrd_strerror(errno)); exit(errno); } } @@ -317,15 +361,15 @@ int main(int argc, char *argv[]) if ((myargv = (char **) malloc((argc+1) * sizeof(char *))) == NULL) { perror("malloc"); - return -1; + exit(1); } if ((argc=CreateArgs(argv[0], aLine, argc, myargv)) < 0) { fprintf(stderr, "ERROR: creating arguments\n"); - return -1; + exit(1); } if (HandleInputLine(argc, myargv, stdout)) - return -1; + exit(1); free(myargv); #if HAVE_GETRUSAGE @@ -355,11 +399,14 @@ int main(int argc, char *argv[]) PrintUsage(argv[2]); exit(0); } - else - HandleInputLine(argc, argv, stderr); + else { + exit(HandleInputLine(argc, argv, stderr)); + } return 0; } +/* HandleInputLine is NOT thread safe - due to readdir issues, + resolving them portably is not really simple. */ int HandleInputLine(int argc, char **argv, FILE* out) { #if defined(HAVE_OPENDIR) && defined (HAVE_READDIR) @@ -369,8 +416,6 @@ int HandleInputLine(int argc, char **argv, FILE* out) #if defined(HAVE_SYS_STAT_H) struct stat st; #endif - optind=0; /* reset gnu getopt */ - opterr=0; /* no error messages */ if (RemoteMode){ if (argc>1 && strcmp("quit", argv[1]) == 0){ @@ -388,14 +433,14 @@ int HandleInputLine(int argc, char **argv, FILE* out) } #if ! defined(HAVE_CHROOT) || ! defined(HAVE_GETUID) if (getuid()==0 && ! ChangeRoot){ - printf("ERROR: chdir security problem - rrdtool is runnig as " + printf("ERROR: chdir security problem - rrdtool is running as " "root an no chroot!\n"); return(0); } #endif chdir(argv[2]); if (errno!=0){ - printf("ERROR: %s\n",strerror(errno)); + printf("ERROR: %s\n",rrd_strerror(errno)); } return(0); } @@ -406,14 +451,14 @@ int HandleInputLine(int argc, char **argv, FILE* out) } #if ! defined(HAVE_CHROOT) || ! defined(HAVE_GETUID) if (getuid()==0 && ! ChangeRoot){ - printf("ERROR: mkdir security problem - rrdtool is runnig as " + printf("ERROR: mkdir security problem - rrdtool is running as " "root an no chroot!\n"); return(0); } #endif mkdir(argv[2],0777); if (errno!=0){ - printf("ERROR: %s\n",strerror(errno)); + printf("ERROR: %s\n",rrd_strerror(errno)); } return(0); } @@ -438,7 +483,7 @@ int HandleInputLine(int argc, char **argv, FILE* out) } } else{ - printf("ERROR: %s\n",strerror(errno)); + printf("ERROR: %s\n",rrd_strerror(errno)); return(errno); } return(0); @@ -460,9 +505,13 @@ int HandleInputLine(int argc, char **argv, FILE* out) rrd_create(argc-1, &argv[1]); else if (strcmp("dump", argv[1]) == 0) rrd_dump(argc-1, &argv[1]); - else if (strcmp("info", argv[1]) == 0){ + else if (strcmp("info", argv[1]) == 0 + || strcmp("updatev", argv[1]) == 0){ info_t *data,*save; - data=rrd_info(argc-1, &argv[1]); + if (strcmp("info",argv[1]) == 0) + data=rrd_info(argc-1, &argv[1]); + else + data=rrd_update_v(argc-1, &argv[1]); while (data) { save=data; printf ("%s = ", data->key); @@ -478,6 +527,9 @@ int HandleInputLine(int argc, char **argv, FILE* out) case RD_I_CNT: printf ("%lu", data->value.u_cnt); break; + case RD_I_INT: + printf ("%d", data->value.u_int); + break; case RD_I_STR: printf ("\"%s\"", data->value.u_str); free(data->value.u_str); @@ -495,17 +547,19 @@ int HandleInputLine(int argc, char **argv, FILE* out) strcmp("v", argv[1]) == 0 || strcmp("-v", argv[1]) == 0 || strcmp("-version", argv[1]) == 0 ) - printf("RRDtool 1.1.x Copyright (C) 1997-2001 by Tobias Oetiker \n"); + printf("RRDtool 1.2.0 Copyright by Tobi Oetiker, 1997-2005\n"); else if (strcmp("restore", argv[1]) == 0) rrd_restore(argc-1, &argv[1]); else if (strcmp("resize", 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) + printf("%ld\n",rrd_first(argc-1, &argv[1])); else if (strcmp("update", argv[1]) == 0) rrd_update(argc-1, &argv[1]); else if (strcmp("fetch", argv[1]) == 0) { - time_t start,end; + time_t start,end, ti; unsigned long step, ds_cnt,i,ii; rrd_value_t *data,*datai; char **ds_namv; @@ -513,10 +567,10 @@ int HandleInputLine(int argc, char **argv, FILE* out) datai=data; printf(" "); for (i = 0; i\n", LEGEND_TAG); printf(" \n", META_TAG); printf(" <%s>\n", DATA_TAG); - for (i = start+step; i <= end; i += step) { + for (ti = start+step; ti <= end; ti += step) { printf (" <%s>", DATA_ROW_TAG); - printf ("<%s>%lu", COL_TIME_TAG, i, COL_TIME_TAG); + printf ("<%s>%lu", COL_TIME_TAG, ti, COL_TIME_TAG); for (j = 0; j < col_cnt; j++) { rrd_value_t newval = DNAN; newval = *ptr; @@ -577,15 +631,19 @@ int HandleInputLine(int argc, char **argv, FILE* out) } else if (strcmp("graph", argv[1]) == 0) { char **calcpr; +#ifdef notused /*XXX*/ const char *imgfile = argv[2]; /* rrd_graph changes argv pointer */ +#endif int xsize, ysize; + double ymin,ymax; int i; - if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize) != -1 ) { - if (strcmp(imgfile,"-") != 0) + int tostdout = (strcmp(argv[2],"-") == 0); + if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize, NULL, &ymin, &ymax) != -1 ) { + if (!tostdout) printf ("%dx%d\n",xsize,ysize); if (calcpr) { for(i=0;calcpr[i];i++){ - if (strcmp(imgfile,"-") != 0) + if (!tostdout) printf("%s\n",calcpr[i]); free(calcpr[i]); } @@ -601,6 +659,7 @@ int HandleInputLine(int argc, char **argv, FILE* out) if (rrd_test_error()) { fprintf(out, "ERROR: %s\n",rrd_get_error()); rrd_clear_error(); + return 1; } return(0); }