X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iotcloud.git;a=blobdiff_plain;f=version2%2Fsrc%2FC%2FSlotBuffer.cc;h=91ac22edc1e6667c2fce73d7cfd3dbba06c03402;hp=c300c0b913f83f98970064cb7120c5a3a7c61f01;hb=ec6b65ba09fe295c36621a3386cb2571a8833203;hpb=a2f47bf7088deea524750936103f5a683fd97b79

diff --git a/version2/src/C/SlotBuffer.cc b/version2/src/C/SlotBuffer.cc
index c300c0b..91ac22e 100644
--- a/version2/src/C/SlotBuffer.cc
+++ b/version2/src/C/SlotBuffer.cc
@@ -1,121 +1,104 @@
-
+#include"SlotBuffer.h"
 /**
  * Circular buffer that holds the live set of slots.
  * @author Brian Demsky
  * @version 1.0
  */
 
-class SlotBuffer {
-	static final int DEFAULT_SIZE = 16;
+SlotBuffer::SlotBuffer() :
+	array(new Array<Slot *>(SlotBuffer_DEFAULT_SIZE + 1)),
+	head(0),
+	tail(0),
+	oldestseqn(0) {
+}
 
-	Slot[] array;
-	int head;
-	int tail;
-	int64_t oldestseqn;
+int SlotBuffer::size() {
+	if (head >= tail)
+		return head - tail;
+	return (array->length() + head) - tail;
+}
 
-	SlotBuffer() {
-		array = new Slot[DEFAULT_SIZE + 1];
-		head = tail = 0;
-		oldestseqn = 0;
-	}
+int SlotBuffer::capacity() {
+	return array->length() - 1;
+}
 
-	int size() {
-		if (head >= tail)
-			return head - tail;
-		return (array.length + head) - tail;
+void SlotBuffer::resize(int newsize) {
+	if (newsize == (array->length() - 1))
+		return;
+	
+	Array<Slot *> * newarray = new Array<Slot *>(newsize + 1);
+	int currsize = size();
+	int index = tail;
+	for (int i = 0; i < currsize; i++) {
+		newarray->set(i, array->get(index));
+		if ((++index) == array->length())
+			index = 0;
 	}
+	array = newarray;
+	tail = 0;
+	head = currsize;
+}
 
-	int capacity() {
-		return array.length - 1;
-	}
+void SlotBuffer::incrementHead() {
+	head++;
+	if (head >= array->length())
+		head = 0;
+}
 
-	void resize(int newsize) {
-		if (newsize == (array.length - 1))
-			return;
+void SlotBuffer::incrementTail() {
+	tail++;
+	if (tail >= array->length())
+		tail = 0;
+}
 
-		Slot[] newarray = new Slot[newsize + 1];
-		int currsize = size();
-		int index = tail;
-		for (int i = 0; i < currsize; i++) {
-			newarray[i] = array[index];
-			if ((++index) == array.length)
-				index = 0;
-		}
-		array = newarray;
+void SlotBuffer::putSlot(Slot * s) {
+	int64_t checkNum = (getNewestSeqNum() + 1);
+	
+	if (checkNum != s->getSequenceNumber()) {
+		// We have a gap so expunge all our slots
+		oldestseqn = s->getSequenceNumber();
 		tail = 0;
-		head = currsize;
+		head = 1;
+		array->set(0, s);
+		return;
 	}
-
-	void incrementHead() {
-		head++;
-		if (head >= array.length)
-			head = 0;
+	
+	array->set(head, s);
+	incrementHead();
+	
+	if (oldestseqn == 0) {
+		oldestseqn = s->getSequenceNumber();
 	}
 
-	void incrementTail() {
-		tail++;
-		if (tail >= array.length)
-			tail = 0;
+	if (head == tail) {
+		incrementTail();
+		oldestseqn++;
 	}
+}
 
-	void putSlot(Slot s) {
-
-		int64_t checkNum = (getNewestSeqNum() + 1);
-
-		if (checkNum != s.getSequenceNumber()) {
-			// We have a gap so expunge all our slots
-			oldestseqn = s.getSequenceNumber();
-			tail = 0;
-			head = 1;
-			array[0] = s;
-			return;
-		}
-
-		array[head] = s;
-		incrementHead();
-
-		if (oldestseqn == 0) {
-			oldestseqn = s.getSequenceNumber();
-		}
+Slot SlotBuffer::getSlot(int64_t seqnum) {
+	int32_t diff = (int32_t) (seqnum - oldestseqn);
+	int32_t index = diff + tail;
 
-		if (head == tail) {
-			incrementTail();
-			oldestseqn++;
-		}
+	if (index < 0) {
+		// Really old message so we dont have it anymore
+		return NULL;
 	}
 
-	Slot getSlot(int64_t seqnum) {
-		int diff = (int) (seqnum - oldestseqn);
-		int index = diff + tail;
-
-		if (index < 0) {
-			// Really old message so we dont have it anymore
+	if (index >= array->length()) {
+		if (head >= tail) {
 			return NULL;
 		}
+		index -= array->length();
+	}
 
-		if (index >= array.length) {
-			if (head >= tail) {
-				return NULL;
-			}
-			index -= array.length;
-		}
-
-		if (index >= array.length) {
-
-			return NULL;
-		}
-		if (head >= tail && index >= head) {
-			return NULL;
-		}
+	if (index >= array->length) {
 
-		return array[index];
+		return NULL;
 	}
-
-	int64_t getOldestSeqNum() {
-		return oldestseqn;
+	if (head >= tail && index >= head) {
+		return NULL;
 	}
 
-	int64_t getNewestSeqNum() {
-		return oldestseqn + size() - 1;
-	}
+	return array->get(index);
 }