X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fattribute.c;h=4b6938d7da86c1e04ec077e1353e2d662e2b3c32;hb=606309a4411d7405f9d3ab0ce151cf9896f853a4;hp=648beee4858ececa4f483b87ac643731b68a2aef;hpb=b445142a71748192520cfd645b4963e23070a486;p=lttv.git diff --git a/ltt/branches/poly/lttv/attribute.c b/ltt/branches/poly/lttv/attribute.c index 648beee4..4b6938d7 100644 --- a/ltt/branches/poly/lttv/attribute.c +++ b/ltt/branches/poly/lttv/attribute.c @@ -9,7 +9,7 @@ typedef union _AttributeValue { unsigned long dv_ulong; float dv_float; double dv_double; - LttvTime dv_time; + LttTime dv_time; gpointer dv_pointer; char *dv_string; GObject *dv_gobject; @@ -274,7 +274,7 @@ void lttv_attribute_recursive_add(LttvAttribute *dest, LttvAttribute *src) *value.v_double += a->value.dv_double; break; case LTTV_TIME: - TimeAdd(*value.v_time, *value.v_time, a->value.dv_time); + *value.v_time = ltt_time_add(*value.v_time, a->value.dv_time); break; case LTTV_POINTER: break; @@ -335,6 +335,7 @@ static void attribute_finalize (LttvAttribute *self) { g_hash_table_destroy(self->names); + g_critical("attribute_finalize()"); g_array_free(self->attributes, TRUE); G_OBJECT_CLASS(g_type_class_peek_parent( g_type_class_peek(LTTV_ATTRIBUTE_TYPE)))->finalize(G_OBJECT(self));