Commit 72f89937 authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel
Browse files

#4590 replace drd annotations with helgrind annotations refs[t:4590] 

git-svn-id: file:///svn/toku/tokudb@40488 c7de825b-a66e-492c-adef-691d508d4ae1
parent da1fe0b1

linux/memory.c

+4 −4
Original line number Diff line number Diff line
@@ -275,9 +275,9 @@ toku_set_func_free(free_fun_t f) { 
    t_free = f;

}



#include <valgrind/drd.h>

void __attribute__((constructor)) toku_memory_drd_ignore(void);

#include <valgrind/helgrind.h>

void __attribute__((constructor)) toku_memory_helgrind_ignore(void);

void

toku_memory_drd_ignore(void) {

    DRD_IGNORE_VAR(status);

toku_memory_helgrind_ignore(void) {

    VALGRIND_HG_DISABLE_CHECKING(&status, sizeof status);

}

newbrt/brt-flusher.c

+4 −4
Original line number Diff line number Diff line
@@ -1859,11 +1859,11 @@ flush_node_on_background_thread(BRT brt, BRTNODE parent) 
    }

}



#include <valgrind/drd.h>

void __attribute__((__constructor__)) toku_brt_flusher_drd_ignore(void);

#include <valgrind/helgrind.h>

void __attribute__((__constructor__)) toku_brt_flusher_helgrind_ignore(void);

void

toku_brt_flusher_drd_ignore(void) {

    DRD_IGNORE_VAR(brt_flusher_status);

toku_brt_flusher_helgrind_ignore(void) {

    VALGRIND_HG_DISABLE_CHECKING(&brt_flusher_status, sizeof brt_flusher_status);

}



#undef STATUS_VALUE

newbrt/brt-hot-flusher.c

+4 −4
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <brt-flusher-internal.h>

#include <brt-cachetable-wrappers.h>

#include <brt-internal.h>

#include <valgrind/drd.h>



// Member Descirption:

// 1. highest_pivot_key - this is the key that corresponds to the
@@ -370,11 +369,12 @@ toku_brt_hot_optimize(BRT brt, 
    return r;

}



void __attribute__((__constructor__)) toku_hot_drd_ignore(void);

#include <valgrind/helgrind.h>

void __attribute__((__constructor__)) toku_hot_helgrind_ignore(void);

void

toku_hot_drd_ignore(void) {

toku_hot_helgrind_ignore(void) {

    // incremented only while lock is held, but read by engine status asynchronously.

    DRD_IGNORE_VAR(hot_status);

    VALGRIND_HG_DISABLE_CHECKING(&hot_status, sizeof hot_status);

}

newbrt/brt.c

+5 −5
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ basement nodes, bulk fetch, and partial fetch: 
#include "sort.h"

#include <brt-cachetable-wrappers.h>

#include <brt-flusher.h>

#include <valgrind/drd.h>

#include <valgrind/helgrind.h>



#if defined(HAVE_CILK)

#include <cilk/cilk.h>
@@ -6686,11 +6686,11 @@ toku_brt_header_init(struct brt_header *h, 
    h->root_xid_that_created = root_xid_that_created;

}



#include <valgrind/drd.h>

void __attribute__((__constructor__)) toku_brt_drd_ignore(void);

#include <valgrind/helgrind.h>

void __attribute__((__constructor__)) toku_brt_helgrind_ignore(void);

void

toku_brt_drd_ignore(void) {

    DRD_IGNORE_VAR(brt_status);

toku_brt_helgrind_ignore(void) {

    VALGRIND_HG_DISABLE_CHECKING(&brt_status, sizeof brt_status);

}



#undef STATUS_VALUE

newbrt/cachetable.c

+23 −23
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <string.h>

#include <time.h>

#include <stdarg.h>

#include <valgrind/drd.h>

#include <valgrind/helgrind.h>



#include "memory.h"

#include "workqueue.h"
@@ -500,12 +500,12 @@ int toku_create_cachetable(CACHETABLE *result, long size_limit, LSN UU(initial_l 
    CACHETABLE MALLOC(ct);

    if (ct == 0) return ENOMEM;

    memset(ct, 0, sizeof(*ct));

    DRD_IGNORE_VAR(ct->size_nonleaf); // modified only when the cachetable lock is held, but read by engine status

    DRD_IGNORE_VAR(ct->size_current);

    DRD_IGNORE_VAR(ct->size_evicting);

    DRD_IGNORE_VAR(ct->size_leaf);

    DRD_IGNORE_VAR(ct->size_rollback);

    DRD_IGNORE_VAR(ct->size_cachepressure);

    VALGRIND_HG_DISABLE_CHECKING(&ct->size_nonleaf, sizeof ct->size_nonleaf); // modified only when the cachetable lock is held, but read by engine status

    VALGRIND_HG_DISABLE_CHECKING(&ct->size_current, sizeof ct->size_current);

    VALGRIND_HG_DISABLE_CHECKING(&ct->size_evicting, sizeof ct->size_evicting);

    VALGRIND_HG_DISABLE_CHECKING(&ct->size_leaf, sizeof ct->size_leaf);

    VALGRIND_HG_DISABLE_CHECKING(&ct->size_rollback, sizeof ct->size_rollback);

    VALGRIND_HG_DISABLE_CHECKING(&ct->size_cachepressure, sizeof ct->size_cachepressure);

    ct->table_size = 4;

    rwlock_init(&ct->pending_lock);

    XCALLOC_N(ct->table_size, ct->table);
@@ -4042,23 +4042,23 @@ toku_cleaner_thread (void *cachetable_v) 
    return 0;

}



void __attribute__((__constructor__)) toku_cachetable_drd_ignore(void);

void __attribute__((__constructor__)) toku_cachetable_helgrind_ignore(void);

void

toku_cachetable_drd_ignore(void) {

    DRD_IGNORE_VAR(cachetable_hit);

    DRD_IGNORE_VAR(cachetable_miss);

    DRD_IGNORE_VAR(cachetable_misstime);

    DRD_IGNORE_VAR(cachetable_waittime);

    DRD_IGNORE_VAR(cachetable_wait_reading);

    DRD_IGNORE_VAR(cachetable_wait_writing);

    DRD_IGNORE_VAR(cachetable_wait_checkpoint);

    DRD_IGNORE_VAR(cachetable_puts);

    DRD_IGNORE_VAR(cachetable_prefetches);

    DRD_IGNORE_VAR(cachetable_maybe_get_and_pins);

    DRD_IGNORE_VAR(cachetable_maybe_get_and_pin_hits);

    DRD_IGNORE_VAR(cachetable_evictions);

    DRD_IGNORE_VAR(cleaner_executions);

    DRD_IGNORE_VAR(ct_status);

toku_cachetable_helgrind_ignore(void) {

    VALGRIND_HG_DISABLE_CHECKING(&cachetable_hit, sizeof cachetable_hit);

    VALGRIND_HG_DISABLE_CHECKING(&cachetable_miss, sizeof cachetable_miss);

    VALGRIND_HG_DISABLE_CHECKING(&cachetable_misstime, sizeof cachetable_misstime);

    VALGRIND_HG_DISABLE_CHECKING(&cachetable_waittime, sizeof cachetable_waittime);

    VALGRIND_HG_DISABLE_CHECKING(&cachetable_wait_reading, sizeof cachetable_wait_reading);

    VALGRIND_HG_DISABLE_CHECKING(&cachetable_wait_writing, sizeof cachetable_wait_writing);

    VALGRIND_HG_DISABLE_CHECKING(&cachetable_wait_checkpoint, sizeof cachetable_wait_checkpoint);

    VALGRIND_HG_DISABLE_CHECKING(&cachetable_puts, sizeof cachetable_puts);

    VALGRIND_HG_DISABLE_CHECKING(&cachetable_prefetches, sizeof cachetable_prefetches);

    VALGRIND_HG_DISABLE_CHECKING(&cachetable_maybe_get_and_pins, sizeof cachetable_maybe_get_and_pins);

    VALGRIND_HG_DISABLE_CHECKING(&cachetable_maybe_get_and_pin_hits, sizeof cachetable_maybe_get_and_pin_hits);

    VALGRIND_HG_DISABLE_CHECKING(&cachetable_evictions, sizeof cachetable_evictions);

    VALGRIND_HG_DISABLE_CHECKING(&cleaner_executions, sizeof cleaner_executions);

    VALGRIND_HG_DISABLE_CHECKING(&ct_status, sizeof ct_status);

}



#undef STATUS_VALUE