edits

[iotcloud.git] / version2 / src / C / ArbitrationRound.cc

diff --git a/version2/src/C/ArbitrationRound.cc b/version2/src/C/ArbitrationRound.cc
index 8b847855d3858f3eb59ef4503f13786cc8c2a7a9..da21dda20218dcdd7939d3538730d69b94ee6df1 100644 (file)
--- a/version2/src/C/ArbitrationRound.cc
+++ b/version2/src/C/ArbitrationRound.cc
@@ -1,87 +1,94 @@
-#include"ArbitrationRound.h"
-
-ArbitrationRound::ArbitrationRound(Commit * _commit, Set<Abort *> * _abortsBefore) {
-  parts = new ArrayList<Entry>();
-  commit = _commit;
-  abortsBefore = _abortsBefore;
-  
-  if (commit != NULL) {
-    commit.createCommitParts();
-    currentSize += commit.getNumberOfParts();
-    }
-  
-  currentSize += abortsBefore.size();
+#include "ArbitrationRound.h"
+#include "Commit.h"
+
+ArbitrationRound::ArbitrationRound(Commit *_commit, Hashset<Abort *> *_abortsBefore) :
+       abortsBefore(_abortsBefore),
+       parts(new Vector<Entry *>()),
+       commit(_commit),
+       currentSize(0),
+       didSendPart(false),
+       didGenerateParts(false) {
+
+       if (commit != NULL) {
+               commit->createCommitParts();
+               currentSize += commit->getNumberOfParts();
+       }
+
+       currentSize += abortsBefore->size();
 }
 
-void ArbitrationRound::generateParts() {
-  if (didGenerateParts) {
+/*
+   void ArbitrationRound::generateParts() {
+   if (didGenerateParts) {
     return;
-  }
-  parts = new ArrayList<Entry>(abortsBefore);
-  if (commit != NULL) {
-    parts.addAll(commit.getParts().values());
-  }
-}
+   }
+   parts = new Vector<Entry *>((Vector<Entry *> *)abortsBefore);
+   if (commit != NULL) {
+    parts->addAll(commit->getParts()->values());
+   }
+   }*/
 
-List<Entry *> * ArbitrationRound::getParts() {
-  return parts;
+Vector<Entry *> *ArbitrationRound::getParts() {
+       return parts;
 }
 
-void ArbitrationRound::removeParts(List<Entry *> * removeParts) {
-  parts.removeAll(removeParts);
-  didSendPart = true;
-}
+/*
+   void ArbitrationRound::removeParts(Vector<Entry *> * removeParts) {
+   parts->removeAll(removeParts);
+   didSendPart = true;
+   }
+ */
 
 bool ArbitrationRound::isDoneSending() {
-  if ((commit == NULL) && abortsBefore.isEmpty()) {
-    return true;
-  }
-  
-  return parts.isEmpty();
+       if ((commit == NULL) && abortsBefore->isEmpty()) {
+               return true;
+       }
+
+       return parts->isEmpty();
 }
 
-Commit * ArbitrationRound::getCommit() {
-  return commit;
+Commit *ArbitrationRound::getCommit() {
+       return commit;
 }
-  
-void ArbitrationRound::setCommit(Commit * _commit) {
-  if (commit != NULL) {
-    currentSize -= commit.getNumberOfParts();
-  }
-  commit = _commit;
-  
-  if (commit != NULL) {
-    currentSize += commit.getNumberOfParts();
-  }
+
+void ArbitrationRound::setCommit(Commit *_commit) {
+       if (commit != NULL) {
+               currentSize -= commit->getNumberOfParts();
+       }
+       commit = _commit;
+
+       if (commit != NULL) {
+               currentSize += commit->getNumberOfParts();
+       }
 }
 
-void ArbitrationRound::addAbort(Abort * abort) {
-  abortsBefore.add(abort);
-  currentSize++;
+void ArbitrationRound::addAbort(Abort *abort) {
+       abortsBefore->add(abort);
+       currentSize++;
 }
-  
-void ArbitrationRound::addAborts(Set<Abort *> * aborts) {
-  abortsBefore.addAll(aborts);
-  currentSize += aborts.size();
+
+void ArbitrationRound::addAborts(Hashset<Abort *> *aborts) {
+       abortsBefore->addAll(aborts);
+       currentSize += aborts->size();
 }
-  
-Set<Abort> ArbitrationRound::getAborts() {
-  return abortsBefore;
+
+Hashset<Abort *> *ArbitrationRound::getAborts() {
+       return abortsBefore;
 }
 
 int ArbitrationRound::getAbortsCount() {
-  return abortsBefore.size();
+       return abortsBefore->size();
 }
 
 int ArbitrationRound::getCurrentSize() {
-  return currentSize;
+       return currentSize;
 }
 
 bool ArbitrationRound::isFull() {
-  return currentSize >= MAX_PARTS;
+       return currentSize >= MAX_PARTS;
 }
-  
-bool ArbitrationRound::didSendPart() {
-  return didSendPart;
+
+bool ArbitrationRound::getDidSendPart() {
+       return didSendPart;
 }