/** This function looks up the entry in the shadow table corresponding to a
* given address.*/
-static uint64_t * lookupAddressEntry(const void *address)
+static inline uint64_t * lookupAddressEntry(const void *address)
{
struct ShadowTable *currtable = root;
#if BIT48
/** This function just updates metadata on atomic write. */
void recordCalloc(void *location, size_t size) {
- thread_id_t thread = thread_current()->get_id();
+ thread_id_t thread = thread_current_id();
for(;size != 0;size--) {
uint64_t *shadow = lookupAddressEntry(location);
uint64_t shadowval = *shadow;
if (clock_may_race(currClock, thread, readClock, readThread)) {
/* Still need this read in vector */
if (copytoindex != i) {
- ASSERT(record->thread[i] >= 0);
- record->readClock[copytoindex] = record->readClock[i];
- record->thread[copytoindex] = record->thread[i];
+ ASSERT(readThread >= 0);
+ record->readClock[copytoindex] = readClock;
+ record->thread[copytoindex] = readThread;
}
copytoindex++;
}