From: Bart Van Assche Date: Fri, 29 Feb 2008 19:19:39 +0000 (+0000) Subject: Removed debugging code. X-Git-Tag: svn/VALGRIND_3_4_0~1001 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a0fe9a27783501cbf89d5d78176bb666047a0c2;p=thirdparty%2Fvalgrind.git Removed debugging code. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7510 --- diff --git a/exp-drd/drd_clientobj.c b/exp-drd/drd_clientobj.c index 5857a21f1f..56fb65e4bf 100644 --- a/exp-drd/drd_clientobj.c +++ b/exp-drd/drd_clientobj.c @@ -104,11 +104,7 @@ drd_clientobj_add(const Addr a1, const Addr a2, const ObjType t) tl_assert(a1 < a2 && a1 + 4096 > a2); tl_assert(! drd_clientobj_present(a1, a2)); tl_assert(VG_(OSetGen_Lookup)(s_clientobj, &a1) == 0); -#if 0 - VG_(message)(Vg_DebugMsg, - "registering client obj [0x%lx,0x%lx[ of type %d", - a1, a2, t); -#endif + p = VG_(OSetGen_AllocNode)(s_clientobj, sizeof(*p)); VG_(memset)(p, 0, sizeof(*p)); p->any.a1 = a1; @@ -129,10 +125,6 @@ Bool drd_clientobj_remove(const Addr addr, const ObjType t) p = VG_(OSetGen_Remove)(s_clientobj, &addr); if (p) { -#if 0 - VG_(message)(Vg_DebugMsg, "removing client obj [0x%lx,0x%lx[ of type %d", - p->any.a1, p->any.a2, p->any.type); -#endif tl_assert(VG_(OSetGen_Lookup)(s_clientobj, &addr) == 0); drd_finish_suppression(p->any.a1, p->any.a2); tl_assert(p->any.cleanup); @@ -148,10 +140,6 @@ void drd_clientobj_stop_using_mem(const Addr a1, const Addr a2) Addr removed_at; DrdClientobj* p; -#if 0 - VG_(message)(Vg_DebugMsg, "drd_clientobj_stop_using_mem [0x%lx,0x%lx[", - a1, a2); -#endif tl_assert(s_clientobj); VG_(OSetGen_ResetIter)(s_clientobj); p = VG_(OSetGen_Next)(s_clientobj); @@ -160,14 +148,10 @@ void drd_clientobj_stop_using_mem(const Addr a1, const Addr a2) if ((a1 <= p->any.a1 && p->any.a1 < a2) || (a1 < p->any.a2 && p->any.a2 <= a2)) { -#if 0 - VG_(message)(Vg_DebugMsg, "drd_clientobj_stop_using_mem [0x%lx,0x%lx[", - a1, a2); -#endif removed_at = p->any.a1; drd_clientobj_remove(p->any.a1, p->any.type); - /* The above call removes an element from the oset and hence invalidates */ - /* the iterator. Set the iterator back. */ + /* The above call removes an element from the oset and hence */ + /* invalidates the iterator. Set the iterator back. */ VG_(OSetGen_ResetIter)(s_clientobj); while ((p = VG_(OSetGen_Next)(s_clientobj)) != 0 && p->any.a1 <= removed_at)