forked from enlightenment/efl
efl: eina_cow: fix some valgrind instrumentation
SVN revision: 83308
This commit is contained in:
parent
ce199b41d1
commit
8d13c5ce3e
|
@ -373,6 +373,9 @@ eina_cow_write(Eina_Cow *cow,
|
||||||
|
|
||||||
ref = EINA_COW_PTR_GET(*data);
|
ref = EINA_COW_PTR_GET(*data);
|
||||||
|
|
||||||
|
#ifndef NVALGRIND
|
||||||
|
VALGRIND_MAKE_MEM_DEFINED(ref, sizeof (ref));
|
||||||
|
#endif
|
||||||
if (ref->refcount == 1)
|
if (ref->refcount == 1)
|
||||||
{
|
{
|
||||||
EINA_COW_PTR_MAGIC_CHECK(ref);
|
EINA_COW_PTR_MAGIC_CHECK(ref);
|
||||||
|
@ -383,9 +386,6 @@ eina_cow_write(Eina_Cow *cow,
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef NVALGRIND
|
|
||||||
VALGRIND_MAKE_MEM_DEFINED(ref, sizeof (ref));
|
|
||||||
#endif
|
|
||||||
_eina_cow_hash_del(cow, *data, ref);
|
_eina_cow_hash_del(cow, *data, ref);
|
||||||
#ifndef NVALGRIND
|
#ifndef NVALGRIND
|
||||||
VALGRIND_MAKE_MEM_NOACCESS(ref, sizeof (ref));
|
VALGRIND_MAKE_MEM_NOACCESS(ref, sizeof (ref));
|
||||||
|
@ -434,16 +434,13 @@ eina_cow_done(Eina_Cow *cow,
|
||||||
|
|
||||||
ref = EINA_COW_PTR_GET(data);
|
ref = EINA_COW_PTR_GET(data);
|
||||||
EINA_COW_PTR_MAGIC_CHECK(ref);
|
EINA_COW_PTR_MAGIC_CHECK(ref);
|
||||||
if (!ref->writing)
|
|
||||||
ERR("Pointer %p is not in a writable state !", dst);
|
|
||||||
|
|
||||||
#ifndef NVALGRIND
|
#ifndef NVALGRIND
|
||||||
VALGRIND_MAKE_MEM_DEFINED(ref, sizeof (ref));
|
VALGRIND_MAKE_MEM_DEFINED(ref, sizeof (ref));
|
||||||
#endif
|
#endif
|
||||||
|
if (!ref->writing)
|
||||||
|
ERR("Pointer %p is not in a writable state !", dst);
|
||||||
|
|
||||||
ref->writing = EINA_FALSE;
|
ref->writing = EINA_FALSE;
|
||||||
#ifndef NVALGRIND
|
|
||||||
VALGRIND_MAKE_MEM_NOACCESS(ref, sizeof (ref));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* needed if we want to make cow gc safe */
|
/* needed if we want to make cow gc safe */
|
||||||
if (ref->togc) return ;
|
if (ref->togc) return ;
|
||||||
|
@ -455,6 +452,9 @@ eina_cow_done(Eina_Cow *cow,
|
||||||
gc->dst = dst;
|
gc->dst = dst;
|
||||||
cow->togc = eina_list_prepend(cow->togc, gc);
|
cow->togc = eina_list_prepend(cow->togc, gc);
|
||||||
ref->togc = EINA_TRUE;
|
ref->togc = EINA_TRUE;
|
||||||
|
#ifndef NVALGRIND
|
||||||
|
VALGRIND_MAKE_MEM_NOACCESS(ref, sizeof (ref));
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
|
|
Loading…
Reference in New Issue