diff options
Diffstat (limited to 'rrdtool')
| -rw-r--r-- | rrdtool/Makefile.in | 7 | ||||
| -rw-r--r-- | rrdtool/rrd_anomaly.c | 11 | ||||
| -rw-r--r-- | rrdtool/rrd_similarity.c | 27 |
3 files changed, 13 insertions, 32 deletions
diff --git a/rrdtool/Makefile.in b/rrdtool/Makefile.in index 55f0d6a10..f1768b788 100644 --- a/rrdtool/Makefile.in +++ b/rrdtool/Makefile.in @@ -1,7 +1,8 @@ CC=@CC@ INC=-I ../src/include -I/usr/local/include LIBDPI=../src/lib/libndpi.a -LDFLAGS=@LDFLAGS@ +CFLAGS+=@NDPI_CFLAGS@ +LDFLAGS+=@NDPI_LDFLAGS@ LIB=$(LIBDPI) -lm @ADDITIONAL_LIBS@ @LIBRRD@ @LIBS@ TOOLS=rrd_anomaly rrd_similarity @@ -9,10 +10,10 @@ TOOLS=rrd_anomaly rrd_similarity all: $(TOOLS) rrd_anomaly: rrd_anomaly.c Makefile $(LIBDPI) - $(CC) $(CPPFLAGS) -g $(INC) $(LDFLAGS) rrd_anomaly.c -o rrd_anomaly $(LIB) + $(CC) $(CFLAGS) $(CPPFLAGS) -g $(INC) $(LDFLAGS) rrd_anomaly.c -o rrd_anomaly $(LIB) rrd_similarity: rrd_similarity.c Makefile $(LIBDPI) - $(CC) $(CPPFLAGS) -g $(INC) $(LDFLAGS) rrd_similarity.c -o rrd_similarity $(LIB) + $(CC) $(CFLAGS) $(CPPFLAGS) -g $(INC) $(LDFLAGS) rrd_similarity.c -o rrd_similarity $(LIB) clean: /bin/rm -f *.o $(TOOLS) *~ diff --git a/rrdtool/rrd_anomaly.c b/rrdtool/rrd_anomaly.c index f50ba9147..8d5a02edb 100644 --- a/rrdtool/rrd_anomaly.c +++ b/rrdtool/rrd_anomaly.c @@ -54,11 +54,11 @@ int main(int argc, char *argv[]) { unsigned long step = 0, ds_cnt = 0; rrd_value_t *data, *p; char **names, *filename = NULL, *start_s, *end_s, *cf; - u_int i, j, t, first = 1, quick_mode = 0, verbose = 0; - time_t start, end; + u_int i, first = 1, quick_mode = 0, verbose = 0; + time_t t, start, end; struct ndpi_ses_struct ses; float alpha, ro; - char c; + int c; /* Defaults */ alpha = DEFAULT_ALPHA; @@ -138,8 +138,6 @@ int main(int argc, char *argv[]) { p = data; for(t=start+1, i=0; t<end; t+=step, i++) { - j = 0; /* Consider only the first DS */ - /* for(j=0; j<ds_cnt; j++) */ { rrd_value_t value = *p++; if(!isnan(value)) { @@ -156,7 +154,7 @@ int main(int argc, char *argv[]) { if(verbose || is_anomaly) { if(quick_mode) { - printf("%u\n", t); + printf("%ld\n", t); } else { const time_t _t = t; struct tm *t_info = localtime((const time_t*)&_t); @@ -175,7 +173,6 @@ int main(int argc, char *argv[]) { } } } - } } rrd_freemem(data); diff --git a/rrdtool/rrd_similarity.c b/rrdtool/rrd_similarity.c index f70dd332a..5b544a8d5 100644 --- a/rrdtool/rrd_similarity.c +++ b/rrdtool/rrd_similarity.c @@ -50,7 +50,7 @@ u_int verbose = 0, similarity_threshold = 100, skip_zero = 0; /* *************************************************** */ static void help() { - printf("Usage: rrd_similarity [-v][-a <alpha>][-e <end>][-q][-s <start>]\n" + printf("Usage: rrd_similarity [-v][-e <end>][-q][-s <start>]\n" " -f <filename> -d <basedir> [-t <threshold>]\n" "-a | Set alpha. Valid range >0 .. <1. Default %.2f\n" "-e <end> | RRD end time. Default %s\n" @@ -77,7 +77,8 @@ void analyze_rrd(rrd_file_stats *rrd, time_t start, time_t end) { unsigned long step = 0, ds_cnt = 0; rrd_value_t *data, *p; char **names; - u_int t, i, j, num_points; + time_t t; + u_int i, num_points; struct ndpi_analyze_struct *s; if(rrd_fetch_r(rrd->path, "AVERAGE", &start, &end, &step, &ds_cnt, &names, &data) != 0) { @@ -205,16 +206,13 @@ void find_rrds(char *basedir, char *filename, rrd_file_stats *rrds, u_int *num_r int main(int argc, char *argv[]) { rrd_time_value_t start_tv, end_tv; - char *filename = NULL, *start_s, *end_s, *dirname = NULL, *basedir = NULL; - u_int first = 1, quick_mode = 0; - float alpha; - char c; + char *filename = NULL, *start_s, *end_s, *basedir = NULL; + int c; time_t start, end; u_int num_rrds = 0, i; rrd_file_stats *rrds; /* Defaults */ - alpha = DEFAULT_ALPHA; start_s = DEFAULT_START; end_s = DEFAULT_END; @@ -235,25 +233,10 @@ int main(int argc, char *argv[]) { end_s = optarg; break; - case 'q': - quick_mode = 1; - break; - case 'v': verbose = 1; break; - case 'a': - { - float f = atof(optarg); - - if((f > 0) && (f < 1)) - alpha = f; - else - printf("Discarding -a: valid range is >0 .. <1\n"); - } - break; - case 'f': filename = optarg; break; |