X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iotcloud.git;a=blobdiff_plain;f=version2%2Fsrc%2FC%2FTimingSingleton.h;h=8083c04a27075efa8111fa2d823487ba8641db29;hp=4983f81a16032b94ec1f1e3bce9e866730c7b3f8;hb=b93a811befa0833e1442ec558977bbb876e61177;hpb=a2f47bf7088deea524750936103f5a683fd97b79

diff --git a/version2/src/C/TimingSingleton.h b/version2/src/C/TimingSingleton.h
index 4983f81..8083c04 100644
--- a/version2/src/C/TimingSingleton.h
+++ b/version2/src/C/TimingSingleton.h
@@ -3,38 +3,37 @@
 #include <sys/time.h>
 
 class TimingSingleton {
- private:
-	static TimingSingleton singleton = new TimingSingleton( );
-	int64_t startTime = 0;
-	int64_t totalTime = 0;
-	
- TimingSingleton() : startTime(0),
-		totalTime(0) {
+private:
+	int64_t fldstartTime;
+	int64_t fldtotalTime;
+
+ public:
+	TimingSingleton() : fldstartTime(0),
+		fldtotalTime(0) {
 	}
 
 	int64_t nanoTime() {
 		int64_t time;
 		struct timeval tv;
 		gettimeofday(&tv, NULL);
-		return tv.tv_sec*1000000000+tv.tv_usec*1000;
+		return tv.tv_sec * 1000000000 + tv.tv_usec * 1000;
 	}
-	
- public:
+
 	void startTime() {
-		startTime = nanoTime();
+		fldstartTime = nanoTime();
 	}
-	
+
 	void endTime() {
-		totalTime += nanoTime() - startTime;
+		fldtotalTime += nanoTime() - fldstartTime;
 	}
 
 	int64_t getTime() {
-		return totalTime;
+		return fldtotalTime;
 	}
 };
 
 TimingSingleton t_singleton;
-TimingSingleton * TimingSingleton_getInstance() {
+TimingSingleton *TimingSingleton_getInstance() {
 	return &t_singleton;
 }
 #endif