X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=bindings%2Fruby%2Fmain.c;h=445eae3d2cc371e3b8ecae5486665b95f65b84ee;hp=353aa4def19a4ecab74577aec6e18f601d907bcc;hb=d89573ae72e7525a75ae558905598247d2091e8d;hpb=8d278938aef5adefa2915dd446abc028cc764550 diff --git a/bindings/ruby/main.c b/bindings/ruby/main.c index 353aa4d..445eae3 100644 --- a/bindings/ruby/main.c +++ b/bindings/ruby/main.c @@ -4,6 +4,7 @@ #include #include +#include #include "../../src/rrd_tool.h" typedef struct string_arr_t { @@ -19,6 +20,11 @@ typedef int ( int argc, char **argv); +typedef rrd_info_t *( + *RRDINFOFUNC) ( + int argc, + char **argv); + #define RRD_CHECK_ERROR \ if (rrd_test_error()) \ rb_raise(rb_eRRDError, rrd_get_error()); \ @@ -32,7 +38,7 @@ string_arr string_arr_new( int i; Check_Type(rb_strings, T_ARRAY); - a.len = RARRAY(rb_strings)->len + 1; + a.len = RARRAY_LEN(rb_strings) + 1; a.strings = malloc(a.len * sizeof(char *)); a.strings[0] = "dummy"; /* first element is a dummy element */ @@ -42,7 +48,7 @@ string_arr string_arr_new( switch (TYPE(v)) { case T_STRING: - a.strings[i + 1] = strdup(STR2CSTR(v)); + a.strings[i + 1] = strdup(StringValuePtr(v)); break; case T_FIXNUM: snprintf(buf, 63, "%d", FIX2INT(v)); @@ -138,11 +144,18 @@ VALUE rb_rrd_update( return rrd_call(rrd_update, args); } +VALUE rb_rrd_flushcached( + VALUE self, + VALUE args) +{ + return rrd_call(rrd_flushcached, args); +} + /* Calls Returning Data via the Info Interface */ VALUE rb_rrd_infocall( - RRDFUNC func, + RRDINFOFUNC func, VALUE args) { string_arr a; @@ -150,11 +163,13 @@ VALUE rb_rrd_infocall( VALUE result; a = string_arr_new(args); + reset_rrd_state(); data = func(a.len, a.strings); string_arr_delete(a); RRD_CHECK_ERROR result = rb_hash_new(); + p = data; while (data) { VALUE key = rb_str_new2(data->key); @@ -171,19 +186,19 @@ VALUE rb_rrd_infocall( break; case RD_I_STR: rb_hash_aset(result, key, rb_str_new2(data->value.u_str)); - free(data->value.u_str); + break; + case RD_I_INT: + rb_hash_aset(result, key, INT2FIX(data->value.u_int)); break; case RD_I_BLO: rb_hash_aset(result, key, - rb_str_new(data->value.u_blo.ptr, + rb_str_new((char *)data->value.u_blo.ptr, data->value.u_blo.size)); - free(data->value.u_blo.ptr); break; } - p = data; data = data->next; - free(p); } + rrd_info_free(p); return result; } @@ -191,21 +206,21 @@ VALUE rb_rrd_info( VALUE self, VALUE args) { - return rrd_infocall(rrd_info, args); + return rb_rrd_infocall(rrd_info, args); } VALUE rb_rrd_updatev( VALUE self, VALUE args) { - return rrd_infocall(rrd_update_v, args); + return rb_rrd_infocall(rrd_update_v, args); } VALUE rb_rrd_graphv( VALUE self, VALUE args) { - return rrd_infocall(rrd_graph_v, args); + return rb_rrd_infocall(rrd_graph_v, args); } @@ -232,9 +247,9 @@ VALUE rb_rrd_fetch( for (i = 0; i < ds_cnt; i++) { rb_ary_push(names, rb_str_new2(raw_names[i])); - free(raw_names[i]); + rrd_freemem(raw_names[i]); } - free(raw_names); + rrd_freemem(raw_names); k = 0; data = rb_ary_new(); @@ -247,7 +262,7 @@ VALUE rb_rrd_fetch( } rb_ary_push(data, line); } - free(raw_data); + rrd_freemem(raw_data); result = rb_ary_new2(5); rb_ary_store(result, 0, INT2NUM(start)); @@ -279,9 +294,9 @@ VALUE rb_rrd_graph( p = calcpr; for (p = calcpr; p && *p; p++) { rb_ary_push(print_results, rb_str_new2(*p)); - free(*p); + rrd_freemem(*p); } - free(calcpr); + rrd_freemem(calcpr); rb_ary_store(result, 0, print_results); rb_ary_store(result, 1, INT2FIX(xsize)); rb_ary_store(result, 2, INT2FIX(ysize)); @@ -302,7 +317,55 @@ VALUE rb_rrd_last( string_arr_delete(a); RRD_CHECK_ERROR - return rb_funcall(rb_cTime, rb_intern("at"), 1, INT2FIX(last)); + return rb_funcall(rb_cTime, rb_intern("at"), 1, UINT2NUM(last)); +} + +VALUE rb_rrd_xport( + VALUE self, + VALUE args) +{ + string_arr a; + unsigned long i, j, k, step, col_cnt; + int xxsize; + rrd_value_t *data; + char **legend_v; + VALUE legend, result, rdata; + time_t start, end; + + a = string_arr_new(args); + reset_rrd_state(); + rrd_xport(a.len, a.strings, &xxsize, &start, &end, &step, &col_cnt, &legend_v, &data); + string_arr_delete(a); + + RRD_CHECK_ERROR; + + legend = rb_ary_new(); + for (i = 0; i < col_cnt; i++) { + rb_ary_push(legend, rb_str_new2(legend_v[i])); + free(legend_v[i]); + } + free(legend_v); + + k = 0; + rdata = rb_ary_new(); + for (i = start; i <= end; i += step) { + VALUE line = rb_ary_new2(col_cnt); + for (j = 0; j < col_cnt; j++) { + rb_ary_store(line, j, rb_float_new(data[k])); + k++; + } + rb_ary_push(rdata, line); + } + free(data); + + result = rb_ary_new2(6); + rb_ary_store(result, 0, INT2FIX(start)); + rb_ary_store(result, 1, INT2FIX(end)); + rb_ary_store(result, 2, INT2FIX(step)); + rb_ary_store(result, 3, INT2FIX(col_cnt)); + rb_ary_store(result, 4, legend); + rb_ary_store(result, 5, rdata); + return result; } void Init_RRD( @@ -320,7 +383,9 @@ void Init_RRD( rb_define_module_function(mRRD, "restore", rb_rrd_restore, -2); rb_define_module_function(mRRD, "tune", rb_rrd_tune, -2); rb_define_module_function(mRRD, "update", rb_rrd_update, -2); + rb_define_module_function(mRRD, "flushcached", rb_rrd_flushcached, -2); rb_define_module_function(mRRD, "info", rb_rrd_info, -2); rb_define_module_function(mRRD, "updatev", rb_rrd_updatev, -2); rb_define_module_function(mRRD, "graphv", rb_rrd_graphv, -2); + rb_define_module_function(mRRD, "xport", rb_rrd_xport, -2); }