更改ProfilerInstance的接口使其更友好

TinySTL/Profiler/Profiler.cpp

@@ -5,18 +5,23 @@ namespace TinySTL{
 
 		ProfilerInstance::TimePoint ProfilerInstance::startTime;
 		ProfilerInstance::TimePoint ProfilerInstance::finishTime;
+		ProfilerInstance::DurationTime ProfilerInstance::duringTime;
 
 		void ProfilerInstance::start(){
 			startTime = SteadyClock::now(); 
 		}
 		void ProfilerInstance::finish(){
 			finishTime = SteadyClock::now();
+			duringTime = std::chrono::duration_cast<DurationTime>(finishTime - startTime);
 		}
 		void ProfilerInstance::dumpDuringTime(std::ostream& os){
-			typedef std::chrono::duration<double> DurationTime;
-			DurationTime duringTime =
-				std::chrono::duration_cast<DurationTime>(finishTime - startTime);
 			os << "total " << duringTime.count() * 1000 << " milliseconds" << std::endl;
 		}
+		double ProfilerInstance::second(){
+			return duringTime.count();
+		}
+		double ProfilerInstance::millisecond(){
+			return duringTime.count() * 1000;
+		}
 	}
 }

TinySTL/Profiler/Profiler.h

@@ -15,13 +15,18 @@ namespace TinySTL{
 		public:
 			typedef std::chrono::steady_clock SteadyClock;
 			typedef SteadyClock::time_point TimePoint;
+			typedef std::chrono::duration<double> DurationTime;
 		private:
+			static DurationTime duringTime;
 			static TimePoint startTime;
 			static TimePoint finishTime;
 		public:
 			static void start();
 			static void finish();
 			static void dumpDuringTime(std::ostream& os = std::cout);
+
+			static double second();
+			static double millisecond();
 		};
 	}
 }

TinySTL/main.cpp

@@ -1,5 +1,7 @@
 #include <algorithm>
+#include <atomic>
 #include <cassert>
+#include <condition_variable>
 #include <iostream>
 #include <list>
 #include <mutex>
@@ -7,6 +9,8 @@
 #include <string>
 #include <vector>
 #include <iterator>
+#include <queue>
+#include <random>
 #include <thread>
 #include <utility>
 
@@ -17,31 +21,32 @@
 #include "Vector.h"
 #include "Profiler\Profiler.h"
 
+#include "BinarySearchTree.h"
+#include "CircularBuffer.h"
+#include "Deque.h"
 #include "Queue.h"
+#include "Stack.h"
 
+using namespace std;
 using namespace TinySTL::Profiler;
-class mycomparison
-{
-	bool reverse;
-public:
-	mycomparison(const bool& revparam = false)
-	{
-		reverse = revparam;
-	}
-	bool operator() (const int& lhs, const int&rhs) const
-	{
-		if (reverse) return (lhs>rhs);
-		else return (lhs<rhs);
-	}
-};
-int main(){
-	int array[] = { 1, 2, 3, 4, 5 };
-	TinySTL::vector<int> myvector(array, array+5);
 
-	std::cout << "myvector backwards:";
+int main(){
-	for (auto rit = myvector.crbegin(); rit != myvector.crend(); ++rit)
+	//TinySTL::deque<int> dq;
-		std::cout << ' ' << *rit;
+	//int array[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20 };
-	std::cout << '\n';
+	int array[] = { 5, 3, 2, 7, 6, 8, 8 };
+	TinySTL::binary_search_tree<int> bst;
+	bst.insert(array, array + 7);
+	//std::vector<int> vec;
+	TinySTL::vector<int> vec;
+	ProfilerInstance::start();
+	int i = 0;
+	for (; i != 1000000; ++i){
+		vec.push_back(i);
+	}
+	ProfilerInstance::finish();
+	ProfilerInstance::dumpDuringTime();
+	cout << ProfilerInstance::millisecond() << endl;
+
 	system("pause");
 	return 0;
 }