#include <unistd.h>
#include <ruby.h>
-#include <rrd.h>
+#include "../../src/rrd_tool.h"
typedef struct string_arr_t {
int len;
rrd_clear_error();
}
+/* Simple Calls */
+
VALUE rrd_call(
RRDFUNC func,
VALUE args)
return rrd_call(rrd_dump, args);
}
+VALUE rb_rrd_resize(
+ VALUE self,
+ VALUE args)
+{
+ return rrd_call(rrd_resize, args);
+}
+
+VALUE rb_rrd_restore(
+ VALUE self,
+ VALUE args)
+{
+ return rrd_call(rrd_restore, args);
+}
+
+VALUE rb_rrd_tune(
+ VALUE self,
+ VALUE args)
+{
+ return rrd_call(rrd_tune, args);
+}
+
+VALUE rb_rrd_update(
+ VALUE self,
+ VALUE args)
+{
+ return rrd_call(rrd_update, args);
+}
+
+
+/* Calls Returning Data via the Info Interface */
+
+VALUE rb_rrd_infocall(
+ RRDFUNC func,
+ VALUE args)
+{
+ string_arr a;
+ rrd_info_t *p, *data;
+ VALUE result;
+
+ a = string_arr_new(args);
+ 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);
+
+ switch (data->type) {
+ case RD_I_VAL:
+ if (isnan(data->value.u_val)) {
+ rb_hash_aset(result, key, Qnil);
+ } else {
+ rb_hash_aset(result, key, rb_float_new(data->value.u_val));
+ }
+ break;
+ case RD_I_CNT:
+ rb_hash_aset(result, key, INT2FIX(data->value.u_cnt));
+ break;
+ case RD_I_STR:
+ rb_hash_aset(result, key, rb_str_new2(data->value.u_str));
+ break;
+ case RD_I_BLO:
+ rb_hash_aset(result, key,
+ rb_str_new(data->value.u_blo.ptr,
+ data->value.u_blo.size));
+ break;
+ }
+ data = data->next;
+ }
+ rrd_info_free(p);
+ return result;
+}
+
+VALUE rb_rrd_info(
+ VALUE self,
+ VALUE args)
+{
+ return rb_rrd_infocall(rrd_info, args);
+}
+
+VALUE rb_rrd_updatev(
+ VALUE self,
+ VALUE args)
+{
+ return rb_rrd_infocall(rrd_update_v, args);
+}
+
+VALUE rb_rrd_graphv(
+ VALUE self,
+ VALUE args)
+{
+ return rb_rrd_infocall(rrd_graph_v, args);
+}
+
+
+/* Other Calls */
+
VALUE rb_rrd_fetch(
VALUE self,
VALUE args)
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();
}
rb_ary_push(data, line);
}
- free(raw_data);
+ rrd_freemem(raw_data);
- result = rb_ary_new2(4);
- rb_ary_store(result, 0, INT2FIX(start));
- rb_ary_store(result, 1, INT2FIX(end));
+ result = rb_ary_new2(5);
+ rb_ary_store(result, 0, INT2NUM(start));
+ rb_ary_store(result, 1, INT2NUM(end));
rb_ary_store(result, 2, names);
- rb_ary_store(result, 2, data);
+ rb_ary_store(result, 3, data);
+ rb_ary_store(result, 4, INT2FIX(step));
return result;
}
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));
return result;
}
-/*
-VALUE rb_rrd_info(VALUE self, VALUE args)
-{
- string_arr a;
- info_t *p;
- VALUE result;
-
- a = string_arr_new(args);
- data = rrd_info(a.len, a.strings);
- string_arr_delete(a);
-
- RRD_CHECK_ERROR
-
- result = rb_hash_new();
- while (data) {
- VALUE key = rb_str_new2(data->key);
- switch (data->type) {
- case RD_I_VAL:
- if (isnan(data->u_val)) {
- rb_hash_aset(result, key, Qnil);
- }
- else {
- rb_hash_aset(result, key, rb_float_new(data->u_val));
- }
- break;
- case RD_I_CNT:
- rb_hash_aset(result, key, INT2FIX(data->u_cnt));
- break;
- case RD_I_STR:
- rb_hash_aset(result, key, rb_str_new2(data->u_str));
- free(data->u_str);
- break;
- }
- p = data;
- data = data->next;
- free(p);
- }
- return result;
-}
-*/
VALUE rb_rrd_last(
VALUE self,
return rb_funcall(rb_cTime, rb_intern("at"), 1, INT2FIX(last));
}
-VALUE rb_rrd_resize(
- VALUE self,
- VALUE args)
-{
- return rrd_call(rrd_resize, args);
-}
-
-VALUE rb_rrd_restore(
- VALUE self,
- VALUE args)
-{
- return rrd_call(rrd_restore, args);
-}
-
-VALUE rb_rrd_tune(
- VALUE self,
- VALUE args)
-{
- return rrd_call(rrd_tune, args);
-}
-
-VALUE rb_rrd_update(
- VALUE self,
- VALUE args)
-{
- return rrd_call(rrd_update, args);
-}
-
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, "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);
}