If unable to read clock tree, inform user

5 files changed, 24 insertions, 15 deletions

diff --git a/clocks.c b/clocks.c
index 80ff835..c413694 100644
--- a/clocks.c
+++ b/clocks.c
@@ -21,27 +21,33 @@ static char clk_dir_path[PATH_MAX];
 static char clk_name[NAME_MAX];
 static int  bold[MAX_LINES];
 
-void init_clock_details(void)
+int init_clock_details(void)
 {
 	char *path = debugfs_locate_mpoint();
 	struct stat buf;
 
-
 	if (path)
 		strcpy(clk_dir_path, path);
 	else {
-		fprintf(stderr, "powerdebug: Unable to locate debugfs mount"
-			" point. Mount debugfs and try again..\n");
-		exit(1);
+		create_selectedwindow();
+		sprintf(clock_lines[0], "Unable to locate debugfs mount point."
+			" Mount debugfs and try again..\n");
+		print_one_clock(0, clock_lines[0], 1, 0);
+		old_clock_line_no = 1;
+		return(1);
 	}
 	sprintf(clk_dir_path, "%s/clock", clk_dir_path);
 	strcpy(clk_dir_path, "/debug/clock"); // Hardcoded for testing..
 	if (stat(clk_dir_path, &buf)) {
-		fprintf(stderr, "powerdebug: Unable to find clock tree"
-			" information at %s. Exiting..\n", clk_dir_path);
-		exit(1);
+		create_selectedwindow();
+		sprintf(clock_lines[0], "Unable to find clock tree"
+			" information at %s.\n", clk_dir_path);
+		print_one_clock(0, clock_lines[0], 1, 0);
+		old_clock_line_no = 1;
+		return(1);
 	}
 	strcpy(clk_name, "");
+	return(0);
 }
 
 int get_int_from(char *file)
diff --git a/clocks.h b/clocks.h
index e916e15..d9df3da 100644
--- a/clocks.h
+++ b/clocks.h
@@ -22,7 +22,7 @@
 
 extern int maxy;
 
-#define MAX_LINES 80
+#define MAX_LINES 120
 
 struct clock_info {
 	char name[NAME_MAX];
diff --git a/display.c b/display.c
index 3dfa70f..22b605a 100644
--- a/display.c
+++ b/display.c
@@ -228,7 +228,7 @@ void print_clock_header(void)
 	print(clock_win, 54, 0, "Flags");
 	print(clock_win, 64, 0, "Rate");
 	print(clock_win, 72, 0, "Usecount");
-	print(clock_win, 84, 0, "ChildCount");
+	print(clock_win, 84, 0, "Children");
 	wattroff(clock_win, A_BOLD);
 	wrefresh(clock_win);
 }
diff --git a/powerdebug.c b/powerdebug.c
index 7fc1f14..72faa02 100644
--- a/powerdebug.c
+++ b/powerdebug.c
@@ -325,11 +325,13 @@ int main(int argc, char **argv)
 		}
 
 		if (selectedwindow == CLOCK) {
+			int ret = 0;
 			if (firsttime[CLOCK]) {
-				init_clock_details();
-				firsttime[CLOCK] = 0;
+				ret = init_clock_details();
+				if (!ret)
+					firsttime[CLOCK] = 0;
 			}
-			if (!dump) {
+			if (!ret && !dump) {
 				int hrow;
 
 				create_selectedwindow();
@@ -338,7 +340,8 @@ int main(int argc, char **argv)
 								enter_hit);
 				highlighted_row = hrow;
 				enter_hit = 0;
-			} else
+			}
+			if (!ret && dump)
 				read_and_dump_clock_info(verbose);
 		}
 
diff --git a/powerdebug.h b/powerdebug.h
index 4ed450d..75171b0 100644
--- a/powerdebug.h
+++ b/powerdebug.h
@@ -65,7 +65,7 @@ extern int  read_and_print_clock_info(int verbose, int hrow, int selected);
 extern void print_clock_info(int verbose, int hrow, int selected);
 extern void get_sensor_info(char *path, char *name, char *sensor, int verbose);
 extern void print_string_val(char *name, char *val);
-extern void init_clock_details(void);
+extern int  init_clock_details(void);
 extern void print_clock_header(void);
 extern void print_sensor_header(void);
 extern void print_one_clock(int line, char *str, int bold, int highlight);