Skip to content
This repository was archived by the owner on Nov 4, 2024. It is now read-only.

Merging PMDebugger into Pmemcheck #83

Open
wants to merge 11 commits into
base: pmem-3.15
Choose a base branch
from
Open

Merging PMDebugger into Pmemcheck #83

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f83929f
original version
dibang2008 Apr 27, 2021
d0df662
just add new structure (store information array)
dibang2008 Apr 28, 2021
f0f2624
modify the algorithm of trace_pmem_store()
dibang2008 Apr 29, 2021
1ec6030
modify the algorithm of do_flush
dibang2008 May 2, 2021
263d2af
modify the algorithm of do_fence
dibang2008 May 5, 2021
93a2ec5
mini fix do_flush
dibang2008 May 8, 2021
58e2ccb
fix bugs and pass the simple verification (perl tests/vg_regtest pmem…
dibang2008 May 8, 2021
e4db72f
(1) format codes; (2) add a document to introduce what has change and…
dibang2008 May 12, 2021
f600a97
(1) Dynamically grow the array structure; (2) unify this code; (3) re…
dibang2008 May 27, 2021
0f26388
shorten codes and remove comments
dibang2008 Jun 5, 2021
ab4a7d1
align structure arr_md
dibang2008 Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pmemcheck/pmc_include.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ struct pmem_st {
/*------------------------------------------------------------*/
/*--- Common functions ---*/
/*------------------------------------------------------------*/

/* Check if the given region is in the set. */
UWord is_in_mapping_set(const struct pmem_st *region, OSet *region_set);

Expand Down
103 changes: 98 additions & 5 deletions pmemcheck/pmc_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ print_multiple_stores(void)
}
}

static void add_and_merge_store(struct pmem_st *region);
/**
* \brief Prints registered store statistics.
*
Expand All @@ -308,12 +309,28 @@ print_multiple_stores(void)
static void
print_store_stats(void)
{
/* print store states of the array*/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this debug code?

struct pmem_st *tmp;
for(int s_index=0;s_index<=pmem.info_array.m_index;s_index++){
for(int i=pmem.info_array.m_data[s_index].start_index;i<pmem.info_array.m_data[s_index].end_index;i++){
{
tmp = pmem.info_array.pmem_stores + i;
if (tmp->is_delete == True)
continue;
if (pmem.info_array.m_data[s_index].state == ALL_FLUSHED)
tmp->state = STST_FLUSHED;
struct pmem_st *new = VG_(OSetGen_AllocNode)(pmem.pmem_stores, sizeof(struct pmem_st));
*new=*tmp;
add_and_merge_store(new);
}
}
}

VG_(umsg)("Number of stores not made persistent: %u\n", VG_(OSetGen_Size)
(pmem.pmem_stores));

if (VG_(OSetGen_Size)(pmem.pmem_stores) != 0) {
VG_(OSetGen_ResetIter)(pmem.pmem_stores);
struct pmem_st *tmp;
UWord total = 0;
Int i = 0;
VG_(umsg)("Stores not made persistent properly:\n");
Expand Down Expand Up @@ -985,6 +1002,7 @@ trace_pmem_store(Addr addr, SizeT size, UWord value)
store->state = STST_DIRTY;
store->block_num = sblocks;
store->value = value;
store->is_delete=False;
store->context = VG_(record_ExeContext)(VG_(get_running_tid)(), 0);

/* log the store, regardless if it is a double store */
Expand Down Expand Up @@ -1345,6 +1363,7 @@ for(int s_index=0;s_index<=pmem.info_array.m_index;s_index++){
else
{
struct pmem_st *new = VG_(OSetGen_AllocNode)(pmem.pmem_stores, sizeof(struct pmem_st));
*new=*being_fenced;
add_and_merge_store(new);
}
}
Expand Down Expand Up @@ -1386,7 +1405,7 @@ do_fence(void)
array_process_fence();
}
/* set up a new metadata */
void init_m_data(void){
static void init_m_data(void){
pmem.info_array.m_index++;
struct arr_md* pm_data=pmem.info_array.m_data+pmem.info_array.m_index;
pm_data->min_addr = pm_data->max_addr = -1;
Expand All @@ -1413,9 +1432,6 @@ array_process_flush(UWord base, UWord size){
flush_info.addr = base & ~(pmem.flush_align_size - 1);
flush_info.size = roundup(size, pmem.flush_align_size);
}
if (pmem.log_stores)
VG_(emit)
("|FLUSH;0x%lx;0x%llx", flush_info.addr, flush_info.size);

/* unfortunately lookup doesn't work here, the oset is an avl tree */

Expand Down Expand Up @@ -2265,6 +2281,83 @@ pmc_handle_client_request(ThreadId tid, UWord *arg, UWord *ret )
temp_info.addr = arg[1];
temp_info.size = arg[2];

/* remove regions from store information array*/
struct pmem_st *modified_entry = NULL;
struct pmem_st *region = &temp_info;
UWord old_index;
for(int s_index=0;s_index<=pmem.info_array.m_index;s_index++){
if (cmp_with_arr_minandmax(&temp_info,s_index) != -1)
{
for (int i = pmem.info_array.m_data[s_index].start_index; i < pmem.info_array.m_data[s_index].end_index; i++)
{
//VG_(umsg)("remove before=%d\n",VG_(OSetGen_Size)(curr_node->pmem_stores));
modified_entry = pmem.info_array.pmem_stores + i;
if (modified_entry->is_delete == True)
continue;
if (cmp_pmem_st(region, modified_entry) == 0)
{
SizeT region_max_addr = region->addr + region->size;
//struct pmem_st tmp;
SizeT mod_entry_max_addr = modified_entry->addr + modified_entry->size;
if ((modified_entry->addr > region->addr) && (mod_entry_max_addr <
region_max_addr))
{
/* modified entry fully within removed region */
modified_entry->is_delete = True;
}
else if ((modified_entry->addr < region->addr) &&
(mod_entry_max_addr > region_max_addr))
{
/* modified entry is larger than the removed region - slice */
modified_entry->size = region->addr - modified_entry->addr;

// VG_(OSetGen_Insert)(region_set, modified_entry);
struct pmem_st *new_region;
old_index = pmem.info_array.m_data[pmem.info_array.m_index].end_index;
if (old_index>= MAX_ARRAY_NUM){
new_region = VG_(OSetGen_AllocNode)(pmem.pmem_stores,
sizeof(struct pmem_st));
}
else
{
new_region = pmem.info_array.pmem_stores + old_index;
pmem.info_array.m_data[pmem.info_array.m_index].end_index++;
}
new_region->addr = region_max_addr;
new_region->size = mod_entry_max_addr - new_region->addr;
if (old_index >= MAX_ARRAY_NUM){
add_and_merge_store(new_region);
}

}
else if ((modified_entry->addr >= region->addr) &&
(mod_entry_max_addr > region_max_addr))
{
/* head overlaps */
modified_entry->size -= region_max_addr - modified_entry->addr;
modified_entry->addr = region_max_addr;
// VG_(OSetGen_Insert)(region_set, modified_entry);
}
else if ((mod_entry_max_addr <= region_max_addr) &&
(region->addr > modified_entry->addr))
{
/* tail overlaps */
modified_entry->size = region->addr - modified_entry->addr;

// VG_(OSetGen_Insert)(region_set, modified_entry);
}
else
{
/* exact match */
modified_entry->is_delete = True;
}
}
}
}
}

/* remove regions from pmem_stores Oset*/

remove_region(&temp_info, pmem.pmem_stores);
break;
}
Expand Down