tweaks to PTMs

Author: pramalhe

README.md

@@ -40,8 +40,8 @@ If you just want to use OneFile in your own application or benchmarks then follo
 - Include the header from a single .cpp. If you include from multiple compilation units (.cpp files) then move the last block in the .hpp to one of the .cpp files.
 - If you want a data structure that is already made then take a look at what's on these folders:
 
-    datastructures/         Data structures for volatile memory (needs one of the STMs)
-    pdatastructures/        Data structures for persistent memory (needs one of the PTMs)
+	datastructures/         Data structures for volatile memory (needs one of the STMs)
+	pdatastructures/        Data structures for persistent memory (needs one of the PTMs)
 
 
 ### Design ###
@@ -153,4 +153,4 @@ The four implementations of OneFile were executed during thousands of cpu hours
 If you see a crash or invariant failure, run the same code under a global rw-lock to make sure the bug is not in your code. If you really believe it's in OneFile, then please open a bug on github and add as much information as you can, namely, stack trace and files needed to reproduce. 
 We'll do our best to address it.
 
- 
+ 

ptms/OneFilePTMLF.hpp

@@ -793,15 +793,15 @@ class OneFileLF {
         if (debug) printf("Applying %ld stores in write-set\n", writeSets[tid].numStores);
         writeSets[tid].apply(seq, tid);
         writeSets[tid].flushModifications();
-        const uint64_t newReq = seqidx2trans(seq+1,idx);
-        if (opd.pWriteSet->request.load(std::memory_order_acquire) == lcurTx) {
+        if (opd.pWriteSet->request.load() == lcurTx) {
+            const uint64_t newReq = seqidx2trans(seq+1,idx);
             opd.pWriteSet->request.compare_exchange_strong(lcurTx, newReq);
         }
     }
 
     // Upon restart, re-applies the last transaction, so as to guarantee that
     // we have a consistent state in persistent memory.
-    // This is not needed on x86, where the DCAS has atomicity writting to persistent memory.
+    // This is not used on x86 because the DCAS has atomicity writting to persistent memory.
     void recover() {
         uint64_t lcurTx = curTx->load(std::memory_order_acquire);
         opData[trans2idx(lcurTx)].pWriteSet->applyFromRecover();

ptms/OneFilePTMWF.hpp

@@ -1059,8 +1059,8 @@ class OneFileWF {
         if (debug) printf("Applying %ld stores in write-set\n", writeSets[tid].numStores);
         writeSets[tid].apply(seq, tid);
         writeSets[tid].flushModifications();
-        const uint64_t newReq = seqidx2trans(seq+1,idx);
-        if (opd.pWriteSet->request.load(std::memory_order_acquire) == lcurTx) {
+        if (opd.pWriteSet->request.load() == lcurTx) {
+            const uint64_t newReq = seqidx2trans(seq+1,idx);
             opd.pWriteSet->request.compare_exchange_strong(lcurTx, newReq);
         }
     }
@@ -1093,7 +1093,7 @@ class OneFileWF {
 
     // Upon restart, re-applies the last transaction, so as to guarantee that
     // we have a consistent state in persistent memory.
-    // This is not needed on x86, where the DCAS has atomicity writting to persistent memory.
+    // This is not used on x86 because the DCAS has atomicity writting to persistent memory.
     void recover() {
         uint64_t lcurTx = curTx->load(std::memory_order_acquire);
         opData[trans2idx(lcurTx)].pWriteSet->applyFromRecover();