changes to improve commit intensive benchmarks and combine invalid messages

[IRC.git] / Robust / src / Runtime / DSTM / interface / dstmserver.c

diff --git a/Robust/src/Runtime/DSTM/interface/dstmserver.c b/Robust/src/Runtime/DSTM/interface/dstmserver.c
index 40554000b6307f6eff36d58850e0fca41822efc8..62de32aadc15468465e929fd376bebb43013869d 100644 (file)
--- a/Robust/src/Runtime/DSTM/interface/dstmserver.c
+++ b/Robust/src/Runtime/DSTM/interface/dstmserver.c
@@ -472,7 +472,7 @@ int processClientReq(fixed_data_t *fixed, trans_commit_data_t *transinfo,
     break;
 
   default:
-    printf("Error: No response to TRANS_AGREE OR DISAGREE protocol %s, %d\n", __FILE__, __LINE__);
+    printf("Error: No response to TRANS_AGREE OR DISAGREE protocol  control = %d %s, %d\n", control, __FILE__, __LINE__);
     //TODO Use fixed.trans_id  TID since Client may have died
     break;
   }
@@ -814,7 +814,6 @@ void processVerNoMatch(unsigned int *oidnotfound,
     }
     /* Condition to send TRANS_SOFT_ABORT */
     if((*(v_matchlock) > 0 && *(v_nomatch) == 0) || (*(objnotfound) > 0 && *(v_nomatch) == 0)) {
-    //if((*(v_matchlock) > 0 && *(v_nomatch) == 0) || (*(objnotfound) > 0 && *(v_nomatch) == 0)) {
       control = TRANS_SOFT_ABORT;
 
       /* Send control message */