add the "has_pstate_level" logic to dynamically scale output size

5 files changed, 30 insertions, 2 deletions

diff --git a/cpu/abstract_cpu.cpp b/cpu/abstract_cpu.cpp
index b084327..8eb6d88 100644
--- a/cpu/abstract_cpu.cpp
+++ b/cpu/abstract_cpu.cpp
@@ -188,6 +188,23 @@ int abstract_cpu::has_cstate_level(int level)
 	return  0;
 }
 
+int abstract_cpu::has_pstate_level(int level)
+{
+	unsigned int i;
+
+	if (level == LEVEL_HEADER)
+		return 1;
+
+	if (level >= 0 && level < (int)pstates.size())
+		return 1;
+
+	for (i = 0; i < children.size(); i++)
+		if (children[i]) 
+			if (children[i]->has_pstate_level(level))
+				return 1;
+	return  0;
+}
+
 
 
 void abstract_cpu::insert_pstate(uint64_t freq, const char *human_name, uint64_t duration, int count)
diff --git a/cpu/cpu.cpp b/cpu/cpu.cpp
index 294b5f6..b375619 100644
--- a/cpu/cpu.cpp
+++ b/cpu/cpu.cpp
@@ -309,8 +309,9 @@ void display_cpu_pstates(const char *start, const char *end, const char *linesta
 				int first = 1;
 				ctr = 0;
 				linebuf[0] = 0;
-//				if (!_package->has_pstate_level(line))
-//					continue;
+
+				if (!_package->has_pstate_level(line))
+					continue;
 
 
 				printf("%s", linestart);
diff --git a/cpu/cpu.h b/cpu/cpu.h
index 9391b9e..7b3ea8e 100644
--- a/cpu/cpu.h
+++ b/cpu/cpu.h
@@ -87,6 +87,7 @@ public:
 
 	virtual char *  fill_pstate_line(int line_nr, char *buffer) { return buffer;};
 	virtual char *  fill_pstate_name(int line_nr, char *buffer) { return buffer;};
+	virtual int	has_pstate_level(int level);
 
 };
 
diff --git a/cpu/intel_cpus.cpp b/cpu/intel_cpus.cpp
index 7c99ee3..babf204 100644
--- a/cpu/intel_cpus.cpp
+++ b/cpu/intel_cpus.cpp
@@ -236,3 +236,11 @@ char * nhm_cpu::fill_pstate_line(int line_nr, char *buffer)
 	}
 	return cpu_linux::fill_pstate_line(line_nr, buffer);
 }
+
+
+int nhm_cpu::has_pstate_level(int level)
+{
+	if (level == LEVEL_C0)
+		return 1;
+	return cpu_linux::has_pstate_level(level);
+}
\ No newline at end of file
diff --git a/cpu/intel_cpus.h b/cpu/intel_cpus.h
index 267212d..529707e 100644
--- a/cpu/intel_cpus.h
+++ b/cpu/intel_cpus.h
@@ -54,6 +54,7 @@ public:
 
 	virtual char *  fill_pstate_name(int line_nr, char *buffer);
 	virtual char *  fill_pstate_line(int line_nr, char *buffer);
+	virtual int	has_pstate_level(int level);
 
 };