X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=version2%2Fsrc%2FC%2FAbort.cc;h=f653e97156d864dde2df5ae36ea57856f5a547e3;hb=3e54762d57367b1ce049830b42f00950055d8527;hp=619c02d6660b49774a39863166708af328686b1c;hpb=f0a95f7a96e808259ced5e9f61e029773c7a85e6;p=iotcloud.git

diff --git a/version2/src/C/Abort.cc b/version2/src/C/Abort.cc
index 619c02d..f653e97 100644
--- a/version2/src/C/Abort.cc
+++ b/version2/src/C/Abort.cc
@@ -1,44 +1,44 @@
 #include "Abort.h"
 #include "ByteBuffer.h"
 
-Abort::Abort(Slot * slot, int64_t _transactionClientLocalSequenceNumber, int64_t _transactionSequenceNumber ,  int64_t _transactionMachineId, int64_t _transactionArbitrator, int64_t _arbitratorLocalSequenceNumber) :
-  Entry(slot),
-  transactionClientLocalSequenceNumber(_transactionClientLocalSequenceNumber),
-  transactionSequenceNumber(_transactionSequenceNumber),
-  transactionMachineId(_transactionMachineId),
-  transactionArbitrator(_transactionArbitrator),
-  arbitratorLocalSequenceNumber(_arbitratorLocalSequenceNumber),
-  abortId(new Pair<uint64_t, uint64_t>(transactionMachineId, transactionClientLocalSequenceNumber)) {
+Abort::Abort(Slot *slot, int64_t _transactionClientLocalSequenceNumber, int64_t _transactionSequenceNumber,  int64_t _transactionMachineId, int64_t _transactionArbitrator, int64_t _arbitratorLocalSequenceNumber) :
+	Entry(slot),
+	transactionClientLocalSequenceNumber(_transactionClientLocalSequenceNumber),
+	transactionSequenceNumber(_transactionSequenceNumber),
+	transactionMachineId(_transactionMachineId),
+	transactionArbitrator(_transactionArbitrator),
+	arbitratorLocalSequenceNumber(_arbitratorLocalSequenceNumber),
+	abortId(Pair<int64_t, int64_t>(transactionMachineId, transactionClientLocalSequenceNumber)) {
 }
 
-Abort::Abort(Slot * slot, int64_t _transactionClientLocalSequenceNumber, int64_t _transactionSequenceNumber, int64_t _sequenceNumber ,  int64_t _transactionMachineId, int64_t _transactionArbitrator, int64_t _arbitratorLocalSequenceNumber) :
-  Entry(slot),
-  transactionClientLocalSequenceNumber(_transactionClientLocalSequenceNumber),
-  transactionSequenceNumber(_transactionSequenceNumber),
-  sequenceNumber(_sequenceNumber),
-  transactionMachineId(_transactionMachineId),
-  transactionArbitrator(_transactionArbitrator),
-  arbitratorLocalSequenceNumber(_arbitratorLocalSequenceNumber),
-  abortId(new Pair<uint64_t, uint64_t>(transactionMachineId, transactionClientLocalSequenceNumber)) {
+Abort::Abort(Slot *slot, int64_t _transactionClientLocalSequenceNumber, int64_t _transactionSequenceNumber, int64_t _sequenceNumber,  int64_t _transactionMachineId, int64_t _transactionArbitrator, int64_t _arbitratorLocalSequenceNumber) :
+	Entry(slot),
+	transactionClientLocalSequenceNumber(_transactionClientLocalSequenceNumber),
+	transactionSequenceNumber(_transactionSequenceNumber),
+	sequenceNumber(_sequenceNumber),
+	transactionMachineId(_transactionMachineId),
+	transactionArbitrator(_transactionArbitrator),
+	arbitratorLocalSequenceNumber(_arbitratorLocalSequenceNumber),
+	abortId(Pair<int64_t, int64_t>(transactionMachineId, transactionClientLocalSequenceNumber)) {
 }
 
-Entry * Abortdecode(Slot * slot, ByteBuffer * bb) {
-  int64_t transactionClientLocalSequenceNumber = bb->getLong();
-  int64_t transactionSequenceNumber = bb->getLong();
-  int64_t sequenceNumber = bb->getLong();
-  int64_t transactionMachineId = bb->getLong();
-  int64_t transactionArbitrator = bb->getLong();
-  int64_t arbitratorLocalSequenceNumber = bb->getLong();
-  
-  return new Abort(slot, transactionClientLocalSequenceNumber, transactionSequenceNumber, sequenceNumber, transactionMachineId, transactionArbitrator, arbitratorLocalSequenceNumber);
+Entry *Abort_decode(Slot *slot, ByteBuffer *bb) {
+	int64_t transactionClientLocalSequenceNumber = bb->getLong();
+	int64_t transactionSequenceNumber = bb->getLong();
+	int64_t sequenceNumber = bb->getLong();
+	int64_t transactionMachineId = bb->getLong();
+	int64_t transactionArbitrator = bb->getLong();
+	int64_t arbitratorLocalSequenceNumber = bb->getLong();
+
+	return new Abort(slot, transactionClientLocalSequenceNumber, transactionSequenceNumber, sequenceNumber, transactionMachineId, transactionArbitrator, arbitratorLocalSequenceNumber);
 }
 
-void Abort::encode(ByteBuffer * bb) {
-  bb->put(Entry.TypeAbort);
-  bb->putLong(transactionClientLocalSequenceNumber);
-  bb->putLong(transactionSequenceNumber);
-  bb->putLong(sequenceNumber);
-  bb->putLong(transactionMachineId);
-  bb->putLong(transactionArbitrator);
-  bb->putLong(arbitratorLocalSequenceNumber);
+void Abort::encode(ByteBuffer *bb) {
+	bb->put(TypeAbort);
+	bb->putLong(transactionClientLocalSequenceNumber);
+	bb->putLong(transactionSequenceNumber);
+	bb->putLong(sequenceNumber);
+	bb->putLong(transactionMachineId);
+	bb->putLong(transactionArbitrator);
+	bb->putLong(arbitratorLocalSequenceNumber);
 }