X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.c;h=2d0e17888950813115d1ea7341e916c9e0185aff;hb=824c3410b92e9ad3596bbecce3b26166f727c5ed;hp=83f7f1ec09347a2ba778aece50bdee4c7a1ac54d;hpb=3d068765c6b6c8d096e0692f22e5b5e407948b54;p=rrdtool.git diff --git a/src/rrd_tool.c b/src/rrd_tool.c index 83f7f1e..2d0e178 100644 --- a/src/rrd_tool.c +++ b/src/rrd_tool.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.3rc2 Copyright by Tobi Oetiker, 1997-2008 + * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008 ***************************************************************************** * rrd_tool.c Startup wrapper *****************************************************************************/ @@ -47,7 +47,7 @@ void PrintUsage( const char *help_main = N_("RRDtool %s" - " Copyright 1997-2007 by Tobias Oetiker \n" + " Copyright 1997-2008 by Tobias Oetiker \n" " Compiled %s %s\n\n" "Usage: rrdtool [options] command command_options\n\n"); @@ -55,7 +55,7 @@ void PrintUsage( N_ ("Valid commands: create, update, updatev, graph, graphv, dump, restore,\n" "\t\tlast, lastupdate, first, info, fetch, tune,\n" - "\t\tresize, xport\n\n"); + "\t\tresize, xport, flush\n\n"); const char *help_listremote = N_("Valid remote commands: quit, ls, cd, mkdir, pwd\n\n"); @@ -95,7 +95,8 @@ void PrintUsage( const char *help_update = N_("* update - update an RRD\n\n" "\trrdtool update filename\n" - "\t\t--template|-t ds-name:ds-name:...\n" + "\t\t[--template|-t ds-name:ds-name:...]\n" + "\t\t[--daemon
]\n" "\t\ttime|N:value[:value...]\n\n" "\t\tat-time@value[:value...]\n\n" "\t\t[ time:value[:value...] ..]\n\n"); @@ -104,7 +105,7 @@ void PrintUsage( N_("* 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\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"); @@ -113,7 +114,13 @@ void PrintUsage( N_("* fetch - fetch data out of an RRD\n\n" "\trrdtool fetch filename.rrd CF\n" "\t\t[-r|--resolution resolution]\n" - "\t\t[-s|--start start] [-e|--end end]\n\n"); + "\t\t[-s|--start start] [-e|--end end]\n" + "\t\t[--daemon
]\n\n"); + + const char *help_flush = + N_("* flush - flush cached data out to an RRD file\n\n" + "\trrdtool flush filename.rrd\n" + "\t\t[--daemon
]\n\n"); /* break up very large strings (help_graph, help_tune) for ISO C89 compliance*/ @@ -132,7 +139,7 @@ void PrintUsage( "\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" - "\t\t[-g|--no-legend]\n" + "\t\t[-g|--no-legend] [--daemon
]\n" "\t\t[-F|--force-rules-legend]\n" "\t\t[-j|--only-graph]\n"); const char *help_graph2 = N_("\t\t[-n|--font FONTTAG:size:font]\n" @@ -141,6 +148,7 @@ void PrintUsage( "\t\t[-M|--alt-autoscale-max]\n" "\t\t[-R|--font-render-mode {normal,light,mono}]\n" "\t\t[-B|--font-smoothing-threshold size]\n" + "\t\t[-T|--tabwidth width]\n" "\t\t[-E|--slope-mode]\n" "\t\t[-N|--no-gridfit]\n" "\t\t[-X|--units-exponent value]\n" @@ -216,7 +224,7 @@ void PrintUsage( C_LASTUPDATE, C_FIRST, C_UPDATE, C_FETCH, C_GRAPH, C_GRAPHV, C_TUNE, C_RESIZE, C_XPORT, C_QUIT, C_LS, C_CD, C_MKDIR, C_PWD, - C_UPDATEV + C_UPDATEV, C_FLUSH }; int help_cmd = C_NONE; @@ -241,6 +249,8 @@ void PrintUsage( help_cmd = C_UPDATEV; else if (!strcmp(cmd, "fetch")) help_cmd = C_FETCH; + else if (!strcmp(cmd, "flush")) + help_cmd = C_FLUSH; else if (!strcmp(cmd, "graph")) help_cmd = C_GRAPH; else if (!strcmp(cmd, "graphv")) @@ -301,6 +311,9 @@ void PrintUsage( case C_FETCH: fputs(_(help_fetch), stdout); break; + case C_FLUSH: + fputs(_(help_flush), stdout); + break; case C_GRAPH: fputs(_(help_graph0), stdout); fputs(_(help_graph1), stdout); @@ -387,7 +400,8 @@ int main( #ifdef HAVE_LOCALE_H setlocale(LC_ALL, ""); #endif -#ifdef HAVE_LIBINTL_H + +#if defined(HAVE_LIBINTL_H) && defined(BUILD_LIBINTL) bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR); bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); textdomain(GETTEXT_PACKAGE); @@ -619,15 +633,15 @@ int HandleInputLine( else if (strcmp("dump", argv[1]) == 0) rrd_dump(argc - 1, &argv[1]); else if (strcmp("info", argv[1]) == 0 || strcmp("updatev", argv[1]) == 0) { - info_t *data; + rrd_info_t *data; if (strcmp("info", argv[1]) == 0) data = rrd_info(argc - 1, &argv[1]); else data = rrd_update_v(argc - 1, &argv[1]); - info_print(data); - info_free(data); + rrd_info_print(data); + rrd_info_free(data); } else if (strcmp("--version", argv[1]) == 0 || @@ -644,26 +658,7 @@ int HandleInputLine( else if (strcmp("last", argv[1]) == 0) printf("%ld\n", rrd_last(argc - 1, &argv[1])); 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); - } + rrd_lastupdate(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) @@ -802,15 +797,18 @@ int HandleInputLine( } } else if (strcmp("graphv", argv[1]) == 0) { - info_t *grinfo = NULL; /* 1 to distinguish it from the NULL that rrd_graph sends in */ + rrd_info_t *grinfo = NULL; /* 1 to distinguish it from the NULL that rrd_graph sends in */ + grinfo = rrd_graph_v(argc - 1, &argv[1]); if (grinfo) { - info_print(grinfo); - info_free(grinfo); + rrd_info_print(grinfo); + rrd_info_free(grinfo); } } else if (strcmp("tune", argv[1]) == 0) rrd_tune(argc - 1, &argv[1]); + else if (strcmp("flush", argv[1]) == 0) + rrd_cmd_flush(argc - 1, &argv[1]); else { rrd_set_error("unknown function '%s'", argv[1]); }