X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.c;h=7ef262ff563e551ad7f538e77eb6c5363598470a;hb=c5282fa77324d86f882cfda15f43b62d2b1f8bc2;hp=c4243557e6dd3d1816781b1c84d54b9131647b2d;hpb=c47bbeca17b665a5f60a1c328be0590a148ea5e8;p=rrdtool.git diff --git a/src/rrd_tool.c b/src/rrd_tool.c index c424355..7ef262f 100644 --- a/src/rrd_tool.c +++ b/src/rrd_tool.c @@ -22,11 +22,16 @@ void PrintUsage(char *cmd) { char help_main[] = - "RRDtool 1.1.x Copyright 1997-2001 by Tobias Oetiker \n\n" + "RRDtool 1.1.x Copyright 1997-2003 by Tobias Oetiker \n" +#ifndef WIN32 + " Compiled " MAKE_TIMESTAMP "\n\n" +#else + " Compiled " __DATE__ " " __TIME__ "\n\n" +#endif "Usage: rrdtool [options] command command_options\n\n"; char help_list[] = - "Valid commands: create, update, graph, dump, restore,\n" + "Valid commands: create, update, updatev, graph, dump, restore,\n" "\t\tlast, info, fetch, tune, resize, xport\n\n"; char help_listremote[] = @@ -63,6 +68,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 verion 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" @@ -153,7 +167,7 @@ void PrintUsage(char *cmd) enum { C_NONE, C_CREATE, C_DUMP, C_INFO, C_RESTORE, C_LAST, 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; @@ -171,6 +185,8 @@ void PrintUsage(char *cmd) help_cmd = C_LAST; 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")) @@ -217,6 +233,9 @@ void PrintUsage(char *cmd) case C_UPDATE: fputs(help_update, stdout); break; + case C_UPDATEV: + fputs(help_updatev, stdout); + break; case C_FETCH: fputs(help_fetch, stdout); break; @@ -360,6 +379,8 @@ int main(int argc, char *argv[]) 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) @@ -460,9 +481,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 +503,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,7 +523,7 @@ 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.1.x Copyright (C) 1997-2003 by Tobias Oetiker \n"); else if (strcmp("restore", argv[1]) == 0) rrd_restore(argc-1, &argv[1]); else if (strcmp("resize", argv[1]) == 0) @@ -505,7 +533,7 @@ int HandleInputLine(int argc, char **argv, FILE* out) 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; @@ -515,8 +543,8 @@ int HandleInputLine(int argc, char **argv, FILE* out) 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; @@ -580,12 +608,13 @@ int HandleInputLine(int argc, char **argv, FILE* out) const char *imgfile = argv[2]; /* rrd_graph changes argv pointer */ int xsize, ysize; int i; + int tostdout = (strcmp(argv[2],"-") == 0); if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize) != -1 ) { - if (strcmp(imgfile,"-") != 0) + 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]); }