r3141 - in trunk/libmutil: include/libmutil source

[erik at minisip.org]

Author: erik
Date: 2007-01-22 22:24:38 +0100 (Mon, 22 Jan 2007)
New Revision: 3141

Modified:
   trunk/libmutil/include/libmutil/Timestamp.h
   trunk/libmutil/source/Timestamp.cxx
Log:

 * Timestamp seems to be broken. The stop, start and writeElapsed does not
   seem to cooperate with the other functions. I disable them for now, and
   make sure the old functionality works first.



Modified: trunk/libmutil/include/libmutil/Timestamp.h
===================================================================
--- trunk/libmutil/include/libmutil/Timestamp.h	2007-01-22 17:25:44 UTC (rev 3140)
+++ trunk/libmutil/include/libmutil/Timestamp.h	2007-01-22 21:24:38 UTC (rev 3141)
@@ -90,6 +90,7 @@
 		void save(std::string descr);
 		void print();
 		
+#if 0
 		/**
 		 * initialize the file and writes the init_data
 		 * in it.
@@ -117,7 +118,7 @@
 		 * @return the elapsed time as string
 		 */
 		std::string writeElapsedTime(std::string descr);
-
+#endif
 	private:
 		uint32_t index;
 		

Modified: trunk/libmutil/source/Timestamp.cxx
===================================================================
--- trunk/libmutil/source/Timestamp.cxx	2007-01-22 17:25:44 UTC (rev 3140)
+++ trunk/libmutil/source/Timestamp.cxx	2007-01-22 21:24:38 UTC (rev 3141)
@@ -119,14 +119,21 @@
 			if (ids[i]<0){
 				string val = strings[-ids[i]];
 	//			cerr << "will write "<<val<< endl;
-				file << "  " << val << ":\t" << values[i].tv_sec << ":\t" << values[i].tv_usec <<"\t"<< (values[i].tv_sec - temp.tv_sec)*1000000 + values[i].tv_usec - temp.tv_usec <<endl;
+				file << "  " << val << ":\t" 
+					<< values[i].tv_sec << ":\t" 
+					<< values[i].tv_usec <<"\t"
+					<< (values[i].tv_sec - temp.tv_sec)*1000000 + values[i].tv_usec - temp.tv_usec <<endl;
 			}else
-				file << "  " << id_names[ ids[i] ] << ":\t" << values[i].tv_sec << ":\t" << values[i].tv_usec <<"\t"<< (values[i].tv_sec - temp.tv_sec)*1000000 + values[i].tv_usec - temp.tv_usec <<endl;
+				file << "  " << id_names[ ids[i] ] << ":\t" 
+					<< values[i].tv_sec << ":\t" 
+					<< values[i].tv_usec <<"\t"
+					<< (values[i].tv_sec - temp.tv_sec)*1000000 + values[i].tv_usec - temp.tv_usec <<endl;
 			temp = values[i];
 		}
 	}
 #endif
 
+#if 0
 #ifdef WIN32
 	void Timestamp::init(std::string filename, std::string init_data){}
 #else
@@ -159,9 +166,9 @@
 	gettimeofday(&tim, NULL);
 	stopTime=tim.tv_sec + (tim.tv_usec/1000000.0);
 }
-
 #endif
 
+
 #ifdef WIN32
 	string Timestamp::writeElapsedTime(std::string descr){ return "1"; }
 #else
@@ -181,3 +188,6 @@
 	return s_elapsedTime;
 }
 #endif
+
+#endif
+