[Valgrind-developers] valgrind: r8564 - in branches/YARD/drd: . tests

[<sv...@va...>]

Author: sewardj
Date: 2008-09-06 19:38:07 +0100 (Sat, 06 Sep 2008)
New Revision: 8564

Log:
Add cost-center annotations to all allocation points in Drd.



Modified:
   branches/YARD/drd/
   branches/YARD/drd/drd_barrier.c
   branches/YARD/drd/drd_bitmap.c
   branches/YARD/drd/drd_clientobj.c
   branches/YARD/drd/drd_error.c
   branches/YARD/drd/drd_main.c
   branches/YARD/drd/drd_malloc_wrappers.c
   branches/YARD/drd/drd_rwlock.c
   branches/YARD/drd/drd_segment.c
   branches/YARD/drd/drd_vc.c
   branches/YARD/drd/tests/drd_bitmap_test.c
   branches/YARD/drd/tests/pth_cond_race3.stderr.exp
   branches/YARD/drd/tests/pth_cond_race3.vgtest
   branches/YARD/drd/tests/tc09_bad_unlock.stderr.exp-glibc2.8



Property changes on: branches/YARD/drd
___________________________________________________________________
Name: svn:mergeinfo
   - 

Modified: branches/YARD/drd/drd_barrier.c
===================================================================
--- branches/YARD/drd/drd_barrier.c	2008-09-06 18:36:13 UTC (rev 8563)
+++ branches/YARD/drd/drd_barrier.c	2008-09-06 18:38:07 UTC (rev 8564)
@@ -112,7 +112,8 @@
   tl_assert(sizeof(((struct barrier_thread_info*)0)->tid) == sizeof(Word));
   tl_assert(sizeof(((struct barrier_thread_info*)0)->tid)
             >= sizeof(DrdThreadId));
-  p->oset = VG_(OSetGen_Create)(0, 0, VG_(malloc), VG_(free));
+  p->oset = VG_(OSetGen_Create)(0, 0, VG_(malloc), "drd.barrier.bi.1",
+                                      VG_(free));
 }
 
 /** Deallocate the memory allocated by barrier_initialize() and in p->oset. 

Modified: branches/YARD/drd/drd_bitmap.c
===================================================================
--- branches/YARD/drd/drd_bitmap.c	2008-09-06 18:36:13 UTC (rev 8563)
+++ branches/YARD/drd/drd_bitmap.c	2008-09-06 18:38:07 UTC (rev 8564)
@@ -63,7 +63,7 @@
   /* in drd_bitmap.h.                                                    */
   tl_assert((1 << BITS_PER_BITS_PER_UWORD) == BITS_PER_UWORD);
 
-  bm = VG_(malloc)(sizeof(*bm));
+  bm = VG_(malloc)("drd.bitmap.bn.1", sizeof(*bm));
   tl_assert(bm);
   /* Cache initialization. a1 is initialized with a value that never can */
   /* match any valid address: the upper ADDR0_BITS bits of a1 are always */
@@ -73,7 +73,8 @@
     bm->cache[i].a1  = ~(UWord)1;
     bm->cache[i].bm2 = 0;
   }
-  bm->oset = VG_(OSetGen_Create)(0, 0, VG_(malloc), VG_(free));
+  bm->oset = VG_(OSetGen_Create)(0, 0, VG_(malloc), "drd.bitmap.bn.2",
+                                       VG_(free));
 
   s_bitmap_creation_count++;
 
@@ -917,7 +918,7 @@
 {
   struct bitmap2* bm2;
 
-  bm2 = VG_(malloc)(sizeof(*bm2));
+  bm2 = VG_(malloc)("drd.bitmap.bm2n.1", sizeof(*bm2));
   bm2->addr   = a1;
   bm2->refcnt = 1;
 

Modified: branches/YARD/drd/drd_clientobj.c
===================================================================
--- branches/YARD/drd/drd_clientobj.c	2008-09-06 18:36:13 UTC (rev 8563)
+++ branches/YARD/drd/drd_clientobj.c	2008-09-06 18:38:07 UTC (rev 8564)
@@ -53,7 +53,8 @@
 void clientobj_init(void)
 {
   tl_assert(s_clientobj == 0);
-  s_clientobj = VG_(OSetGen_Create)(0, 0, VG_(malloc), VG_(free));
+  s_clientobj = VG_(OSetGen_Create)(0, 0, VG_(malloc), "drd.clientobj.ci.1",
+                                          VG_(free));
   tl_assert(s_clientobj);
 }
 

Modified: branches/YARD/drd/drd_error.c
===================================================================
--- branches/YARD/drd/drd_error.c	2008-09-06 18:36:13 UTC (rev 8563)
+++ branches/YARD/drd/drd_error.c	2008-09-06 18:38:07 UTC (rev 8564)
@@ -95,8 +95,8 @@
 {
   AddrInfo ai;
   const unsigned descr_size = 256;
-  Char* descr1 = VG_(malloc)(descr_size);
-  Char* descr2 = VG_(malloc)(descr_size);
+  Char* descr1 = VG_(malloc)("drd.error.drdr2.1", descr_size);
+  Char* descr2 = VG_(malloc)("drd.error.drdr2.2", descr_size);
 
   tl_assert(dri);
   tl_assert(dri->addr);

Modified: branches/YARD/drd/drd_main.c
===================================================================
--- branches/YARD/drd/drd_main.c	2008-09-06 18:36:13 UTC (rev 8563)
+++ branches/YARD/drd/drd_main.c	2008-09-06 18:38:07 UTC (rev 8564)
@@ -654,7 +654,7 @@
     const unsigned msg_size = 256;
     char* msg;
 
-    msg = VG_(malloc)(msg_size);
+    msg = VG_(malloc)("drd.main.dptj.1", msg_size);
     tl_assert(msg);
     VG_(snprintf)(msg, msg_size,
                   "drd_post_thread_join joiner = %d/%d, joinee = %d/%d",

Modified: branches/YARD/drd/drd_malloc_wrappers.c
===================================================================
--- branches/YARD/drd/drd_malloc_wrappers.c	2008-09-06 18:36:13 UTC (rev 8563)
+++ branches/YARD/drd/drd_malloc_wrappers.c	2008-09-06 18:38:07 UTC (rev 8564)
@@ -70,7 +70,8 @@
 static
 DRD_Chunk* create_DRD_Chunk(ThreadId tid, Addr p, SizeT size)
 {
-  DRD_Chunk* mc = VG_(malloc)(sizeof(DRD_Chunk));
+  DRD_Chunk* mc = VG_(malloc)("drd.malloc_wrappers.cDC.1",
+                              sizeof(DRD_Chunk));
   mc->data      = p;
   mc->size      = size;
   mc->where     = VG_(record_ExeContext)(tid, 0);

Modified: branches/YARD/drd/drd_rwlock.c
===================================================================
--- branches/YARD/drd/drd_rwlock.c	2008-09-06 18:36:13 UTC (rev 8563)
+++ branches/YARD/drd/drd_rwlock.c	2008-09-06 18:38:07 UTC (rev 8564)
@@ -180,7 +180,8 @@
   tl_assert(p->type == ClientRwlock);
 
   p->cleanup         = (void(*)(DrdClientobj*))&rwlock_cleanup;
-  p->thread_info     = VG_(OSetGen_Create)(0, 0, VG_(malloc), VG_(free));
+  p->thread_info     = VG_(OSetGen_Create)(
+                          0, 0, VG_(malloc), "drd.rwlock.ri.1", VG_(free));
   p->acquiry_time_ms = 0;
   p->acquired_at     = 0;
 }

Modified: branches/YARD/drd/drd_segment.c
===================================================================
--- branches/YARD/drd/drd_segment.c	2008-09-06 18:36:13 UTC (rev 8563)
+++ branches/YARD/drd/drd_segment.c	2008-09-06 18:38:07 UTC (rev 8564)
@@ -116,7 +116,7 @@
   if (s_max_alive_segments_count < s_alive_segments_count)
     s_max_alive_segments_count = s_alive_segments_count;
 
-  sg = VG_(malloc)(sizeof(*sg));
+  sg = VG_(malloc)("drd.segment.sn.1", sizeof(*sg));
   tl_assert(sg);
   sg_init(sg, creator, created);
   return sg;

Modified: branches/YARD/drd/drd_vc.c
===================================================================
--- branches/YARD/drd/drd_vc.c	2008-09-06 18:36:13 UTC (rev 8563)
+++ branches/YARD/drd/drd_vc.c	2008-09-06 18:38:07 UTC (rev 8564)
@@ -320,11 +320,13 @@
   {
     if (vc->vc)
     {
-      vc->vc = VG_(realloc)(vc->vc, new_capacity * sizeof(vc->vc[0]));
+      vc->vc = VG_(realloc)("drd.vc.vr.1",
+                            vc->vc, new_capacity * sizeof(vc->vc[0]));
     }
     else if (new_capacity > 0)
     {
-      vc->vc = VG_(malloc)(new_capacity * sizeof(vc->vc[0]));
+      vc->vc = VG_(malloc)("drd.vc.vr.2",
+                           new_capacity * sizeof(vc->vc[0]));
     }
     else
     {

Modified: branches/YARD/drd/tests/drd_bitmap_test.c
===================================================================
--- branches/YARD/drd/tests/drd_bitmap_test.c	2008-09-06 18:36:13 UTC (rev 8563)
+++ branches/YARD/drd/tests/drd_bitmap_test.c	2008-09-06 18:38:07 UTC (rev 8564)
@@ -10,7 +10,7 @@
 
 /* Replacements for core functionality. */
 
-void* VG_(malloc)(SizeT nbytes)
+void* VG_(malloc)(HChar* cc, SizeT nbytes)
 { return malloc(nbytes); }
 void  VG_(free)(void* p)
 { return free(p); }


Property changes on: branches/YARD/drd/tests/pth_cond_race3.stderr.exp
___________________________________________________________________
Name: svn:mergeinfo
   - 


Property changes on: branches/YARD/drd/tests/pth_cond_race3.vgtest
___________________________________________________________________
Name: svn:mergeinfo
   - 


Property changes on: branches/YARD/drd/tests/tc09_bad_unlock.stderr.exp-glibc2.8
___________________________________________________________________
Name: svn:mergeinfo
   -