X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fpmprof.h;h=fb926708f87af07d78f2dfc24378b916e2b6a623;hb=7b0f9d95248820bc70b820dd6b558de4a6713bae;hp=8aa269a6a8ce6f1012a6c4de85bfdd2cb785b4e4;hpb=be1c3f5fe382f10fb59d7e98da3fb00f254b5acc;p=lyx.git

diff --git a/src/support/pmprof.h b/src/support/pmprof.h
index 8aa269a6a8..fb926708f8 100644
--- a/src/support/pmprof.h
+++ b/src/support/pmprof.h
@@ -28,6 +28,9 @@
  *      hit: 96%, 4.36usec, count=6849, total=29.89msec
  *     miss: 3%, 60.65usec, count=271, total=16.43msec
  *
+ * * if DISABLE_PMPROF is defined before including pmprof.h, the
+ *   profiler is replaced by empty macros. This is useful for quickly
+ *   checking the overhead.
  *
  * ==== ABOUT PROFILING SCOPE:
  *
@@ -101,50 +104,47 @@
 #ifndef PMPROF_H
 #define PMPROF_H
 
-#ifdef _WIN32
-#include <windows.h>
+#if defined(DISABLE_PMPROF)
+
+// Make pmprof an empty shell
+#define PROFILE_THIS_BLOCK(a)
+#define PROFILE_CACHE_MISS(a)
+
 #else
-#include <sys/time.h>
-#endif
 
+#include <chrono>
 #include <iomanip>
 #include <iostream>
 
 
-#if defined(__GNUG__) && defined(_GLIBCXX_DEBUG)
-#error Profiling is not usable when run-time debugging is in effect
-#endif
-
-#ifdef _WIN32
-/* This function does not really returns the "time of day",
- * but it will suffice to evaluate elapsed times.
- */
-int gettimeofday(struct timeval * tv, struct timezone * /*tz*/)
-{
-	LARGE_INTEGER frequency, t;
-	QueryPerformanceFrequency(&frequency);
-	QueryPerformanceCounter(&t);
-
-	tv->tv_sec = long(t.QuadPart / frequency.QuadPart);
-	tv->tv_usec = long((1000000.0 * (t.QuadPart % frequency.QuadPart)) / frequency.QuadPart);
-	return 0;
-}
-
-#endif // _WIN32
+//#if defined(__GNUG__) && defined(_GLIBCXX_DEBUG)
+//#error Profiling is not usable when run-time debugging is in effect
+//#endif
 
 namespace {
 
-void dump(long long sec, long long usec, unsigned long long count) {
-	double const total = sec * 1000000 + usec;
-	std::cerr << std::fixed << std::setprecision(2)
-			  << total / count
-			  << "usec, count=" << count
-			  << ", total=" << total * 0.001 << "msec"
-			  << std::endl;
+void dumpTime(std::chrono::duration<double> value)
+{
+	double const val = value.count();
+	std::cerr << std::fixed << std::setprecision(2);
+	if (val >= 1.0)
+	 	std::cerr << val << " s";
+	else if (val >= 0.001)
+		std::cerr << val * 1000 << " ms";
+	else
+	 	std::cerr << val * 1000000 << " us";
 }
 
+void dump(std::chrono::duration<double> total, unsigned long long count) {
+	dumpTime(total / count);
+	std::cerr << ", count=" << count
+			  << ", total=";
+	dumpTime(total);
+	std::cerr << std::endl;
 }
 
+} // namespace
+
 
 /* Helper class for gathering data. Instantiate this as a static
  * variable, so that its destructor will be executed when the program
@@ -154,44 +154,39 @@ void dump(long long sec, long long usec, unsigned long long count) {
 
 class PMProfStat {
 public:
-	PMProfStat(char const * name) : name_(name), sec_(0), usec_(0), count_(0),
-                                    miss_sec_(0), miss_usec_(0), miss_count_(0) {}
+	PMProfStat(char const * name) : name_(name), count_(0), miss_count_(0) {}
 
 	~PMProfStat() {
 		if (count_>0) {
 			if (miss_count_ == 0) {
 				std::cerr << "#pmprof# " << name_ << ": ";
-				dump(sec_, usec_, count_);
+				dump(dur_, count_);
 			}
 			else {
 				std::cerr << "#pmprof# " << name_ << ": ";
-				dump(sec_ + miss_sec_, usec_ + miss_usec_, count_ + miss_count_);
+				dump(dur_ + miss_dur_, count_ + miss_count_);
 				std::cerr << "   hit: " << 100 * count_ / (count_ + miss_count_) << "%, ";
-				dump(sec_, usec_, count_);
+				dump(dur_, count_);
 				std::cerr << "  miss: " << 100 * miss_count_ / (count_ + miss_count_) << "%, ";
-				dump(miss_sec_, miss_usec_, miss_count_);
+				dump(miss_dur_, miss_count_);
 			}
 		}
 	}
 
-	void add(const long long s, const long long u, const bool hit) {
+	void add(std::chrono::duration<double> d, const bool hit) {
 		if (hit) {
-			sec_ += s;
-			usec_ += u;
+			dur_ += d;
 			count_++;
 		} else {
-			miss_sec_ += s;
-			miss_usec_ += u;
+			miss_dur_ += d;
 			miss_count_++;
 		}
 	}
 
 private:
 	char const * name_;
-	long long sec_, usec_;
-	unsigned long long count_;
-	long long miss_sec_, miss_usec_;
-	unsigned long long miss_count_;
+	std::chrono::duration<double> dur_, miss_dur_;
+	unsigned long long count_, miss_count_;
 };
 
 
@@ -204,19 +199,17 @@ class PMProfInstance {
 public:
 	PMProfInstance(PMProfStat * stat) : hit(true), stat_(stat)
 	{
-		gettimeofday(&before_, 0);
+		before_ = std::chrono::system_clock::now();
 	}
 
 	~PMProfInstance() {
-		gettimeofday(&after_, 0);
-		stat_->add(after_.tv_sec - before_.tv_sec,
-		           after_.tv_usec - before_.tv_usec, hit);
+		stat_->add(std::chrono::system_clock::now() - before_, hit);
 	}
 
 	bool hit;
 
 private:
-	timeval before_, after_;
+	std::chrono::system_clock::time_point before_;
 	PMProfStat * stat_;
 };
 
@@ -228,5 +221,6 @@ private:
 #define PROFILE_CACHE_MISS(a) \
 	PMPI_##a.hit = false;
 
+#endif // !defined(DISABLE_PMPROF)
 
 #endif