projects
/
lttv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-svn-id: http://ltt.polymtl.ca/svn@315 04897980-b3bd-0310-b5e0-8ef037075253
[lttv.git]
/
ltt
/
branches
/
poly
/
lttv
/
traceset.c
diff --git
a/ltt/branches/poly/lttv/traceset.c
b/ltt/branches/poly/lttv/traceset.c
index aee03471209c972293d191cad1fbc01a96d8206e..508afb16cbc875d95b7ddaa7d56374e49fca13d4 100644
(file)
--- a/
ltt/branches/poly/lttv/traceset.c
+++ b/
ltt/branches/poly/lttv/traceset.c
@@
-11,11
+11,17
@@
struct _LttvTraceset {
char * filename;
GPtrArray *traces;
struct _LttvTraceset {
char * filename;
GPtrArray *traces;
- GPtrArray *attributes;
LttvAttribute *a;
};
LttvAttribute *a;
};
+struct _LttvTrace {
+ LttTrace *t;
+ LttvAttribute *a;
+ guint ref_count;
+};
+
+
LttvTraceset *lttv_traceset_new()
{
LttvTraceset *s;
LttvTraceset *lttv_traceset_new()
{
LttvTraceset *s;
@@
-23,33
+29,42
@@
LttvTraceset *lttv_traceset_new()
s = g_new(LttvTraceset, 1);
s->filename = NULL;
s->traces = g_ptr_array_new();
s = g_new(LttvTraceset, 1);
s->filename = NULL;
s->traces = g_ptr_array_new();
- s->attributes = g_ptr_array_new();
s->a = g_object_new(LTTV_ATTRIBUTE_TYPE, NULL);
return s;
}
s->a = g_object_new(LTTV_ATTRIBUTE_TYPE, NULL);
return s;
}
+LttvTrace *lttv_trace_new(LttTrace *t)
+{
+ LttvTrace *new_trace;
+
+ new_trace = g_new(LttvTrace, 1);
+ new_trace->a = g_object_new(LTTV_ATTRIBUTE_TYPE, NULL);
+ new_trace->t = t;
+ new_trace->ref_count = 0;
+ return new_trace;
+}
+
+
LttvTraceset *lttv_traceset_copy(LttvTraceset *s_orig)
{
int i;
LttvTraceset *s;
LttvTraceset *lttv_traceset_copy(LttvTraceset *s_orig)
{
int i;
LttvTraceset *s;
+ LttvTrace * trace;
s = g_new(LttvTraceset, 1);
s->filename = NULL;
s->traces = g_ptr_array_new();
for(i=0;i<s_orig->traces->len;i++)
{
s = g_new(LttvTraceset, 1);
s->filename = NULL;
s->traces = g_ptr_array_new();
for(i=0;i<s_orig->traces->len;i++)
{
+ trace = g_ptr_array_index(s_orig->traces, i);
+ trace->ref_count++;
+
+ /*CHECK this used ltt_trace_copy while it may not be needed. Need to
+ define how traces and tracesets are shared */
g_ptr_array_add(
s->traces,
g_ptr_array_add(
s->traces,
-
ltt_trace_copy(g_ptr_array_index(s_orig->traces, i)
));
+
g_ptr_array_index(s_orig->traces, i
));
}
}
- s->attributes = g_ptr_array_new();
- for(i=0;i<s_orig->attributes->len;i++)
- {
- g_ptr_array_add(
- s->attributes,
- lttv_iattribute_deep_copy(g_ptr_array_index(s_orig->attributes, i)));
- }
-
s->a = LTTV_ATTRIBUTE(lttv_iattribute_deep_copy(LTTV_IATTRIBUTE(s_orig->a)));
return s;
}
s->a = LTTV_ATTRIBUTE(lttv_iattribute_deep_copy(LTTV_IATTRIBUTE(s_orig->a)));
return s;
}
@@
-80,23
+95,25
@@
gint lttv_traceset_save(LttvTraceset *s)
fclose(tf);
return 0;
}
fclose(tf);
return 0;
}
+
void lttv_traceset_destroy(LttvTraceset *s)
{
void lttv_traceset_destroy(LttvTraceset *s)
{
- int i, nb;
-
- for(i = 0 ; i < s->attributes->len ; i++) {
- g_object_unref((LttvAttribute *)s->attributes->pdata[i]);
- }
- g_ptr_array_free(s->attributes, TRUE);
g_ptr_array_free(s->traces, TRUE);
g_object_unref(s->a);
g_free(s);
}
g_ptr_array_free(s->traces, TRUE);
g_object_unref(s->a);
g_free(s);
}
-void lttv_trace
set_add(LttvTraceset *s, Ltt
Trace *t)
+void lttv_trace
_destroy(Lttv
Trace *t)
{
{
+ g_object_unref(t->a);
+ g_free(t);
+}
+
+
+void lttv_traceset_add(LttvTraceset *s, LttvTrace *t)
+{
+ t->ref_count++;
g_ptr_array_add(s->traces, t);
g_ptr_array_add(s->traces, t);
- g_ptr_array_add(s->attributes, g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
}
}
@@
-106,18
+123,20
@@
unsigned lttv_traceset_number(LttvTraceset *s)
}
}
-LttTrace *lttv_traceset_get(LttvTraceset *s, unsigned i)
+Ltt
v
Trace *lttv_traceset_get(LttvTraceset *s, unsigned i)
{
g_assert(s->traces->len > i);
{
g_assert(s->traces->len > i);
- return ((LttTrace *)s->traces->pdata[i]);
+ return ((Ltt
v
Trace *)s->traces->pdata[i]);
}
void lttv_traceset_remove(LttvTraceset *s, unsigned i)
{
}
void lttv_traceset_remove(LttvTraceset *s, unsigned i)
{
+ LttvTrace * t;
+ g_assert(s->traces->len > i);
+ t = (LttvTrace *)s->traces->pdata[i];
+ t->ref_count--;
g_ptr_array_remove_index(s->traces, i);
g_ptr_array_remove_index(s->traces, i);
- g_object_unref(s->attributes->pdata[i]);
- g_ptr_array_remove_index(s->attributes,i);
}
}
@@
-130,7
+149,18
@@
LttvAttribute *lttv_traceset_attribute(LttvTraceset *s)
}
}
-LttvAttribute *lttv_traceset_trace_attribute(LttvTraceset *s, unsigned i)
+LttvAttribute *lttv_trace_attribute(LttvTrace *t)
+{
+ return t->a;
+}
+
+
+LttTrace *lttv_trace(LttvTrace *t)
+{
+ return t->t;
+}
+
+guint lttv_trace_get_ref_number(LttvTrace * t)
{
{
- return
(LttvAttribute *)s->attributes->pdata[i]
;
+ return
t->ref_count
;
}
}
This page took
0.026004 seconds
and
4
git commands to generate.