|
From: <sv...@va...> - 2009-05-03 17:04:58
|
Author: bart
Date: 2009-05-03 18:04:43 +0100 (Sun, 03 May 2009)
New Revision: 9726
Log:
Removed some non-interesting statistics.
Modified:
branches/DRDDEV/drd/drd_bitmap.c
branches/DRDDEV/drd/drd_bitmap.h
branches/DRDDEV/drd/drd_main.c
branches/DRDDEV/drd/drd_segment.c
branches/DRDDEV/drd/drd_segment.h
branches/DRDDEV/drd/drd_thread.c
branches/DRDDEV/drd/drd_thread.h
branches/DRDDEV/drd/pub_drd_bitmap.h
Modified: branches/DRDDEV/drd/drd_bitmap.c
===================================================================
--- branches/DRDDEV/drd/drd_bitmap.c 2009-05-03 16:26:46 UTC (rev 9725)
+++ branches/DRDDEV/drd/drd_bitmap.c 2009-05-03 17:04:43 UTC (rev 9726)
@@ -1152,7 +1152,7 @@
ULong DRD_(bm_get_bitmap2_node_creation_count)(void)
{
- return s_bitmap_merge_count;
+ return s_bitmap2_node_creation_count;
}
ULong DRD_(bm_get_bitmap2_creation_count)(void)
@@ -1160,6 +1160,10 @@
return s_bitmap2_creation_count;
}
+ULong DRD_(bm_get_bitmap2_merge_count)(void)
+{
+ return s_bitmap2_merge_count;
+}
/** Clear the bitmap contents. */
void bm2_clear(struct bitmap2* const bm2)
@@ -1207,13 +1211,3 @@
bm2l->bm1.bm0_w[k] ^= bm2r->bm1.bm0_w[k];
}
}
-
-ULong bm_get_bitmap2_creation_count(void)
-{
- return s_bitmap2_creation_count;
-}
-
-ULong bm_get_bitmap2_merge_count(void)
-{
- return s_bitmap2_merge_count;
-}
Modified: branches/DRDDEV/drd/drd_bitmap.h
===================================================================
--- branches/DRDDEV/drd/drd_bitmap.h 2009-05-03 16:26:46 UTC (rev 9725)
+++ branches/DRDDEV/drd/drd_bitmap.h 2009-05-03 17:04:43 UTC (rev 9726)
@@ -180,6 +180,7 @@
/* Local variables. */
static ULong s_bitmap2_creation_count;
+static ULong s_bitmap2_node_creation_count;
Modified: branches/DRDDEV/drd/drd_main.c
===================================================================
--- branches/DRDDEV/drd/drd_main.c 2009-05-03 16:26:46 UTC (rev 9725)
+++ branches/DRDDEV/drd/drd_main.c 2009-05-03 17:04:43 UTC (rev 9726)
@@ -55,7 +55,7 @@
/* Local variables. */
-static Bool DRD_(s_drd_first_race_only) = False;
+static Bool DRD_(s_first_race_only) = False;
static Bool DRD_(s_print_stats) = False;
static Bool DRD_(s_var_info) = False;
static Bool DRD_(s_show_stack_usage) = False;
@@ -85,9 +85,9 @@
int trace_suppression = -1;
Char* trace_address = 0;
- if VG_BOOL_CLO(arg, "--check-stack-var", check_stack_accesses) {}
+ if VG_BOOL_CLO(arg, "--check-stack-var", check_stack_accesses) {}
else if VG_BOOL_CLO(arg, "--drd-stats", DRD_(s_print_stats)) {}
- else if VG_BOOL_CLO(arg, "--first-race-only", DRD_(s_drd_first_race_only)) {}
+ else if VG_BOOL_CLO(arg, "--first-race-only", DRD_(s_first_race_only)) {}
else if VG_BOOL_CLO(arg,"--report-signal-unlocked",report_signal_unlocked) {}
else if VG_BOOL_CLO(arg, "--segment-merging", segment_merging) {}
else if VG_BOOL_CLO(arg, "--show-confl-seg", show_confl_seg) {}
@@ -170,7 +170,6 @@
" writer lock is held longer than the specified time (in milliseconds).\n"
" --first-race-only=yes|no Only report the first data race that occurs on\n"
" a memory location instead of all races [no].\n"
-
" --report-signal-unlocked=yes|no Whether to report calls to\n"
" pthread_cond_signal() where the mutex associated\n"
" with the signal via pthread_cond_wait() is not\n"
@@ -573,9 +572,6 @@
dscvc,
update_conflict_set_count - dsnsc - dscvc);
VG_(message)(Vg_UserMsg,
- " %lld level 2 conflict sets have been computed.",
- thread_get_compute_conflict_set_bitmap2_count());
- VG_(message)(Vg_UserMsg,
" segments: created %lld segments, max %lld alive,"
" %lld discard points,",
DRD_(sg_get_segments_created_count)(),
@@ -583,7 +579,7 @@
DRD_(thread_get_discard_ordered_segments_count)());
VG_(message)(Vg_UserMsg,
" %lld merges.",
- sg_get_segment_merge_count());
+ DRD_(sg_get_segment_merge_count)());
VG_(message)(Vg_UserMsg,
" (%lld m, %lld rw, %lld s, %lld b)",
DRD_(get_mutex_segment_creation_count)(),
@@ -594,18 +590,10 @@
" bitmaps: %lld level 1 / %lld level 2 bitmap refs",
DRD_(bm_get_bitmap_creation_count)(),
DRD_(bm_get_bitmap2_node_creation_count)());
-#if 0
VG_(message)(Vg_UserMsg,
- " %lld level 1 bitmap merges were carried out.",
- bm_get_bitmap_merge_count());
-#endif
- VG_(message)(Vg_UserMsg,
- " %lld level 2 bitmaps were allocated;",
+ " %lld level 2 bitmaps were allocated.",
DRD_(bm_get_bitmap2_creation_count)());
VG_(message)(Vg_UserMsg,
- " %lld level 2 bitmap merges were carried out.",
- bm_get_bitmap2_merge_count());
- VG_(message)(Vg_UserMsg,
" mutex: %lld non-recursive lock/unlock events.",
DRD_(get_mutex_lock_count)());
DRD_(print_malloc_stats)();
Modified: branches/DRDDEV/drd/drd_segment.c
===================================================================
--- branches/DRDDEV/drd/drd_segment.c 2009-05-03 16:26:46 UTC (rev 9725)
+++ branches/DRDDEV/drd/drd_segment.c 2009-05-03 17:04:43 UTC (rev 9726)
@@ -262,7 +262,7 @@
return s_max_segments_alive_count;
}
-ULong sg_get_segment_merge_count(void)
+ULong DRD_(sg_get_segment_merge_count)(void)
{
return s_segment_merge_count;
}
Modified: branches/DRDDEV/drd/drd_segment.h
===================================================================
--- branches/DRDDEV/drd/drd_segment.h 2009-05-03 16:26:46 UTC (rev 9725)
+++ branches/DRDDEV/drd/drd_segment.h 2009-05-03 17:04:43 UTC (rev 9726)
@@ -70,7 +70,7 @@
ULong DRD_(sg_get_segments_created_count)(void);
ULong DRD_(sg_get_segments_alive_count)(void);
ULong DRD_(sg_get_max_segments_alive_count)(void);
-ULong sg_get_segment_merge_count(void);
+ULong DRD_(sg_get_segment_merge_count)(void);
#endif // __SEGMENT_H
Modified: branches/DRDDEV/drd/drd_thread.c
===================================================================
--- branches/DRDDEV/drd/drd_thread.c 2009-05-03 16:26:46 UTC (rev 9725)
+++ branches/DRDDEV/drd/drd_thread.c 2009-05-03 17:04:43 UTC (rev 9726)
@@ -63,7 +63,6 @@
static ULong s_conflict_set_combine_vc_count;
static ULong s_conflict_set_bitmap_creation_count;
static ULong s_conflict_set_bitmap2_creation_count;
-static ULong s_compute_conflict_set_bitmap2_count;
static ThreadId s_vg_running_tid = VG_INVALID_THREADID;
DrdThreadId DRD_(g_drd_running_tid) = DRD_INVALID_THREADID;
ThreadInfo DRD_(g_threadinfo)[DRD_N_THREADS];
@@ -1179,8 +1178,3 @@
{
return s_conflict_set_bitmap2_creation_count;
}
-
-ULong thread_get_compute_conflict_set_bitmap2_count(void)
-{
- return s_compute_conflict_set_bitmap2_count;
-}
Modified: branches/DRDDEV/drd/drd_thread.h
===================================================================
--- branches/DRDDEV/drd/drd_thread.h 2009-05-03 16:26:46 UTC (rev 9725)
+++ branches/DRDDEV/drd/drd_thread.h 2009-05-03 17:04:43 UTC (rev 9726)
@@ -169,7 +169,6 @@
ULong DRD_(thread_get_update_conflict_set_count)(ULong* dsnsc, ULong* dscvc);
ULong DRD_(thread_get_conflict_set_bitmap_creation_count)(void);
ULong DRD_(thread_get_conflict_set_bitmap2_creation_count)(void);
-ULong thread_get_compute_conflict_set_bitmap2_count(void);
/* Inline function definitions. */
Modified: branches/DRDDEV/drd/pub_drd_bitmap.h
===================================================================
--- branches/DRDDEV/drd/pub_drd_bitmap.h 2009-05-03 16:26:46 UTC (rev 9725)
+++ branches/DRDDEV/drd/pub_drd_bitmap.h 2009-05-03 17:04:43 UTC (rev 9726)
@@ -127,7 +127,7 @@
ULong DRD_(bm_get_bitmap_creation_count)(void);
ULong DRD_(bm_get_bitmap2_node_creation_count)(void);
ULong DRD_(bm_get_bitmap2_creation_count)(void);
-ULong bm_get_bitmap2_merge_count(void);
+ULong DRD_(bm_get_bitmap2_merge_count)(void);
/* Second-level bitmaps. */
void bm2_clear(struct bitmap2* const bm2);
|