From: bdemsky <bdemsky@uci.edu>
Date: Fri, 19 Jan 2018 06:30:01 +0000 (-0800)
Subject: edits
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iotcloud.git;a=commitdiff_plain;h=2345e7ea95433815c8cae09c3b719820e0ba44cd

edits
---

diff --git a/version2/src/C/CloudComm.cc b/version2/src/C/CloudComm.cc
index 1c8114e..82982ba 100644
--- a/version2/src/C/CloudComm.cc
+++ b/version2/src/C/CloudComm.cc
@@ -21,7 +21,7 @@ CloudComm::CloudComm() :
 /**
  * Constructor for actual use. Takes in the url and password.
  */
-CloudComm::CloudComm(Table* _table,  IoTString* _baseurl, IoTString* _password, int _listeningPort) :
+CloudComm::CloudComm(Table *_table,  IoTString *_baseurl, IoTString *_password, int _listeningPort) :
 	baseurl(_baseurl),
 	key(NULL),
 	mac(NULL),
diff --git a/version2/src/C/CloudComm.h b/version2/src/C/CloudComm.h
index 0413ca0..bb319c2 100644
--- a/version2/src/C/CloudComm.h
+++ b/version2/src/C/CloudComm.h
@@ -62,7 +62,7 @@ public:
 	/**
 	 * Constructor for actual use. Takes in the url and password.
 	 */
-	CloudComm(Table* _table,  IoTString* _baseurl, IoTString* _password, int _listeningPort);
+	CloudComm(Table *_table,  IoTString *_baseurl, IoTString *_password, int _listeningPort);
 
 	/**
 	 * Inits all the security stuff
@@ -74,7 +74,7 @@ public:
 	 * On failure, the server will send slots with newer sequence
 	 * numbers.
 	 */
-	Array<Slot *> *putSlot(Slot* slot, int max);
+	Array<Slot *> *putSlot(Slot *slot, int max);
 
 	/**
 	 * Request the server to send all slots with the given
@@ -88,7 +88,7 @@ public:
 	 * server response.  Shared by both putSlot and getSlots.
 	 */
 
-	Array<char> *sendLocalData(Array<char> *sendData, int64_t localSequenceNumber, IoTString* host, int port);
+	Array<char> *sendLocalData(Array<char> *sendData, int64_t localSequenceNumber, IoTString *host, int port);
 	public void close();
 };
 #endif
diff --git a/version2/src/C/CommitPart.cc b/version2/src/C/CommitPart.cc
index c0d50fa..fd560d9 100644
--- a/version2/src/C/CommitPart.cc
+++ b/version2/src/C/CommitPart.cc
@@ -1,7 +1,7 @@
 #include "CommitPart.h"
 
 
-CommitPart::CommitPart(Slot* s, int64_t _machineId, int64_t _sequenceNumber, int64_t _transactionSequenceNumber, int _partNumber, Array<char>* _data, bool _isLastPart) :
+CommitPart::CommitPart(Slot *s, int64_t _machineId, int64_t _sequenceNumber, int64_t _transactionSequenceNumber, int _partNumber, Array<char> *_data, bool _isLastPart) :
 	Entry(s),
 	machineId(_machineId),
 	sequenceNumber(_sequenceNumber),
@@ -32,11 +32,11 @@ int CommitPart::getDataSize() {
 	return data->length();
 }
 
-Array<char> * CommitPart::getData() {
+Array<char> *CommitPart::getData() {
 	return data;
 }
 
-Pair<int64_t int32_t> * CommitPart::getPartId() {
+Pair<int64_t int32_t> *CommitPart::getPartId() {
 	return partId;
 }
 
@@ -60,18 +60,18 @@ int64_t CommitPart::getSequenceNumber() {
 	return sequenceNumber;
 }
 
-Entry* CommitPart_decode(Slot* s, ByteBuffer* bb) {
+Entry *CommitPart_decode(Slot *s, ByteBuffer *bb) {
 	int64_t machineId = bb->getLong();
 	int64_t sequenceNumber = bb->getLong();
 	int64_t transactionSequenceNumber = bb->getLong();
 	int partNumber = bb->getInt();
 	int dataSize = bb->getInt();
 	bool isLastPart = bb->get() == 1;
-	
+
 	// Get the data
-	Array<char> * data = new Array<char>(dataSize);
+	Array<char> *data = new Array<char>(dataSize);
 	bb->get(data);
-	
+
 	return new CommitPart(s, machineId, sequenceNumber, transactionSequenceNumber, partNumber, data, isLastPart);
 }
 
@@ -82,13 +82,13 @@ void CommitPart::encode(ByteBuffer bb) {
 	bb->putLong(transactionSequenceNumber);
 	bb->putInt(partNumber);
 	bb->putInt(data.length);
-	
+
 	if (isLastPart) {
 		bb->put((char)1);
 	} else {
 		bb->put((char)0);
 	}
-	
+
 	bb->put(data);
 }
 
diff --git a/version2/src/C/CommitPart.h b/version2/src/C/CommitPart.h
index 34341c7..6d17998 100644
--- a/version2/src/C/CommitPart.h
+++ b/version2/src/C/CommitPart.h
@@ -7,35 +7,35 @@
 #define CommitPart_MAX_NON_HEADER_SIZE 512
 
 class CommitPart : public Entry {
- private:
+private:
 	// Sequence number of the transaction this commit is for, -1 if not a cloud transaction
 	int64_t machineId;		// Machine Id of the device that made the commit
 	int64_t sequenceNumber;	// commit sequence number for this arbitrator
 	int64_t transactionSequenceNumber;
 	int32_t partNumber;	// Parts position in the
 	bool isLastPart;
-	Array<char> * data;
-	
-	Pair<int64_t int32_t> * partId;
-	Pair<int64_t, int64_t> * commitId;
-	
- public:
-	CommitPart(Slot *s, int64_t _machineId, int64_t _sequenceNumber, int64_t _transactionSequenceNumber, int _partNumber, Array<char>* _data, bool _isLastPart);
+	Array<char> *data;
+
+	Pair<int64_t int32_t> *partId;
+	Pair<int64_t, int64_t> *commitId;
+
+public:
+	CommitPart(Slot *s, int64_t _machineId, int64_t _sequenceNumber, int64_t _transactionSequenceNumber, int _partNumber, Array<char> *_data, bool _isLastPart);
 	int getSize();
 	void setSlot(Slot *s);
 	int getPartNumber();
 	int getDataSize();
-	Array<char> * getData();
-	Pair<int64_t int32_t> * getPartId();
-	Pair<int64_t, int64_t> * getCommitId();
+	Array<char> *getData();
+	Pair<int64_t int32_t> *getPartId();
+	Pair<int64_t, int64_t> *getCommitId();
 	bool isLastPart();
 	int64_t getMachineId();
 	int64_t getTransactionSequenceNumber();
 	int64_t getSequenceNumber();
 	void encode(ByteBuffer *bb);
 	char getType();
-	Entry* getCopy(Slot *s);
+	Entry *getCopy(Slot *s);
 };
 
-Entry * CommitPart_decode(Slot * s, ByteBuffer *bb);
+Entry *CommitPart_decode(Slot *s, ByteBuffer *bb);
 #endif
diff --git a/version2/src/C/Makefile b/version2/src/C/Makefile
index 2f8a91c..7603cc4 100644
--- a/version2/src/C/Makefile
+++ b/version2/src/C/Makefile
@@ -4,16 +4,14 @@ PHONY += directories
 MKDIR_P = mkdir -p
 OBJ_DIR = bin
 
-CPP_SOURCES := $(wildcard *.cc) $(wildcard AST/*.cc) $(wildcard ASTTransform/*.cc) $(wildcard Translator/*.cc) $(wildcard ASTAnalyses/*.cc) $(wildcard ASTAnalyses/Order/*.cc) $(wildcard ASTAnalyses/Encoding/*.cc) $(wildcard ASTAnalyses/Polarity/*.cc) $(wildcard Tuner/*.cc) $(wildcard Collections/*.cc) $(wildcard Backend/*.cc) $(wildcard Encoders/*.cc) $(wildcard Serialize/*.cc)
+CPP_SOURCES := $(wildcard *.cc)
 
-C_SOURCES := $(wildcard *.c) $(wildcard AST/*.c) $(wildcard ASTTransform/*.c) $(wildcard Translator/*.c) $(wildcard ASTAnalyses/*.c) $(wildcard ASTAnalyses/Order/*.c) $(wildcard ASTAnalyses/Encoding/*.c) $(wildcard ASTAnalyses/Polarity/*.c) $(wildcard Tuner/*.c) $(wildcard Collections/*.c) $(wildcard Backend/*.c) $(wildcard Encoders/*.c) $(wildcard Serialize/*.c)
-
-HEADERS := $(wildcard *.h) $(wildcard AST/*.h) $(wildcard ASTTransform/*.h) $(wildcard Translator/*.h) $(wildcard ASTAnalyses/*.h) $(wildcard ASTAnalyses/Order/*.h) $(wildcard ASTAnalyses/Encoding/*.h) $(wildcard ASTAnalyses/Polarity/*.h) $(wildcard Tuner/*.h) $(wildcard Collections/*.h) $(wildcard Backend/*.h) $(wildcard Encoders/*.h) $(wildcard Serialize/*.h)
+HEADERS := $(wildcard *.h)
 
 OBJECTS := $(CPP_SOURCES:%.cc=$(OBJ_DIR)/%.o) $(C_SOURCES:%.c=$(OBJ_DIR)/%.o)
 
 CFLAGS := -Wall -O0 -g
-CFLAGS += -IAST -IASTTransform -IASTAnalyses -IASTAnalyses/Polarity -IASTAnalyses/Order -IASTAnalyses/Encoding -ITranslator -ICollections -IBackend -I. -IEncoders -ITuner -ISerialize
+CFLAGS += -I.
 LDFLAGS := -ldl -lrt -rdynamic -g
 SHARED := -shared
 
@@ -31,18 +29,6 @@ directories: ${OBJ_DIR}
 
 ${OBJ_DIR}:
 	${MKDIR_P} ${OBJ_DIR}
-	${MKDIR_P} ${OBJ_DIR}/AST
-	${MKDIR_P} ${OBJ_DIR}/ASTAnalyses
-	${MKDIR_P} ${OBJ_DIR}/ASTAnalyses/Order
-	${MKDIR_P} ${OBJ_DIR}/ASTAnalyses/Encoding
-	${MKDIR_P} ${OBJ_DIR}/ASTAnalyses/Polarity
-	${MKDIR_P} ${OBJ_DIR}/ASTTransform
-	${MKDIR_P} ${OBJ_DIR}/Translator
-	${MKDIR_P} ${OBJ_DIR}/Tuner
-	${MKDIR_P} ${OBJ_DIR}/Collections
-	${MKDIR_P} ${OBJ_DIR}/Backend
-	${MKDIR_P} ${OBJ_DIR}/Encoders
-	${MKDIR_P} ${OBJ_DIR}/Serialize
 
 debug: CFLAGS += -DCONFIG_DEBUG
 debug: all
@@ -60,9 +46,6 @@ ${OBJ_DIR}/$(LIB_SO): $(OBJECTS)
 ${OBJ_DIR}/%.o: %.cc
 	$(CXX) -fPIC -c $< -o $@ $(CFLAGS) -Wno-unused-variable
 
-${OBJ_DIR}/%.o: %.c
-	$(CC) -fPIC -c $< -o $@ $(CFLAGS) -Wno-unused-variable
-
 -include $(OBJECTS:%=$OBJ_DIR/.%.d)
 
 PHONY += clean
diff --git a/version2/src/C/TransactionPart.cc b/version2/src/C/TransactionPart.cc
index b738715..2c94865 100644
--- a/version2/src/C/TransactionPart.cc
+++ b/version2/src/C/TransactionPart.cc
@@ -7,11 +7,11 @@ int TransactionPart::getSize() {
 	return (4 * sizeof(int64_t)) + (2 * sizeof(int32_t)) + (2 * sizeof(char)) + data.length;
 }
 
-void TransactionPart::setSlot(Slot* s) {
+void TransactionPart::setSlot(Slot *s) {
 	parentslot = s;
 }
 
-Pair<int64_t, int64_t>* TransactionPart::getTransactionId() {
+Pair<int64_t, int64_t> *TransactionPart::getTransactionId() {
 	return transactionId;
 }
 
@@ -19,7 +19,7 @@ int64_t TransactionPart::getArbitratorId() {
 	return arbitratorId;
 }
 
-Pair<int64_t int32_t>* TransactionPart::getPartId() {
+Pair<int64_t int32_t> *TransactionPart::getPartId() {
 	return partId;
 }
 
@@ -31,7 +31,7 @@ int TransactionPart::getDataSize() {
 	return data.length;
 }
 
-Array<char>* TransactionPart::getData() {
+Array<char> *TransactionPart::getData() {
 	return data;
 }
 
@@ -55,7 +55,7 @@ void TransactionPart::setSequenceNumber(int64_t _sequenceNumber) {
 	sequenceNumber = _sequenceNumber;
 }
 
-Entry* TransactionPart_decode(Slot* s, ByteBuffer* bb) {
+Entry *TransactionPart_decode(Slot *s, ByteBuffer *bb) {
 	int64_t sequenceNumber = bb->getLong();
 	int64_t machineId = bb->getLong();
 	int64_t arbitratorId = bb->getLong();
@@ -64,16 +64,16 @@ Entry* TransactionPart_decode(Slot* s, ByteBuffer* bb) {
 	int dataSize = bb->getInt();
 	bool isLastPart = (bb->get() == 1);
 	// Get the data
-	Array<char>* data = new Array<char>(dataSize);
+	Array<char> *data = new Array<char>(dataSize);
 	bb->get(data);
-	
+
 	TransactionPart returnTransactionPart = new TransactionPart(s, machineId, arbitratorId, clientLocalSequenceNumber, partNumber, data, isLastPart);
 	returnTransactionPart.setSequenceNumber(sequenceNumber);
-	
+
 	return returnTransactionPart;
 }
 
-void TransactionPart::encode(ByteBuffer* bb) {
+void TransactionPart::encode(ByteBuffer *bb) {
 	bb->put(Entry.TypeTransactionPart);
 	bb->putLong(sequenceNumber);
 	bb->putLong(machineId);
@@ -81,13 +81,13 @@ void TransactionPart::encode(ByteBuffer* bb) {
 	bb->putLong(clientLocalSequenceNumber);
 	bb->putInt(partNumber);
 	bb->putInt(data.length);
-	
+
 	if (isLastPart) {
 		bb->put((char)1);
 	} else {
 		bb->put((char)0);
 	}
-	
+
 	bb->put(data);
 }
 
@@ -95,9 +95,9 @@ char TransactionPart::getType() {
 	return TypeTransactionPart;
 }
 
-Entry * TransactionPart::getCopy(Slot *s) {
-	TransactionPart* copyTransaction = new TransactionPart(s, machineId, arbitratorId, clientLocalSequenceNumber, partNumber, data, isLastPart);
+Entry *TransactionPart::getCopy(Slot *s) {
+	TransactionPart *copyTransaction = new TransactionPart(s, machineId, arbitratorId, clientLocalSequenceNumber, partNumber, data, isLastPart);
 	copyTransaction.setSequenceNumber(sequenceNumber);
-	
+
 	return copyTransaction;
 }
diff --git a/version2/src/C/TransactionPart.h b/version2/src/C/TransactionPart.h
index 5e2d84a..d00a01a 100644
--- a/version2/src/C/TransactionPart.h
+++ b/version2/src/C/TransactionPart.h
@@ -7,21 +7,21 @@
 #define TransactionPart_MAX_NON_HEADER_SIZE 512
 
 class TransactionPart : public Entry {
- private:
+private:
 	int64_t sequenceNumber = -1;
 	int64_t machineId = -1;
 	int64_t arbitratorId = -1;
 	int64_t clientLocalSequenceNumber = -1;		// Sequence number of the transaction that this is a part of
 	int partNumber = -1;	// Parts position in the
 	bool isLastPart = false;
-	
-	Pair<int64_t, int64_t> * transactionId = NULL;
-	Pair<int64_t int32_t> * partId = NULL;
-	
-	Array<char> * data = NULL;
 
- public:
- TransactionPart(Slot *s, int64_t _machineId, int64_t _arbitratorId, int64_t _clientLocalSequenceNumber, int _partNumber, Array<char>* _data, bool _isLastPart) : Entry(s),
+	Pair<int64_t, int64_t> *transactionId = NULL;
+	Pair<int64_t int32_t> *partId = NULL;
+
+	Array<char> *data = NULL;
+
+public:
+	TransactionPart(Slot *s, int64_t _machineId, int64_t _arbitratorId, int64_t _clientLocalSequenceNumber, int _partNumber, Array<char> *_data, bool _isLastPart) : Entry(s),
 		sequenceNumber(-1),
 		machineId( _machineId),
 		arbitratorId(_arbitratorId),
@@ -31,16 +31,16 @@ class TransactionPart : public Entry {
 		transactionId(new Pair<int64_t, int64_t>(machineId, clientLocalSequenceNumber)),
 		partId(new Pair<int64_t int32_t>(clientLocalSequenceNumber, partNumber)),
 		data(_data) {
-		}
-	
+	}
+
 	int getSize();
 	void setSlot(Slot s);
-	Pair<int64_t, int64_t> * getTransactionId();
+	Pair<int64_t, int64_t> *getTransactionId();
 	int64_t getArbitratorId();
-	Pair<int64_t int32_t>* getPartId();
+	Pair<int64_t int32_t> *getPartId();
 	int getPartNumber();
 	int getDataSize();
-	Array<char>* getData();
+	Array<char> *getData();
 	bool isLastPart();
 	int64_t getMachineId();
 	int64_t getClientLocalSequenceNumber();
@@ -48,8 +48,8 @@ class TransactionPart : public Entry {
 	void setSequenceNumber(int64_t _sequenceNumber);
 	void encode(ByteBuffer *bb);
 	char getType();
-	Entry* getCopy(Slot *s);
+	Entry *getCopy(Slot *s);
 };
 
-Entry * TransactionPart_decode(Slot* s, ByteBuffer* bb);
+Entry *TransactionPart_decode(Slot *s, ByteBuffer *bb);
 #endif
diff --git a/version2/src/C/TransactionStatus.h b/version2/src/C/TransactionStatus.h
index b3c696d..7985645 100644
--- a/version2/src/C/TransactionStatus.h
+++ b/version2/src/C/TransactionStatus.h
@@ -10,22 +10,22 @@
 #define TransactionStatus_StatusNoEffect 10
 
 class TransactionStatus {
- private:
+private:
 	char status;
 	bool applicationReleased;
 	bool wasSentInChain;
 	int64_t transactionSequenceNumber;
 	int64_t arbitrator;
-	
- public:
- TransactionStatus(char _status, int64_t _arbitrator) :
-	status(_status),
+
+public:
+	TransactionStatus(char _status, int64_t _arbitrator) :
+		status(_status),
 		applicationReleased(false),
 		wasSentInChain(false),
 		transactionSequenceNumber(0),
 		arbitrator(_arbitrator) {
-		}
-	
+	}
+
 	char getStatus() { return status; }
 	void setStatus(char _status) { status = _status; }
 	int64_t getTransactionSequenceNumber() { return transactionSequenceNumber; }