Implements add_logo in report generator Signed-off-by: Alexandra Yates <alexandra.yates(a)linux.intel.com&gt; --- src/report/report-formatter.h | 5 +++++ src/report/report-maker.cpp | 21 +++++++++++++++++++++ src/report/report-maker.h | 5 +++++ 3 files changed, 31 insertions(+) diff --git a/src/report/report-formatter.h b/src/report/report-formatter.h index d532f30..449fae7 100644 --- a/src/report/report-formatter.h +++ b/src/report/report-formatter.h @@ -60,6 +60,11 @@ public: /* For quad-colouring CPU tables in HTML */ virtual void set_cpu_number(int nr) {} + + /* *** Report Style *** */ + virtual void add_logo() {} + virtual void add_header() {} + virtual void end_hheader() {} }; #endif /* _REPORT_FORMATTER_H_ */ diff --git a/src/report/report-maker.cpp b/src/report/report-maker.cpp index 59e83d9..8eba618 100644 --- a/src/report/report-maker.cpp +++ b/src/report/report-maker.cpp @@ -329,3 +329,24 @@ report_maker::end_paragraph() paragraph_opened = false; formatter->end_paragraph(); } + + +/* *** Report Style *** */ +void +report_maker::add_logo() +{ + formatter->add_logo(); +} + +void +report_maker::add_header() +{ + formatter->add_header(); +} + +void +report_maker::end_hheader() +{ + formatter->end_hheader(); +} + diff --git a/src/report/report-maker.h b/src/report/report-maker.h index 75e0d06..fab9589 100644 --- a/src/report/report-maker.h +++ b/src/report/report-maker.h @@ -192,6 +192,11 @@ public: void set_cpu_number(int nr); + /* *** Report Style *** */ + void add_header(); + void end_hheader(); + void add_logo(); + private: void setup_report_formatter(); -- 1.7.9.5

Calls to add a title and add a division from report maker using report object to the generated report. Signed-off-by: Alexandra Yates <alexandra.yates(a)linux.intel.com&gt; --- src/report/report-formatter.h | 3 +++ src/report/report-maker.cpp | 18 ++++++++++++++++++ src/report/report-maker.h | 3 +++ 3 files changed, 24 insertions(+) diff --git a/src/report/report-formatter.h b/src/report/report-formatter.h index 449fae7..78382d8 100644 --- a/src/report/report-formatter.h +++ b/src/report/report-formatter.h @@ -65,6 +65,9 @@ public: virtual void add_logo() {} virtual void add_header() {} virtual void end_hheader() {} + virtual void add_div(struct tag_attr *div_attr) {} + virtual void end_div() {} + virtual void add_title(struct tag_attr *att_title, const char *title) {} }; #endif /* _REPORT_FORMATTER_H_ */ diff --git a/src/report/report-maker.cpp b/src/report/report-maker.cpp index 8eba618..ff87f1e 100644 --- a/src/report/report-maker.cpp +++ b/src/report/report-maker.cpp @@ -350,3 +350,21 @@ report_maker::end_hheader() formatter->end_hheader(); } +void +report_maker::add_title(struct tag_attr *att_title, const char *title) +{ + formatter->add_title(att_title, title); +} + +void +report_maker::add_div(struct tag_attr * div_attr) +{ + formatter->add_div(div_attr); +} + +void +report_maker::end_div() +{ + formatter->end_div(); +} + diff --git a/src/report/report-maker.h b/src/report/report-maker.h index fab9589..0c17635 100644 --- a/src/report/report-maker.h +++ b/src/report/report-maker.h @@ -196,6 +196,9 @@ public: void add_header(); void end_hheader(); void add_logo(); + void add_div(struct tag_attr *div_attr); + void end_div(); + void add_title(struct tag_attr *att_title, const char *title); private: void setup_report_formatter(); -- 1.7.9.5

Generates the html tags to add navigation and summary including css attribute support. Signed-off-by: Alexandra Yates <alexandra.yates(a)linux.intel.com&gt; --- src/report/report-formatter-html.cpp | 18 ++++++++++++++++++ src/report/report-formatter-html.h | 2 ++ 2 files changed, 20 insertions(+) diff --git a/src/report/report-formatter-html.cpp b/src/report/report-formatter-html.cpp index db21c8c..8038181 100644 --- a/src/report/report-formatter-html.cpp +++ b/src/report/report-formatter-html.cpp @@ -514,3 +514,21 @@ report_formatter_html::add_title(struct tag_attr *title_att, const char *title) addf_exact("<h2 class=\"%s\"> %s </h2>\n", title_att->css_class, title); } +void +report_formatter_html::add_navigation() +{ + add_exact("<br/><nav id=\"main_menu\"> </nav>\n"); +} + +void +report_formatter_html::add_summary_list(std::string *list, int size) +{ + int i; + add_exact("<div><br/> <ul>\n"); + for (i=0; i < size; i+=2){ + addf_exact("<li class=\"summary_list\"> <b> %s </b> %s </li>", + list[i].c_str(), list[i+1].c_str()); + } + add_exact("</ul> </div> <br />\n"); +} + diff --git a/src/report/report-formatter-html.h b/src/report/report-formatter-html.h index 0f508d3..261e0dd 100644 --- a/src/report/report-formatter-html.h +++ b/src/report/report-formatter-html.h @@ -89,6 +89,8 @@ public: void add_div(struct tag_attr *div_attr); void end_div(); void add_title(struct tag_attr *title_att, const char *title); + void add_navigation(); + void add_summary_list(std::string *list, int size); private: /* Document structure related functions */ -- 1.7.9.5

Implements csv report functionality to add navigation and summary on the csv report. Signed-off-by: Alexandra Yates <alexandra.yates(a)linux.intel.com&gt; --- src/report/report-formatter-csv.cpp | 22 ++++++++++++++++++++-- src/report/report-formatter-csv.h | 6 +++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/report/report-formatter-csv.cpp b/src/report/report-formatter-csv.cpp index bd9dfd3..2981940 100644 --- a/src/report/report-formatter-csv.cpp +++ b/src/report/report-formatter-csv.cpp @@ -189,10 +189,10 @@ report_formatter_csv::end_paragraph() /* ************************************************************************ */ -std::string +string report_formatter_csv::escape_string(const char *str) { - std::string res; + string res; assert(str); @@ -261,3 +261,21 @@ report_formatter_csv::add_title(struct tag_attr *title_att, const char *title) add_exact("____________________________________________________________________\n"); addf_exact(" * * * %s * * *\n", title); } + +void +report_formatter_csv::add_navigation() +{ + /* No nav in csv - thinking on table of contents */ +} + +void +report_formatter_csv::add_summary_list(string *list, int size) +{ + int i; + add_exact("\n"); + for (i=0; i < size; i+=2){ + addf_exact("%s %s,", list[i].c_str(), list[i+1].c_str()); + } + add_exact("\n"); +} + diff --git a/src/report/report-formatter-csv.h b/src/report/report-formatter-csv.h index 2c1c0fd..daf723e 100644 --- a/src/report/report-formatter-csv.h +++ b/src/report/report-formatter-csv.h @@ -42,6 +42,8 @@ /* Whether to escape with quotes empty cell values with spaces */ /*#define REPORT_CSV_SPACE_NEED_QUOTES*/ +using namespace std; + /* ************************************************************************ */ class report_formatter_csv: public report_formatter_string_base @@ -78,13 +80,15 @@ public: void add_div(struct tag_attr *div_attr); void end_div(); void add_title(struct tag_attr *title_att, const char *title); + void add_navigation(); + void add_summary_list(string *list, int size); private: void add_doc_header(); void add_quotes(); - std::string escape_string(const char *str); + string escape_string(const char *str); bool csv_need_quotes; size_t table_cell_number, text_start; -- 1.7.9.5

Generates a modular table when using the report maker object. It passess table_size, css_attributes, and data. The data is stored in a single dimensional array using row major order. Signed-off-by: Alexandra Yates <alexandra.yates(a)linux.intel.com&gt; --- src/report/report-formatter.h | 3 +++ src/report/report-maker.cpp | 7 +++++++ src/report/report-maker.h | 2 ++ 3 files changed, 12 insertions(+) diff --git a/src/report/report-formatter.h b/src/report/report-formatter.h index 5e5b8d7..4fe2c42 100644 --- a/src/report/report-formatter.h +++ b/src/report/report-formatter.h @@ -71,6 +71,9 @@ public: virtual void add_title(struct tag_attr *att_title, const char *title) {} virtual void add_navigation() {} virtual void add_summary_list(string *list, int size) {} + virtual void add_table(string *system_data, + struct table_size *size, + struct table_attributes *tb_attr) {} }; #endif /* _REPORT_FORMATTER_H_ */ diff --git a/src/report/report-maker.cpp b/src/report/report-maker.cpp index ccfbec4..031b692 100644 --- a/src/report/report-maker.cpp +++ b/src/report/report-maker.cpp @@ -380,3 +380,10 @@ report_maker::add_summary_list(string *list, int size) formatter->add_summary_list(list, size); } +void +report_maker::add_table(string *system_data, struct table_size *size, + struct table_attributes *tb_attr) +{ + formatter->add_table(system_data, size, tb_attr); +} + diff --git a/src/report/report-maker.h b/src/report/report-maker.h index 6e5f4d1..e75c99a 100644 --- a/src/report/report-maker.h +++ b/src/report/report-maker.h @@ -201,6 +201,8 @@ public: void add_title(struct tag_attr *att_title, const char *title); void add_navigation(); void add_summary_list(string *list, int size); + void add_table(string *system_data, struct table_size *size, + struct table_attributes *tb_attr); private: void setup_report_formatter(); -- 1.7.9.5

Reports PowerTop logo and the system information table with the redesign css and organization. Signed-off-by: Alexandra Yates <alexandra.yates(a)linux.intel.com&gt; --- src/Makefile.am | 1 + src/report/report-data-html.cpp | 25 +++++++++++ src/report/report-data-html.h | 16 +++++-- src/report/report-formatter-csv.cpp | 13 +++--- src/report/report-formatter-csv.h | 3 +- src/report/report-formatter-html.cpp | 8 ++-- src/report/report-formatter-html.h | 3 +- src/report/report-formatter.h | 1 - src/report/report-maker.cpp | 5 +-- src/report/report-maker.h | 3 +- src/report/report.cpp | 81 ++++++++++++++++++++-------------- 11 files changed, 100 insertions(+), 59 deletions(-) create mode 100644 src/report/report-data-html.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 19950a1..e19b606 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,6 +31,7 @@ powertop_SOURCES = parameters/persistent.cpp parameters/learn.cpp parameters/par report/report-formatter-base.cpp report/report-formatter-base.h \ report/report-formatter-csv.cpp report/report-formatter-csv.h \ report/report-formatter-html.cpp report/report-formatter-html.h \ + report/report-data-html.cpp report/report-data-html.h \ main.cpp css.h powertop.css cpu/intel_gpu.cpp \ cpu/rapl/rapl_interface.cpp cpu/cpu_rapl_device.cpp cpu/rapl/rapl_interface.h\ cpu/dram_rapl_device.cpp devices/gpu_rapl_device.cpp cpu/cpu_rapl_device.h \ diff --git a/src/report/report-data-html.cpp b/src/report/report-data-html.cpp new file mode 100644 index 0000000..e150961 --- /dev/null +++ b/src/report/report-data-html.cpp @@ -0,0 +1,25 @@ +#include "report-data-html.h" + +void init_div(struct tag_attr *div_attr, const char *css_class, const char *css_id) +{ + div_attr->css_class=css_class; + div_attr->css_id=css_id; +} + +void +init_top_table_attr(struct table_attributes *table_css, int rows, int cols){ + table_css->pos_table_title=L; + table_css->table_class="emphasis1"; + table_css->th_class="table_sysinfo"; + table_css->td_class=""; + table_css->tr_class=""; + table_css->title_mod=0; + table_css->rows=rows; + table_css->cols=cols; +} + +void init_title_attr(struct tag_attr *title_attr) +{ + title_attr->css_class="content_title"; + title_attr->css_id=""; +} diff --git a/src/report/report-data-html.h b/src/report/report-data-html.h index 282d8b5..7db7d4b 100644 --- a/src/report/report-data-html.h +++ b/src/report/report-data-html.h @@ -12,11 +12,19 @@ struct table_attributes { const char *th_class; position pos_table_title; int title_mod; -}; - - -struct table_size { int rows; int cols; }; +/* Definition of css atributes for the cases that apply to powertop + * html report + * */ + +void +init_div(struct tag_attr *div_attr, const char *css_class, const char *css_id); + +void +init_top_table_attr(struct table_attributes *table_css, int rows, int cols); + +void +init_title_attr(struct tag_attr *title_attr); diff --git a/src/report/report-formatter-csv.cpp b/src/report/report-formatter-csv.cpp index b9336ad..086cc79 100644 --- a/src/report/report-formatter-csv.cpp +++ b/src/report/report-formatter-csv.cpp @@ -281,28 +281,27 @@ report_formatter_csv::add_summary_list(string *list, int size) } void -report_formatter_csv::add_table(string *system_data, struct table_size *size, - struct table_attributes* tb_attr) +report_formatter_csv::add_table(string *system_data, struct table_attributes* tb_attr) { int i, j; int offset=0; string tmp_str=""; int empty_row=0; add_exact("\n"); - for (i=0; i < size->rows; i++){ - for (j=0; j < size->cols; j++){ - offset = i * (size->cols) + j; + for (i=0; i < tb_attr->rows; i++){ + for (j=0; j < tb_attr->cols; j++){ + offset = i * (tb_attr->cols) + j; tmp_str=system_data[offset]; if(tmp_str == "&nbsp;") empty_row+=1; else{ addf_exact("%s", system_data[offset].c_str()); - if(j < (size->cols - 1)) + if(j < (tb_attr->cols - 1)) add_exact(","); } } - if(empty_row < size->cols) + if(empty_row < tb_attr->cols) add_exact("\n"); empty_row=0; } diff --git a/src/report/report-formatter-csv.h b/src/report/report-formatter-csv.h index 994b765..198f597 100644 --- a/src/report/report-formatter-csv.h +++ b/src/report/report-formatter-csv.h @@ -82,8 +82,7 @@ public: void add_title(struct tag_attr *title_att, const char *title); void add_navigation(); void add_summary_list(string *list, int size); - void add_table(string *system_data, struct table_size *size, - struct table_attributes *tb_attr); + void add_table(string *system_data, struct table_attributes *tb_attr); private: void add_doc_header(); diff --git a/src/report/report-formatter-html.cpp b/src/report/report-formatter-html.cpp index 5920d9c..fa758ec 100644 --- a/src/report/report-formatter-html.cpp +++ b/src/report/report-formatter-html.cpp @@ -534,7 +534,7 @@ report_formatter_html::add_summary_list(string *list, int size) void -report_formatter_html::add_table(string *system_data, struct table_size *size, struct table_attributes* tb_attr) +report_formatter_html::add_table(string *system_data, struct table_attributes* tb_attr) { int i, j; int offset=0; @@ -545,14 +545,14 @@ report_formatter_html::add_table(string *system_data, struct table_size *size, s else addf_exact("<table class=\"%s\">\n", tb_attr->table_class); - for (i=0; i < size->rows; i++){ + for (i=0; i < tb_attr->rows; i++){ if (tb_attr->tr_class == empty) add_exact("<tr> "); else addf_exact("<tr class=\"%s\"> ", tb_attr->tr_class); - for (j=0; j < size->cols; j++){ - offset = i * (size->cols) + j; + for (j=0; j < tb_attr->cols; j++){ + offset = i * (tb_attr->cols) + j; if (tb_attr->pos_table_title == T && i==0) addf_exact("<th class=\"%s\"> %s </th> ", diff --git a/src/report/report-formatter-html.h b/src/report/report-formatter-html.h index d625ced..1ad1c68 100644 --- a/src/report/report-formatter-html.h +++ b/src/report/report-formatter-html.h @@ -94,8 +94,7 @@ public: void add_title(struct tag_attr *title_att, const char *title); void add_navigation(); void add_summary_list(string *list, int size); - void add_table(string *system_data, struct table_size *size, - struct table_attributes *tb_attr); + void add_table(string *system_data, struct table_attributes *tb_attr); private: /* Document structure related functions */ diff --git a/src/report/report-formatter.h b/src/report/report-formatter.h index 4fe2c42..7984dc5 100644 --- a/src/report/report-formatter.h +++ b/src/report/report-formatter.h @@ -72,7 +72,6 @@ public: virtual void add_navigation() {} virtual void add_summary_list(string *list, int size) {} virtual void add_table(string *system_data, - struct table_size *size, struct table_attributes *tb_attr) {} }; diff --git a/src/report/report-maker.cpp b/src/report/report-maker.cpp index 031b692..0fd133c 100644 --- a/src/report/report-maker.cpp +++ b/src/report/report-maker.cpp @@ -381,9 +381,8 @@ report_maker::add_summary_list(string *list, int size) } void -report_maker::add_table(string *system_data, struct table_size *size, - struct table_attributes *tb_attr) +report_maker::add_table(string *system_data, struct table_attributes *tb_attr) { - formatter->add_table(system_data, size, tb_attr); + formatter->add_table(system_data, tb_attr); } diff --git a/src/report/report-maker.h b/src/report/report-maker.h index e75c99a..f6897cf 100644 --- a/src/report/report-maker.h +++ b/src/report/report-maker.h @@ -201,8 +201,7 @@ public: void add_title(struct tag_attr *att_title, const char *title); void add_navigation(); void add_summary_list(string *list, int size); - void add_table(string *system_data, struct table_size *size, - struct table_attributes *tb_attr); + void add_table(string *system_data, struct table_attributes *tb_attr); private: void setup_report_formatter(); diff --git a/src/report/report.cpp b/src/report/report.cpp index c018bb1..3b46f58 100644 --- a/src/report/report.cpp +++ b/src/report/report.cpp @@ -35,6 +35,7 @@ #include <string.h> #include <malloc.h> #include <unistd.h> +#include "report-data-html.h" using namespace std; @@ -101,49 +102,61 @@ static void system_info(void) { string str, str2, str3; - report.begin_section(SECTION_SYSINFO); - report.add_header("System Information"); - report.begin_table(); - report.begin_row(ROW_SYSINFO); - report.begin_cell(CELL_SYSINFO); - report.add("PowerTOP Version"); - report.begin_cell(); - report.add(POWERTOP_VERSION); + /* div attr css_class and css_id */ + tag_attr div_attr; + init_div(&div_attr, "sys_info", ""); + + /* Set Table attributes, rows, and cols */ + table_attributes sys_table; + init_top_table_attr(&sys_table, 5, 2); + + /* Set Title attributes */ + tag_attr title_attr; + init_title_attr(&title_attr); + + /* Set array of data in row Major order */ + string system_data[sys_table.rows * sys_table.cols]; + system_data[0]=__("PowerTOP Version"); + system_data[1]=POWERTOP_VERSION; str = read_sysfs_string("/proc/version"); - report.begin_row(ROW_SYSINFO); - report.begin_cell(); - report.add("Kernel Version"); - report.begin_cell(); - report.add(str.c_str()); + size_t found = str.find(" "); + found = str.find(" ", found+1); + found = str.find(" ", found+1); + str = str.substr(0,found); + system_data[2]=__("Kernel Version"); + system_data[3]=str.c_str(); str = read_sysfs_string("/sys/devices/virtual/dmi/id/board_vendor"); - str2 = read_sysfs_string("/sys/devices/virtual/dmi/id/board_name"); - str3 = read_sysfs_string("/sys/devices/virtual/dmi/id/product_version"); - report.begin_row(ROW_SYSINFO); - report.begin_cell(); - report.add("System Name"); - report.begin_cell(); - report.addf("%s %s %s", str.c_str(), str2.c_str(), str3.c_str()); - + system_data[4]=__("System Name"); + system_data[5]= str.c_str(); + str = read_sysfs_string("/sys/devices/virtual/dmi/id/board_name"); + system_data[5].append(str.c_str()); + str = read_sysfs_string("/sys/devices/virtual/dmi/id/product_version"); + system_data[5].append(str.c_str()); str = cpu_model(); - report.begin_row(ROW_SYSINFO); - report.begin_cell(); - report.add("CPU Information"); - report.begin_cell(); - report.addf("%lix %s", sysconf(_SC_NPROCESSORS_ONLN), str.c_str()); + system_data[6]=__("CPU Information"); + system_data[7]= sysconf(_SC_NPROCESSORS_ONLN); + system_data[7].append(str.c_str()); str = read_sysfs_string("/etc/system-release"); if (str.length() < 1) - str = read_sysfs_string("/etc/redhat-release"); + str = read_sysfs_string("/etc/redhat-release"); if (str.length() < 1) - str = read_os_release("/etc/os-release"); - - report.begin_row(ROW_SYSINFO); - report.begin_cell(); - report.add("OS Information"); - report.begin_cell(); - report.add(str.c_str()); + str = read_os_release("/etc/os-release"); + + system_data[8]=__("OS Information"); + system_data[9]=str; + + /* Report Output */ + report.add_header(); + report.add_logo(); + report.add_div(&div_attr); + report.add_title(&title_attr, __("System Information")); + report.add_table(system_data, &sys_table); + report.end_div(); + report.end_hheader(); + report.add_navigation(); } void init_report_output(char *filename_str, int iterations) -- 1.7.9.5

Generates html and csv report with redesign summary preserving translation macros. Signed-off-by: Alexandra Yates <alexandra.yates(a)linux.intel.com&gt; --- src/process/do_process.cpp | 122 ++++++++++++++++++++++------------- src/report/report-data-html.cpp | 25 +++++++ src/report/report-data-html.h | 13 ++++ src/report/report-formatter-csv.cpp | 4 +- 4 files changed, 118 insertions(+), 46 deletions(-) diff --git a/src/process/do_process.cpp b/src/process/do_process.cpp index d81a2a9..df7d646 100644 --- a/src/process/do_process.cpp +++ b/src/process/do_process.cpp @@ -29,6 +29,7 @@ #include "processdevice.h" #include "../lib.h" #include "../report/report.h" +#include "../report/report-data-html.h" #include "../report/report-maker.h" #include "../devlist.h" @@ -235,7 +236,7 @@ void perf_process_bundle::handle_trace_point(void *trace, int cpu, uint64_t time field = pevent_find_any_field(event, "next_comm"); if (!field || !(field->flags & FIELD_IS_STRING)) return; /* ?? */ - + next_comm = get_pevent_field_str(trace, event, field); ret = pevent_get_field_val(NULL, event, "next_pid", &rec, &val, 0); @@ -294,8 +295,8 @@ void perf_process_bundle::handle_trace_point(void *trace, int cpu, uint64_t time } else if (strcmp(event->name, "sched_wakeup") == 0) { class power_consumer *from = NULL; - class process *dest_proc = NULL; - class process *from_proc = NULL; + class process *dest_proc = NULL; + class process *from_proc = NULL; const char *comm; int flags; int pid; @@ -324,7 +325,7 @@ void perf_process_bundle::handle_trace_point(void *trace, int cpu, uint64_t time field = pevent_find_any_field(event, "comm"); if (!field || !(field->flags & FIELD_IS_STRING)) - return; + return; comm = get_pevent_field_str(trace, event, field); @@ -633,7 +634,7 @@ void perf_process_bundle::handle_trace_point(void *trace, int cpu, uint64_t time ret = pevent_get_field_val(NULL, event, "dev", &rec, &val, 0); if (ret < 0) - + return; dev = (int)val; @@ -787,7 +788,7 @@ void process_update_display(void) WINDOW *win; double pw; int tl; - int tlt; + int tlt; int tlr; int show_power; @@ -979,7 +980,7 @@ void report_process_update_display(void) report.begin_cell(CELL_SOFTWARE_POWER); report.add(power); } - + report.begin_cell(CELL_SOFTWARE_POWER); report.add(usage); report.begin_cell(CELL_SOFTWARE_POWER); @@ -1002,39 +1003,61 @@ void report_summary(void) unsigned int i; unsigned int total; int show_power; + int rows, cols, idx; sort(all_power.begin(), all_power.end(), power_cpu_sort); show_power = global_power_valid(); - report.begin_section(SECTION_SUMMARY); - report.add_header(__("Power Consumption Summary")); - report.begin_paragraph(); - report.addf("%.1f %s, %.1f %s, %.1f %s, %.1f %s %.1f%% %s", - total_wakeups(), __("wakeups/second"), - total_gpu_ops(), __("GPU ops/second"), - total_disk_hits(), __("VFS ops/sec"), - total_xwakes(), __("GFX wakes/sec and"), - total_cpu_time() * 100, __("CPU use")); - - report.begin_table(TABLE_WIDE); - report.begin_row(); - if (show_power) { - report.begin_cell(CELL_SUMMARY_HEADER); - report.add(__("Power est.")); - } + /* div attr css_class and css_id */ + tag_attr div_attr; + init_div(&div_attr, "summary", ""); - report.begin_cell(CELL_SUMMARY_HEADER); - report.add(__("Usage")); - report.begin_cell(CELL_SUMMARY_HEADER); - report.add(__("Events/s")); - report.begin_cell(CELL_SUMMARY_CATEGORY); - report.add(__("Category")); - report.begin_cell(CELL_SUMMARY_DESCRIPTION); - report.add(__("Description")); + /* Set table attributes, rows, and cols */ + cols=4; + if (show_power) + cols=5; + idx=cols; total = all_power.size(); if (total > 10) total = 10; + rows=total+1; + table_attributes std_table_css; + init_std_table_attr(&std_table_css, rows, cols); + + /* Set title attributes */ + tag_attr title_attr; + init_title_attr(&title_attr); + + /* Set array for summary */ + int summary_size =12; + string summary[summary_size]; + summary[0]=__("Target:"); + summary[1]=__("1 units/s"); + summary[2]=__("System: "); + summary[3]= double_to_string(total_wakeups()); + summary[3].append(__(" wakeup/s")); + summary[4]=__("CPU: "); + summary[5]= double_to_string(total_cpu_time()*100); + summary[5].append(__("\% usage")); + summary[6]=__("GPU:"); + summary[7]=double_to_string(total_gpu_ops()); + summary[7].append(__(" ops/s")); + summary[8]=__("GFX:"); + summary[9]=double_to_string(total_xwakes()); + summary[9].append(__(" wakeups/s")); + summary[10]=__("VFS:"); + summary[11]= double_to_string(total_disk_hits()); + summary[11].append(__(" ops/s")); + + /* Set array of data in row Major order */ + string summary_data[cols * (rows+1)]; + summary_data[0]=__("Usage"); + summary_data[1]=__("Events/s"); + summary_data[2]=__("Category"); + summary_data[3]=__("Description"); + if (show_power) + summary_data[4]=__("PW Estimate"); for (i = 0; i < all_power.size(); i++) { char power[16]; @@ -1052,7 +1075,7 @@ void report_summary(void) break; if (all_power[i]->events() == 0 && all_power[i]->usage() == 0 && - all_power[i]->Witts() == 0) + all_power[i]->Witts() == 0) break; usage[0] = 0; @@ -1070,21 +1093,30 @@ void report_summary(void) else if (all_power[i]->events() <= 0.3) sprintf(events, "%5.2f", all_power[i]->events()); - report.begin_row(ROW_SUMMARY); - if (show_power) { - report.begin_cell(CELL_SUMMARY_ITEM); - report.add(power); - } + summary_data[idx]=string(usage); + idx+=1; - report.begin_cell(CELL_SUMMARY_ITEM); - report.add(usage); - report.begin_cell(CELL_SUMMARY_ITEM); - report.add(events); - report.begin_cell(); - report.add(name); - report.begin_cell(); - report.add(pretty_print(all_power[i]->description(), descr, 128)); + summary_data[idx]=string(events); + idx+=1; + + summary_data[idx]=string(name); + idx+=1; + + summary_data[idx]=string(pretty_print(all_power[i]->description(), descr, 128)); + idx+=1; + + if (show_power){ + summary_data[idx]=power; + idx+=1; + } } + + /* Report Summary for all */ + report.add_summary_list(summary, summary_size); + report.add_div(&div_attr); + report.add_title(&title_attr, __("Top 10 Power Consumers")); + report.add_table(summary_data, &std_table_css); + report.end_div(); } diff --git a/src/report/report-data-html.cpp b/src/report/report-data-html.cpp index e150961..ed0d692 100644 --- a/src/report/report-data-html.cpp +++ b/src/report/report-data-html.cpp @@ -23,3 +23,28 @@ void init_title_attr(struct tag_attr *title_attr) title_attr->css_class="content_title"; title_attr->css_id=""; } + +void init_std_table_attr(struct table_attributes *table_css, int rows, int cols){ + table_css->table_class="emphasis2"; + table_css->tr_class="emph1"; + table_css->th_class="emph_title"; + table_css->td_class=""; + table_css->pos_table_title=T; + table_css->title_mod=0; + table_css->rows=rows; + table_css->cols=cols; +} + +/* Other Helper Functions */ +string +double_to_string(double dval) +{ + ostringstream dtmp; + string str; + dtmp << dval; + str= dtmp.str(); + str = str.substr(0, str.find(".")+2); + return str; +} + + diff --git a/src/report/report-data-html.h b/src/report/report-data-html.h index 7db7d4b..524cd24 100644 --- a/src/report/report-data-html.h +++ b/src/report/report-data-html.h @@ -1,3 +1,8 @@ +#include <string> +#include <sstream> + +using namespace std; + struct tag_attr { const char *css_class; const char *css_id; @@ -28,3 +33,11 @@ init_top_table_attr(struct table_attributes *table_css, int rows, int cols); void init_title_attr(struct tag_attr *title_attr); + +void +init_std_table_attr(struct table_attributes *table_css, int rows, int cols); + +/* Other helper functions */ +string +double_to_string(double dval); + diff --git a/src/report/report-formatter-csv.cpp b/src/report/report-formatter-csv.cpp index 086cc79..facdd4d 100644 --- a/src/report/report-formatter-csv.cpp +++ b/src/report/report-formatter-csv.cpp @@ -275,7 +275,9 @@ report_formatter_csv::add_summary_list(string *list, int size) int i; add_exact("\n"); for (i=0; i < size; i+=2){ - addf_exact("%s %s,", list[i].c_str(), list[i+1].c_str()); + addf_exact("%s %s", list[i].c_str(), list[i+1].c_str()); + if(i < (size - 1)) + add_exact(","); } add_exact("\n"); } -- 1.7.9.5

Enables "CPU Idle" section redesign for html and csv reports preserving translation macros. Signed-off-by: Alexandra Yates <alexandra.yates(a)linux.intel.com&gt; --- src/cpu/cpu.cpp | 188 +++++++++++++++++++++++++++------------ src/report/report-data-html.cpp | 39 ++++++++ src/report/report-data-html.h | 18 ++++ 3 files changed, 187 insertions(+), 58 deletions(-) diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp index 4a7e197..b8f74a8 100644 --- a/src/cpu/cpu.cpp +++ b/src/cpu/cpu.cpp @@ -41,6 +41,7 @@ #include "../display.h" #include "../report/report.h" #include "../report/report-maker.h" +#include "../report/report-data-html.h" static class abstract_cpu system_level; @@ -420,122 +421,193 @@ static int get_cstates_num(void) void report_display_cpu_cstates(void) { - char buffer[512], buffer2[512]; + char buffer[512], buffer2[512], tmp_num[50]; unsigned int package, core, cpu; - int line, cstates_num; + int line, cstates_num, title=0, core_num=0; class abstract_cpu *_package, * _core, * _cpu; cstates_num = get_cstates_num(); + /* div attr css_class and css_id */ + tag_attr div_attr; + init_div(&div_attr, "clear_block", "cpuidle"); + + /* Set Table attributes, rows, and cols */ + table_attributes std_table_css; + table_size pkg_tbl_size; + table_size core_tbl_size; + table_size cpu_tbl_size; + + + /* Set Title attributes */ + tag_attr title_attr; + init_title_attr(&title_attr); - report.begin_section(SECTION_CPUIDLE); - report.add_header("Processor Idle state report"); + /* Report add section */ + report.add_div(&div_attr); + report.add_title(&title_attr, __("Processor Idle State Report")); + + /* Set array of data in row Major order */ + int idx1, idx2, idx3; + string tmp_str; for (package = 0; package < system_level.children.size(); package++) { bool first_core = true; + idx1=0; + idx2=0; + idx3=0; _package = system_level.children[package]; if (!_package) continue; + /* Tables for PKG, CORE, CPU */ + pkg_tbl_size.cols=2; + pkg_tbl_size.rows= cstates_num+1; + string pkg_data[pkg_tbl_size.cols * pkg_tbl_size.rows]; + + core_tbl_size.cols=2; + core_tbl_size.rows=(cstates_num *_package->children.size()) + + _package->children.size(); + string core_data[core_tbl_size.cols * core_tbl_size.rows]; + int num_cpus=0; + + for (core = 0; core < _package->children.size(); core++) { + _core = _package->children[core]; + if (!_core) + continue; + for (cpu = 0; cpu < _core->children.size(); cpu++) { + if (!_cpu) + continue; + _cpu = _core->children[cpu]; + num_cpus+=1; + } + } + + cpu_tbl_size.cols=((2 * num_cpus)+1) ; + cpu_tbl_size.rows= cstates_num * _package->children.size(); + + string cpu_data[cpu_tbl_size.cols * cpu_tbl_size.rows]; - report.begin_table(TABLE_WIDE); for (core = 0; core < _package->children.size(); core++) { + cpu_data[idx3]="&nbsp;"; + idx3+=1; _core = _package->children[core]; + if (!_core) continue; + /* *** PKG STARTS *** */ for (line = LEVEL_HEADER; line <= cstates_num; line++) { bool first_cpu = true; - if (!_package->has_cstate_level(line)) - continue; - - report.begin_row(); + continue; buffer[0] = 0; buffer2[0] = 0; - if (line == LEVEL_HEADER) { if (first_core) { - report.begin_cell(CELL_FIRST_PACKAGE_HEADER); - report.addf(__("Package %i"), _package->get_number()); - } else { - report.begin_cell(CELL_EMPTY_PACKAGE_HEADER); - report.add_empty_cell(); + pkg_data[idx1]=__("Package"); + idx1+=1; + sprintf(tmp_num,"%d", _package->get_number()); + pkg_data[idx1]= string(tmp_num); + idx1+=1; } } else if (first_core) { - report.begin_cell(CELL_STATE_NAME); - report.add(_package->fill_cstate_name(line, buffer)); - report.begin_cell(CELL_PACKAGE_STATE_VALUE); - report.add(_package->fill_cstate_line(line, buffer2)); - } else { - report.begin_cell(CELL_EMPTY_PACKAGE_STATE); - report.add_empty_cell(); + tmp_str=string(_package->fill_cstate_name(line, buffer)); + pkg_data[idx1]=(tmp_str=="" ? "&nbsp;" : tmp_str); + idx1+=1; + tmp_str=string(_package->fill_cstate_line(line, buffer2)); + pkg_data[idx1]=(tmp_str=="" ? "&nbsp;" : tmp_str); + idx1+=1; } - report.begin_cell(CELL_SEPARATOR); - report.add_empty_cell(); - + /* *** CORE STARTS *** */ if (!_core->can_collapse()) { buffer[0] = 0; buffer2[0] = 0; if (line == LEVEL_HEADER) { - report.begin_cell(CELL_CORE_HEADER); /* Here we need to check for which core type we - * are using. Do not use the core type for the - * report.addf as it breaks an important macro use - * for translation decision making for the reports. - */ - const char* core_type = _core->get_type(); - if (core_type != NULL) { + * are using. Do not use the core type for the + * report.addf as it breaks an important macro use + * for translation decision making for the reports. + * */ + const char* core_type = _core->get_type(); + if (core_type != NULL) { if (strcmp(core_type, "Core") == 0 ) { - report.addf(__("Core %i"), _core->get_number()); + core_data[idx2]=""; + idx2+=1; + sprintf(tmp_num, __("Core %d"),_core->get_number()); + core_data[idx2]=string(tmp_num); + idx2+=1; + core_num+=1; } else { - report.addf(__("GPU %i"), _core->get_number()); - } + core_data[idx2]=""; + idx2+=1; + sprintf(tmp_num,__("GPU %d"),_core->get_number()); + core_data[idx2]=string(tmp_num); + idx2+=1; + } } - } else { - report.begin_cell(CELL_STATE_NAME); - report.add(_core->fill_cstate_name(line, buffer)); - report.begin_cell(CELL_CORE_STATE_VALUE); - report.add(_core->fill_cstate_line(line, buffer2)); + } else { + tmp_str=string(_core->fill_cstate_name(line, buffer)); + core_data[idx2]=(tmp_str=="" ? "&nbsp;" : tmp_str); + idx2+=1; + tmp_str=string(_core->fill_cstate_line(line, buffer2)); + core_data[idx2]=(tmp_str=="" ? "&nbsp;" : tmp_str); + idx2+=1; } } - - report.begin_cell(CELL_SEPARATOR); - report.add_empty_cell(); - + // *** CPU STARTS *** for (cpu = 0; cpu < _core->children.size(); cpu++) { _cpu = _core->children[cpu]; + if (!_cpu) continue; - - report.set_cpu_number(cpu); if (line == LEVEL_HEADER) { - report.begin_cell(CELL_CPU_CSTATE_HEADER); - report.addf(__("CPU %i"), _cpu->get_number()); + cpu_data[idx3] = __("CPU"); + idx3+=1; + sprintf(tmp_num,"%d",_cpu->get_number()); + cpu_data[idx3]=string(tmp_num); + idx3+=1; continue; } if (first_cpu) { - report.begin_cell(CELL_STATE_NAME); - report.add(_cpu->fill_cstate_name(line, buffer)); + title+=1; + cpu_data[idx3]=(string(_cpu->fill_cstate_name(line, buffer))); + idx3+=1; first_cpu = false; } buffer[0] = 0; - report.begin_cell(CELL_CPU_STATE_VALUE); - report.add(_cpu->fill_cstate_percentage(line, buffer)); - report.begin_cell(CELL_CPU_STATE_VALUE); - if (line != LEVEL_C0) - report.add(_cpu->fill_cstate_time(line, buffer)); - else - report.add_empty_cell(); + tmp_str=string(_cpu->fill_cstate_percentage(line, buffer)); + cpu_data[idx3]=(tmp_str=="" ? "&nbsp;" : tmp_str); + idx3+=1; + + if (line != LEVEL_C0){ + tmp_str=string(_cpu->fill_cstate_time(line, buffer)); + cpu_data[idx3]=(tmp_str=="" ? "&nbsp;" : tmp_str); + idx3+=1; + } else { + cpu_data[idx3]="&nbsp;"; + idx3+=1; + } } } - first_core = false; } + + /* Report Output */ + title=title/core_num; + init_pkg_table_attr(&std_table_css, pkg_tbl_size.rows, pkg_tbl_size.cols); + report.add_table(pkg_data, &std_table_css); + init_core_table_attr(&std_table_css, title+1, core_tbl_size.rows, + core_tbl_size.cols); + report.add_table(core_data, &std_table_css); + init_cpu_table_attr(&std_table_css, title+1, cpu_tbl_size.rows, + cpu_tbl_size.cols); + report.add_table(cpu_data, &std_table_css); } + report.end_div(); } void report_display_cpu_pstates(void) diff --git a/src/report/report-data-html.cpp b/src/report/report-data-html.cpp index ed0d692..28732c9 100644 --- a/src/report/report-data-html.cpp +++ b/src/report/report-data-html.cpp @@ -35,6 +35,45 @@ void init_std_table_attr(struct table_attributes *table_css, int rows, int cols) table_css->cols=cols; } +void init_pkg_table_attr(struct table_attributes *table_css, int rows, int cols){ + table_css->table_class="emphasis2 side_by_side_left"; + table_css->tr_class=""; + table_css->th_class="title"; + table_css->td_class="package"; + table_css->pos_table_title=T; + table_css->title_mod=0; + table_css->rows=rows; + table_css->cols=cols; +} + +void init_core_table_attr(struct table_attributes *table_css, int title_mod, + int rows, int cols){ + table_css->table_class="emphasis2 side_by_side_left"; + table_css->tr_class=""; + table_css->th_class="title"; + table_css->td_class="core"; + table_css->pos_table_title=TC; + table_css->title_mod=title_mod; + table_css->rows=rows; + table_css->cols=cols; +} + +void init_cpu_table_attr(struct table_attributes *table_css, int title_mod, + int rows, int cols){ + table_css->table_class="emphasis2 side_by_side_left"; + table_css->tr_class=""; + table_css->th_class="title"; + table_css->td_class="cpu"; + table_css->pos_table_title=TLC; + table_css->title_mod=title_mod; + table_css->rows=rows; + table_css->cols=cols; +} + + + + + /* Other Helper Functions */ string double_to_string(double dval) diff --git a/src/report/report-data-html.h b/src/report/report-data-html.h index 524cd24..61e75c0 100644 --- a/src/report/report-data-html.h +++ b/src/report/report-data-html.h @@ -21,6 +21,12 @@ struct table_attributes { int cols; }; +struct table_size { + int rows; + int cols; +}; + + /* Definition of css atributes for the cases that apply to powertop * html report * */ @@ -37,6 +43,18 @@ init_title_attr(struct tag_attr *title_attr); void init_std_table_attr(struct table_attributes *table_css, int rows, int cols); +void +init_pkg_table_attr(struct table_attributes *table_css, int rows, int cols); + +void +init_core_table_attr(struct table_attributes *table_css, int title_mod, + int rows, int cols); + +void +init_cpu_table_attr(struct table_attributes *table_css, int title_mod, + int rows, int cols); + + /* Other helper functions */ string double_to_string(double dval); -- 1.7.9.5

Enables html and csv report new stlyes for "CPU Frequency" section, While preserving translation macros. Signed-off-by: Alexandra Yates <alexandra.yates(a)linux.intel.com&gt; --- src/cpu/cpu.cpp | 139 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 101 insertions(+), 38 deletions(-) diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp index b8f74a8..c3787e6 100644 --- a/src/cpu/cpu.cpp +++ b/src/cpu/cpu.cpp @@ -612,29 +612,81 @@ void report_display_cpu_cstates(void) void report_display_cpu_pstates(void) { - char buffer[512], buffer2[512]; + char buffer[512], buffer2[512], tmp_num[50]; unsigned int package, core, cpu; int line; class abstract_cpu *_package, * _core, * _cpu; unsigned int i, pstates_num; - for (i = 0, pstates_num = 0; i < all_cpus.size(); i++) + /* div attr css_class and css_id */ + tag_attr div_attr; + init_div(&div_attr, "clear_block", "cpufreq"); + + /* Set Table attributes, rows, and cols */ + table_attributes std_table_css; + table_size pkg_tbl_size; + table_size core_tbl_size; + table_size cpu_tbl_size; + + + /* Set Title attributes */ + tag_attr title_attr; + init_title_attr(&title_attr); + + /* Report add section */ + report.add_div(&div_attr); + report.add_title(&title_attr, __("Processor Frequency Report")); + + /* Set array of data in row Major order */ + int idx1, idx2, idx3, num_cpus=0; + string tmp_str; + + for (i = 0, pstates_num = 0; i < all_cpus.size(); i++) { if (all_cpus[i]) pstates_num = std::max<unsigned int>(pstates_num, - all_cpus[i]->pstates.size()); - - report.begin_section(SECTION_CPUFREQ); - report.add_header("Processor Frequency Report"); + all_cpus[i]->pstates.size()); + } for (package = 0; package < system_level.children.size(); package++) { bool first_core = true; + idx1=0; + idx2=0; + idx3=0; _package = system_level.children[package]; if (!_package) continue; - report.begin_table(TABLE_WIDE); + /* Tables for PKG, CORE, CPU */ + pkg_tbl_size.cols=2; + pkg_tbl_size.rows=pstates_num+2; + string pkg_data[pkg_tbl_size.cols * pkg_tbl_size.rows]; + + core_tbl_size.cols=2; + core_tbl_size.rows=((pstates_num+2) *_package->children.size()); + string core_data[core_tbl_size.cols * core_tbl_size.rows]; + + /* PKG */ + num_cpus=0; + for (core = 0; core < _package->children.size(); core++) { + _core = _package->children[core]; + if (!_core) + continue; + for (cpu = 0; cpu < _core->children.size(); cpu++) { + if (!_cpu) + continue; + _cpu = _core->children[cpu]; + num_cpus+=1; + } + } + cpu_tbl_size.cols= num_cpus+1; + cpu_tbl_size.rows= (pstates_num+2)* _package->children.size(); + string cpu_data[cpu_tbl_size.cols * cpu_tbl_size.rows]; + + /* Core */ for (core = 0; core < _package->children.size(); core++) { + cpu_data[idx3]="&nbsp;"; + idx3+=1; _core = _package->children[core]; if (!_core) continue; @@ -646,75 +698,86 @@ void report_display_cpu_pstates(void) bool first_cpu = true; if (!_package->has_pstate_level(line)) - continue; - - report.begin_row(); + continue; buffer[0] = 0; buffer2[0] = 0; if (first_core) { if (line == LEVEL_HEADER) { - report.begin_cell(CELL_FIRST_PACKAGE_HEADER); - report.addf(__("Package %i"), _package->get_number()); + pkg_data[idx1]=__("Package"); + idx1+=1; + sprintf(tmp_num,"%d", _package->get_number()); + pkg_data[idx1]= string(tmp_num); + idx1+=1; } else { - report.begin_cell(CELL_STATE_NAME); - report.add(_package->fill_pstate_name(line, buffer)); - report.begin_cell(CELL_PACKAGE_STATE_VALUE); - report.add(_package->fill_pstate_line(line, buffer2)); + tmp_str=string(_package->fill_pstate_name(line, buffer)); + pkg_data[idx1]=(tmp_str=="" ? "&nbsp;" : tmp_str); + idx1+=1; + tmp_str=string(_package->fill_pstate_line(line, buffer2)); + pkg_data[idx1]=(tmp_str=="" ? "&nbsp;" : tmp_str); + idx1+=1; } - } else { - report.begin_cell(CELL_EMPTY_PACKAGE_STATE); - report.add_empty_cell(); } - report.begin_cell(CELL_SEPARATOR); - report.add_empty_cell(); if (!_core->can_collapse()) { buffer[0] = 0; buffer2[0] = 0; if (line == LEVEL_HEADER) { - report.begin_cell(CELL_CORE_HEADER); - report.addf(__("Core %i"), _core->get_number()); + core_data[idx2]=""; + idx2+=1; + sprintf(tmp_num,__("Core %d"),_core->get_number()); + core_data[idx2]=string(tmp_num); + idx2+=1; } else { - report.begin_cell(CELL_STATE_NAME); - report.add(_core->fill_pstate_name(line, buffer)); - report.begin_cell(CELL_PACKAGE_STATE_VALUE); - report.add(_core->fill_pstate_line(line, buffer2)); + tmp_str=string(_core->fill_pstate_name(line, buffer)); + core_data[idx2]= (tmp_str=="" ? "&nbsp;" : tmp_str); + idx2+=1; + tmp_str=string(_core->fill_pstate_line(line, buffer2)); + core_data[idx2]= (tmp_str=="" ? "&nbsp;" : tmp_str); + idx2+=1; } } - report.begin_cell(CELL_SEPARATOR); - report.add_empty_cell(); - + /* CPU */ for (cpu = 0; cpu < _core->children.size(); cpu++) { buffer[0] = 0; _cpu = _core->children[cpu]; if (!_cpu) continue; - report.set_cpu_number(cpu); if (line == LEVEL_HEADER) { - report.begin_cell(CELL_CPU_PSTATE_HEADER); - report.addf(__("CPU %i"), _cpu->get_number()); + sprintf(tmp_num,__("CPU %d"),_cpu->get_number()); + cpu_data[idx3] = string(tmp_num); + idx3+=1; continue; } if (first_cpu) { - report.begin_cell(CELL_STATE_NAME); - report.add(_cpu->fill_pstate_name(line, buffer)); + tmp_str=string(_cpu->fill_pstate_name(line, buffer)); + cpu_data[idx3]=(tmp_str=="" ? "&nbsp;" : tmp_str); + idx3+=1; first_cpu = false; } buffer[0] = 0; - report.begin_cell(CELL_CPU_STATE_VALUE); - report.add(_cpu->fill_pstate_line(line, buffer)); + tmp_str=string(_cpu->fill_pstate_line(line, buffer)); + cpu_data[idx3]=(tmp_str=="" ? "&nbsp;" : tmp_str); + idx3+=1; } } - first_core = false; } + init_pkg_table_attr(&std_table_css, pkg_tbl_size.rows, pkg_tbl_size.cols); + report.add_table(pkg_data, &std_table_css); + init_core_table_attr(&std_table_css, (pstates_num+2), + core_tbl_size.rows, core_tbl_size.cols); + report.add_table(core_data, &std_table_css); + init_cpu_table_attr(&std_table_css, (pstates_num+2), + cpu_tbl_size.rows, cpu_tbl_size.cols); + report.add_table(cpu_data, &std_table_css); } + report.end_div(); } void impl_w_display_cpu_states(int state) -- 1.7.9.5

Redesign Device Power Report table part of "Device Info" section, while preserving translation macros. Signed-off-by: Alexandra Yates <alexandra.yates(a)linux.intel.com&gt; --- src/devices/device.cpp | 72 +++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/src/devices/device.cpp b/src/devices/device.cpp index 00ec5e6..4120b9c 100644 --- a/src/devices/device.cpp +++ b/src/devices/device.cpp @@ -49,6 +49,7 @@ using namespace std; #include "../lib.h" #include "../report/report.h" #include "../report/report-maker.h" +#include "../report/report-data-html.h" #include "../measurement/measurement.h" #include "../devlist.h" #include <unistd.h> @@ -217,43 +218,35 @@ void report_devices(void) void show_report_devices(void) { unsigned int i; - int show_power; - double pw; + int show_power, cols, rows, idx; show_power = global_power_valid(); sort(all_devices.begin(), all_devices.end(), power_device_sort); - report.begin_section(SECTION_DEVPOWER); - report.add_header("Device Power Report"); + /* div attr css_class and css_id */ + tag_attr div_attr; + init_div(&div_attr, "", "device"); - pw = global_joules_consumed(); - if (pw > 0.0001) { - char buf[32]; + /* Set Table attributes, rows, and cols */ + table_attributes std_table_css; + cols=2; + if (show_power) + cols=3; - report.begin_paragraph(); - report.addf("The battery reports a discharge rate of %sW", - fmt_prefix(pw, buf)); - } + idx = cols; + rows= all_devices.size() + 1; + init_std_table_attr(&std_table_css, rows, cols); - if (show_power) { - char buf[32]; + /* Set Title attributes */ + tag_attr title_attr; + init_title_attr(&title_attr); - report.begin_paragraph(); - report.addf("System baseline power is estimated at %sW", - fmt_prefix(get_parameter_value("base power"), buf)); - } - - report.begin_table(TABLE_WIDE); - report.begin_row(); - if (show_power) { - report.begin_cell(CELL_DEVPOWER_HEADER); - report.add("Power est."); - } - - report.begin_cell(CELL_DEVPOWER_HEADER); - report.add("Usage"); - report.begin_cell(CELL_DEVPOWER_DEV_NAME); - report.add("Device name"); + /* Set array of data in row Major order */ + string device_data[cols * rows]; + device_data[0]= __("Usage"); + device_data[1]= __("Device Name"); + if (show_power) + device_data[2]= __("PW Estimate"); for (i = 0; i < all_devices.size(); i++) { double P; @@ -278,17 +271,22 @@ void show_report_devices(void) if (!show_power || !all_devices[i]->power_valid()) strcpy(power, " "); - report.begin_row(ROW_DEVPOWER); + device_data[idx]= string(util); + idx+=1; + + device_data[idx]= string(all_devices[i]->human_name()); + idx+=1; + if (show_power) { - report.begin_cell(CELL_DEVPOWER_POWER); - report.add(power); + device_data[idx]= string(power); + idx+=1; } - - report.begin_cell(CELL_DEVPOWER_UTIL); - report.add(util); - report.begin_cell(); - report.add(all_devices[i]->human_name()); } + /* Report Output */ + report.add_div(&div_attr); + report.add_title(&title_attr, __("Device Power Report")); + report.add_table(device_data, &std_table_css); + report.end_div(); } -- 1.7.9.5

Removed old csv headder to avoid redundancy. Removed unused variables from report.cpp str2 and str3. Signed-off-by: Alexandra Yates <alexandra.yates(a)linux.intel.com&gt; --- src/report/report-formatter-csv.cpp | 2 +- src/report/report.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/report/report-formatter-csv.cpp b/src/report/report-formatter-csv.cpp index facdd4d..0ab1091 100644 --- a/src/report/report-formatter-csv.cpp +++ b/src/report/report-formatter-csv.cpp @@ -57,7 +57,7 @@ report_formatter_csv::finish_report() void report_formatter_csv::add_doc_header() { - add_header(report_csv_header, 1); + /*add_header(report_csv_header, 1);*/ } /* ************************************************************************ */ diff --git a/src/report/report.cpp b/src/report/report.cpp index 3b46f58..56232a6 100644 --- a/src/report/report.cpp +++ b/src/report/report.cpp @@ -100,7 +100,7 @@ static string read_os_release(const string &filename) static void system_info(void) { - string str, str2, str3; + string str; /* div attr css_class and css_id */ tag_attr div_attr; -- 1.7.9.5

Removed multiple division when displaying more than one table on a section as it was the case of Device Info and Tuning sections. Now all sections display accordingly to the selected menu button. Signed-off-by: Alexandra Yates <alexandra.yates(a)linux.intel.com&gt; --- src/devices/device.cpp | 4 ++-- src/devlist.cpp | 4 +--- src/powertop.css | 19 +++++++++---------- src/report/report-data-html.cpp | 11 +++++++++++ src/report/report-data-html.h | 4 ++++ src/tuning/tuning.cpp | 9 +++++---- 6 files changed, 32 insertions(+), 19 deletions(-) diff --git a/src/devices/device.cpp b/src/devices/device.cpp index 83ee02f..a916bf6 100644 --- a/src/devices/device.cpp +++ b/src/devices/device.cpp @@ -225,7 +225,7 @@ void show_report_devices(void) /* div attr css_class and css_id */ tag_attr div_attr; - init_div(&div_attr, "", "device"); + init_div(&div_attr, "", "devinfo"); /* Set Table attributes, rows, and cols */ table_attributes std_table_css; @@ -235,7 +235,7 @@ void show_report_devices(void) idx = cols; rows= all_devices.size() + 1; - init_std_table_attr(&std_table_css, rows, cols); + init_std_side_table_attr(&std_table_css, rows, cols); /* Set Title attributes */ tag_attr title_attr; diff --git a/src/devlist.cpp b/src/devlist.cpp index ada3538..1b99490 100644 --- a/src/devlist.cpp +++ b/src/devlist.cpp @@ -296,9 +296,6 @@ void report_show_open_devices(void) if (target->size() == 0) return; - /* div attr css_class and css_id */ - tag_attr div_attr; - init_div(&div_attr, "", "device"); /* Set Table attributes, rows, and cols */ table_attributes std_table_css; @@ -331,6 +328,7 @@ void report_show_open_devices(void) } /* Report Output */ + /* No div attribute here inherits from device power report */ report.add_title(&title_attr, __("Process Device Activity")); report.add_table(process_data, &std_table_css); report.end_div(); diff --git a/src/powertop.css b/src/powertop.css index 38daa1f..ff86880 100644 --- a/src/powertop.css +++ b/src/powertop.css @@ -12,7 +12,7 @@ var powertop = { cpuidle: 'CPU Idle', cpufreq: 'CPU Frequency', software: 'Software Info', - device: 'Device Info', + devinfo: 'Device Info', tuning: 'Tuning' }, cadd: function(idx, c){ @@ -85,6 +85,13 @@ var powertop = { padding:0px; } +body { + background-color: #eee; /* Background color */ + color: #222; /* Font color */ + font-family: Helvetica; + font-size: 14px; +} + #main_container{ width: 960px; margin: 2px auto; @@ -207,15 +214,7 @@ li.summary_list -/*menu css*/ - -body { - background-color: #eee; /* Background color */ - color: #222; /* Font color */ - font-family: Helvetica; - font-size: 14px; -} - +/* main menu css*/ #main_menu { display: inline-block; font-weight: bold; diff --git a/src/report/report-data-html.cpp b/src/report/report-data-html.cpp index 72d2e52..78354c3 100644 --- a/src/report/report-data-html.cpp +++ b/src/report/report-data-html.cpp @@ -34,6 +34,17 @@ void init_std_table_attr(struct table_attributes *table_css, int rows, int cols) table_css->rows=rows; table_css->cols=cols; } +void init_std_side_table_attr(struct table_attributes *table_css, int rows, int cols){ + table_css->table_class="emphasis2 side_by_side_left"; + table_css->tr_class="emph1"; + table_css->th_class="emph_title"; + table_css->td_class=""; + table_css->pos_table_title=T; + table_css->title_mod=0; + table_css->rows=rows; + table_css->cols=cols; +} + void init_pkg_table_attr(struct table_attributes *table_css, int rows, int cols){ table_css->table_class="emphasis2 side_by_side_left"; diff --git a/src/report/report-data-html.h b/src/report/report-data-html.h index 7e517eb..f16977e 100644 --- a/src/report/report-data-html.h +++ b/src/report/report-data-html.h @@ -44,6 +44,10 @@ void init_std_table_attr(struct table_attributes *table_css, int rows, int cols); void +init_std_side_table_attr(struct table_attributes *table_css, int rows, + int cols); + +void init_pkg_table_attr(struct table_attributes *table_css, int rows, int cols); void diff --git a/src/tuning/tuning.cpp b/src/tuning/tuning.cpp index 8a41114..ac479a2 100644 --- a/src/tuning/tuning.cpp +++ b/src/tuning/tuning.cpp @@ -207,7 +207,7 @@ void report_show_tunables(void) /* div attr css_class and css_id */ tag_attr div_attr; - init_div(&div_attr, "", "tuning"); + init_div(&div_attr, "clear_block", "tuning"); /* Set Table attributes, rows, and cols */ table_attributes tune_table_css; @@ -242,7 +242,6 @@ void report_show_tunables(void) report.add_div(&div_attr); report.add_title(&title_attr,__("Software Settings in Need of Tuning")); report.add_table(tunable_data, &tune_table_css); - report.end_div(); /* Second Table */ /* Set Table attributes, rows, and cols */ @@ -258,10 +257,13 @@ void report_show_tunables(void) untunable_data[i+1]= string(all_untunables[i]->description()); /* Report Output */ +<<<<<<< HEAD report.add_div(&div_attr); report.add_title(&title_attr,__("Untunable Software Issues")); +======= + report.add_title(&title_attr,"Untunable Software Issues"); +>>>>>>> 4d9b82e... report-html: fixed not hidding sections errors report.add_table(untunable_data, &tune_table_css); - report.end_div(); /* Third Table */ /* Set Table attributes, rows, and cols */ @@ -283,7 +285,6 @@ void report_show_tunables(void) idx+=1; } /* Report Output */ - report.add_div(&div_attr); report.add_title(&title_attr,__("Optimal Tuned Software Settings")); report.add_table(tuned_data, &tune_table_css); report.end_div(); -- 1.7.9.5

Redesigns the header section on Device Power Report to include the battery discharge report and system baseline power, while preserving the translation macros. Signed-off-by: Alexandra Yates <alexandra.yates(a)linux.intel.com&gt; --- src/devices/device.cpp | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/devices/device.cpp b/src/devices/device.cpp index a916bf6..da595a8 100644 --- a/src/devices/device.cpp +++ b/src/devices/device.cpp @@ -219,6 +219,7 @@ void show_report_devices(void) { unsigned int i; int show_power, cols, rows, idx; + double pw; show_power = global_power_valid(); sort(all_devices.begin(), all_devices.end(), power_device_sort); @@ -241,6 +242,28 @@ void show_report_devices(void) tag_attr title_attr; init_title_attr(&title_attr); + /* Add section */ + report.add_div(&div_attr); + + /* Device Summary */ + int summary_size=2; + string summary[summary_size]; + pw = global_joules_consumed(); + char buf[32]; + if (pw > 0.0001) { + summary[0]= __("The battery reports a discharge rate of: "); + summary[1]=string(fmt_prefix(pw, buf)); + summary[1].append(" W"); + report.add_summary_list(summary, summary_size); + } + + if (show_power) { + summary[0]=__("The system baseline power is estimated at: "); + summary[1]=string(fmt_prefix(get_parameter_value("base power"), buf)); + summary[1].append(" W"); + report.add_summary_list(summary, summary_size); + } + /* Set array of data in row Major order */ string device_data[cols * rows]; device_data[0]= __("Usage"); @@ -283,7 +306,6 @@ void show_report_devices(void) } } /* Report Output */ - report.add_div(&div_attr); report.add_title(&title_attr, __("Device Power Report")); report.add_table(device_data, &std_table_css); } -- 1.7.9.5

Fixed css on logo to show image in real size. Additionaly changed the tags in navigation from nav to div to enable compatibility with the new navigation menu and IE. Signed-off-by: Alexandra Yates <alexandra.yates(a)linux.intel.com&gt; --- src/powertop.css | 5 +++-- src/report/report-formatter-html.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/powertop.css b/src/powertop.css index ff86880..847f25f 100644 --- a/src/powertop.css +++ b/src/powertop.css @@ -105,8 +105,9 @@ body { img.pwtop_logo{ float:left; - height:90px; - width: 400px; + height:40%; + width: 40%; + padding:20px; } .sys_info diff --git a/src/report/report-formatter-html.cpp b/src/report/report-formatter-html.cpp index 210a354..e18b543 100644 --- a/src/report/report-formatter-html.cpp +++ b/src/report/report-formatter-html.cpp @@ -518,7 +518,7 @@ report_formatter_html::add_title(struct tag_attr *title_att, const char *title) void report_formatter_html::add_navigation() { - add_exact("<br/><nav id=\"main_menu\"> </nav>\n"); + add_exact("<br/><div id=\"main_menu\"> </div>\n"); } void -- 1.7.9.5

The old add table headder, add row, add cell and add empty cell were removed since they are replaced by the new add_table function for html and csv reports. Signed-off-by: Alexandra Yates <alexandra.yates(a)linux.intel.com&gt; --- src/report/report-formatter-csv.cpp | 66 --------- src/report/report-formatter-csv.h | 12 +- src/report/report-formatter-html.cpp | 270 +--------------------------------- src/report/report-formatter-html.h | 42 ------ src/report/report-formatter.h | 10 -- src/report/report-maker.cpp | 118 +-------------- src/report/report-maker.h | 10 +- 7 files changed, 6 insertions(+), 522 deletions(-) diff --git a/src/report/report-formatter-csv.cpp b/src/report/report-formatter-csv.cpp index 0ab1091..941f722 100644 --- a/src/report/report-formatter-csv.cpp +++ b/src/report/report-formatter-csv.cpp @@ -91,55 +91,6 @@ report_formatter_csv::end_section() } /* ************************************************************************ */ - -void -report_formatter_csv::begin_table(table_type ttype) -{ - add_exact("\n"); -} - -/* ************************************************************************ */ - -void -report_formatter_csv::end_table() -{ - add_exact("\n"); -} - -/* ************************************************************************ */ - -void -report_formatter_csv::begin_row(row_type rtype) -{ - table_cell_number = 0; -} - -/* ************************************************************************ */ - -void -report_formatter_csv::end_row() -{ - add_exact("\n"); -} - -/* ************************************************************************ */ - -void -report_formatter_csv::begin_cell(cell_type ctype) -{ - if (table_cell_number > 0) { - addf_exact("%c", REPORT_CSV_DELIMITER); -#ifdef REPORT_CSV_ADD_SPACE - add_exact(" "); -#endif /* !REPORT_CSV_ADD_SPACE */ - } - - text_start = result.length(); - csv_need_quotes = false; -} - -/* ************************************************************************ */ - void report_formatter_csv::add_quotes() { @@ -156,23 +107,6 @@ report_formatter_csv::add_quotes() /* ************************************************************************ */ void -report_formatter_csv::end_cell() -{ - add_quotes(); - table_cell_number++; -} - -/* ************************************************************************ */ - -void -report_formatter_csv::add_empty_cell() -{ - /* Do nothing special */ -} - -/* ************************************************************************ */ - -void report_formatter_csv::begin_paragraph() { text_start = result.length(); diff --git a/src/report/report-formatter-csv.h b/src/report/report-formatter-csv.h index 198f597..6336e2c 100644 --- a/src/report/report-formatter-csv.h +++ b/src/report/report-formatter-csv.h @@ -58,16 +58,6 @@ public: void begin_section(section_type stype); void end_section(); - void begin_table(table_type ttype); - void end_table(); - - void begin_row(row_type rtype); - void end_row(); - - void begin_cell(cell_type ctype); - void end_cell(); - void add_empty_cell(); - void begin_paragraph(); void end_paragraph(); @@ -92,7 +82,7 @@ private: string escape_string(const char *str); bool csv_need_quotes; - size_t table_cell_number, text_start; + size_t text_start; }; #endif /* _REPORT_FORMATTER_CSV_H_ */ diff --git a/src/report/report-formatter-html.cpp b/src/report/report-formatter-html.cpp index e18b543..fce2bee 100644 --- a/src/report/report-formatter-html.cpp +++ b/src/report/report-formatter-html.cpp @@ -61,122 +61,7 @@ static const char report_html_footer[] = void report_formatter_html::init_markup() { - /* stype id */ - set_section(SECTION_DEFAULT); - set_section(SECTION_SYSINFO, "system"); - set_section(SECTION_CPUIDLE, "cpuidle"); - set_section(SECTION_CPUFREQ, "cpufreq"); - set_section(SECTION_DEVPOWER, "device"); - set_section(SECTION_SOFTWARE, "software"); - set_section(SECTION_SUMMARY, "summary"); - set_section(SECTION_TUNING, "tuning"); - - /* ttype width */ - set_table(TABLE_DEFAULT, ""); - set_table(TABLE_WIDE, "100%"); - - /* ctype is_header, width, colspan */ - set_cell(CELL_DEFAULT); - set_cell(CELL_SEPARATOR, false, "2%"); - set_cell(CELL_SYSINFO, false, "20%"); - set_cell(CELL_FIRST_PACKAGE_HEADER, true, "25%", 2); - set_cell(CELL_EMPTY_PACKAGE_HEADER, true, "", 2); - set_cell(CELL_CORE_HEADER, true, "25%", 2); - set_cell(CELL_CPU_CSTATE_HEADER, true, "", 3); - set_cell(CELL_CPU_PSTATE_HEADER, true, "", 2); - set_cell(CELL_STATE_NAME, false, "10%"); - set_cell(CELL_EMPTY_PACKAGE_STATE, false, "", 2); - set_cell(CELL_PACKAGE_STATE_VALUE); - set_cell(CELL_CORE_STATE_VALUE); - set_cell(CELL_CPU_STATE_VALUE); - set_cell(CELL_DEVPOWER_HEADER, true, "10%"); - set_cell(CELL_DEVPOWER_DEV_NAME, true); - set_cell(CELL_DEVPOWER_POWER); - set_cell(CELL_DEVPOWER_UTIL); - set_cell(CELL_DEVACTIVITY_PROCESS, true, "40%"); - set_cell(CELL_DEVACTIVITY_DEVICE, true); - set_cell(CELL_SOFTWARE_HEADER, true, "10%"); - set_cell(CELL_SOFTWARE_PROCESS, true, "10%"); - set_cell(CELL_SOFTWARE_DESCRIPTION, true); - set_cell(CELL_SOFTWARE_POWER); - set_cell(CELL_SUMMARY_HEADER, true, "10%"); - set_cell(CELL_SUMMARY_CATEGORY, true, "10%"); - set_cell(CELL_SUMMARY_DESCRIPTION, true); - set_cell(CELL_SUMMARY_ITEM); - set_cell(CELL_TUNABLE_HEADER, true); -} - -/* ************************************************************************ */ - -const char * -report_formatter_html::get_row_style(row_type rtype) -{ - switch (rtype) { - case ROW_SYSINFO: - return get_style_pair("system_even", "system_odd"); - case ROW_DEVPOWER: - return get_style_pair("device_even", "device_odd"); - case ROW_SOFTWARE: - case ROW_SUMMARY: - return get_style_pair("process_even", "process_odd"); - case ROW_TUNABLE: - return get_style_pair("tunable_even", "tunable_odd"); - case ROW_TUNABLE_BAD: - return get_style_pair("tunable_even_bad", - "tunable_odd_bad"); - default: - return ""; - }; -} - -/* ************************************************************************ */ - -const char * -report_formatter_html::get_cell_style(cell_type ctype) -{ - switch (ctype) { - case CELL_FIRST_PACKAGE_HEADER: - case CELL_EMPTY_PACKAGE_HEADER: - return "package_header"; - case CELL_CORE_HEADER: - return "core_header"; - case CELL_CPU_CSTATE_HEADER: - case CELL_CPU_PSTATE_HEADER: - return "cpu_header"; - case CELL_STATE_NAME: - return get_style_pair("cpu_even_freq", - "cpu_odd_freq"); - case CELL_PACKAGE_STATE_VALUE: - return get_style_pair("package_even", - "package_odd"); - case CELL_CORE_STATE_VALUE: - return get_style_pair("core_even", - "core_odd"); - case CELL_CPU_STATE_VALUE: - return get_style_quad("cpu_even_even", "cpu_even_odd", - "cpu_odd_even", "cpu_odd_odd", - cpu_nr); - case CELL_DEVPOWER_DEV_NAME: - case CELL_DEVACTIVITY_PROCESS: - case CELL_DEVACTIVITY_DEVICE: - return "device"; - case CELL_DEVPOWER_POWER: - return "device_power"; - case CELL_DEVPOWER_UTIL: - return "device_util"; - case CELL_SOFTWARE_PROCESS: - case CELL_SOFTWARE_DESCRIPTION: - case CELL_SUMMARY_CATEGORY: - case CELL_SUMMARY_DESCRIPTION: - return "process"; - case CELL_SOFTWARE_POWER: - case CELL_SUMMARY_ITEM: - return "process_power"; - case CELL_TUNABLE_HEADER: - return "tunable"; - default: - return ""; - }; + /*here all html code*/ } /* ************************************************************************ */ @@ -189,45 +74,6 @@ report_formatter_html::report_formatter_html() /* ************************************************************************ */ -const char * -report_formatter_html::get_style_pair(const char *even, const char *odd) -{ - if (!(table_row_number & 1) && even) - return even; - - if ((table_row_number & 1) && odd) - return odd; - - return ""; -} - -/* ************************************************************************ */ - -const char * -report_formatter_html::get_style_quad(const char *even_even, - const char *even_odd, const char *odd_even, - const char *odd_odd, int alt_cell_number) -{ - int cell; - - cell = (alt_cell_number != -1 ? alt_cell_number : table_cell_number); - if (!(table_row_number & 1) && !(cell & 1) && even_even) - return even_even; - - if (!(table_row_number & 1) && (cell & 1) && even_odd) - return even_odd; - - if ((table_row_number & 1) && !(cell & 1) && odd_even) - return odd_even; - - if ((table_row_number & 1) && (cell & 1) && odd_odd) - return odd_odd; - - return ""; -} - -/* ************************************************************************ */ - void report_formatter_html::finish_report() { @@ -245,25 +91,6 @@ report_formatter_html::set_section(section_type stype, const char *id) /* ************************************************************************ */ void -report_formatter_html::set_table(table_type ttype, const char *width) -{ - tables[ttype].width = width; -} - -/* ************************************************************************ */ - -void -report_formatter_html::set_cell(cell_type ctype, bool is_header, - const char *width, int colspan) -{ - cells[ctype].is_header = is_header; - cells[ctype].width = width; - cells[ctype].colspan = colspan; -} - -/* ************************************************************************ */ - -void report_formatter_html::add_doc_header() { #ifdef EXTERNAL_CSS_FILE /* Where is it defined? */ @@ -310,101 +137,6 @@ report_formatter_html::end_section() add_exact("</div>\n\n"); } -/* ************************************************************************ */ - -void -report_formatter_html::begin_table(table_type ttype) -{ - table_row_number = 0; - add_exact("<table"); - if (tables[ttype].width[0]) - addf_exact(" width=\"%s\"", tables[ttype].width); - - add_exact(">\n"); -} - -/* ************************************************************************ */ - -void -report_formatter_html::end_table() -{ - add_exact("</table>\n\n"); -} - -/* ************************************************************************ */ - -void -report_formatter_html::begin_row(row_type rtype) -{ - const char *row_style; - - table_cell_number = 0; - add_exact("<tr"); - row_style = get_row_style(rtype); - if (row_style[0]) - addf_exact(" class=\"%s\"", row_style); - - add_exact(">\n"); -} - -/* ************************************************************************ */ - -void -report_formatter_html::end_row() -{ - add_exact("</tr>\n"); - table_row_number++; -} - -/* ************************************************************************ */ - -void -report_formatter_html::begin_cell(cell_type ctype) -{ - const char *cell_style; - - current_cell = ctype; - if (cells[ctype].is_header) - add_exact("\t<th"); - else - add_exact("\t<td"); - - if (cells[ctype].width[0]) - addf_exact(" width=\"%s\"", cells[ctype].width); - - if (cells[ctype].colspan > 1) - addf_exact(" colspan=\"%d\"", cells[ctype].colspan); - - cell_style = get_cell_style(ctype); - if (cell_style[0]) - addf_exact(" class=\"%s\"", cell_style); - - add_exact(">"); -} - -/* ************************************************************************ */ - -void -report_formatter_html::end_cell() -{ - if (!cells[current_cell].is_header) - add_exact("</td>\n"); - else - add_exact("</th>\n"); - - table_cell_number++; -} - -/* ************************************************************************ */ - -void -report_formatter_html::add_empty_cell() -{ - add_exact("&nbsp;"); -} - -/* ************************************************************************ */ - void report_formatter_html::begin_paragraph() { diff --git a/src/report/report-formatter-html.h b/src/report/report-formatter-html.h index 1ad1c68..9ba3edf 100644 --- a/src/report/report-formatter-html.h +++ b/src/report/report-formatter-html.h @@ -44,20 +44,6 @@ struct html_section { /* ************************************************************************ */ -struct html_table { - const char *width; -}; - -/* ************************************************************************ */ - -struct html_cell { - bool is_header; - const char *width; - int colspan; -}; - -/* ************************************************************************ */ - class report_formatter_html: public report_formatter_string_base { public: @@ -70,16 +56,6 @@ public: void begin_section(section_type stype); void end_section(); - void begin_table(table_type ttype); - void end_table(); - - void begin_row(row_type rtype); - void end_row(); - - void begin_cell(cell_type ctype); - void end_cell(); - void add_empty_cell(); - void begin_paragraph(); void end_paragraph(); @@ -100,30 +76,12 @@ private: /* Document structure related functions */ void init_markup(); void set_section(section_type stype, const char *id = ""); - void set_table(table_type ttype, const char *width = ""); - void set_cell(cell_type ctype, bool is_header = false, - const char *width = "", int colspan = 1); - - /* HTML table elements CSS classes */ - const char *get_cell_style(cell_type ctype); - const char *get_row_style(row_type rtype); - const char *get_style_pair(const char *even, const char *odd); - const char *get_style_quad(const char *even_even, - const char *even_odd, - const char *odd_even, - const char *odd_odd, - int alt_cell_number = -1); - void add_doc_header(); void add_doc_footer(); string escape_string(const char *str); html_section sections[SECTION_MAX]; - html_table tables[TABLE_MAX]; - html_cell cells[CELL_MAX]; - size_t table_row_number, table_cell_number; - cell_type current_cell; int cpu_nr; }; diff --git a/src/report/report-formatter.h b/src/report/report-formatter.h index 7984dc5..6d31759 100644 --- a/src/report/report-formatter.h +++ b/src/report/report-formatter.h @@ -46,16 +46,6 @@ public: virtual void begin_section(section_type stype) {} virtual void end_section() {} - virtual void begin_table(table_type ttype) {} - virtual void end_table() {} - - virtual void begin_row(row_type rtype) {} - virtual void end_row() {} - - virtual void begin_cell(cell_type ctype) {} - virtual void end_cell() {} - virtual void add_empty_cell() {} - virtual void begin_paragraph() {} virtual void end_paragraph() {} diff --git a/src/report/report-maker.cpp b/src/report/report-maker.cpp index 0fd133c..3de39a5 100644 --- a/src/report/report-maker.cpp +++ b/src/report/report-maker.cpp @@ -77,9 +77,6 @@ report_maker::clear_result() { formatter->clear_result(); section_opened = false; - table_opened = false; - cell_opened = false; - row_opened = false; paragraph_opened = false; } @@ -154,9 +151,7 @@ report_maker::add_header(const char *header, int level) assert(section_opened); assert(level > 0 && level < 4); - if (table_opened) - end_table(); - else if (paragraph_opened) + if (paragraph_opened) end_paragraph(); formatter->add_header(header, level); @@ -183,9 +178,7 @@ report_maker::end_section() { assert(section_opened); - if (table_opened) - end_table(); - else if (paragraph_opened) + if (paragraph_opened) end_paragraph(); section_opened = false; @@ -195,109 +188,6 @@ report_maker::end_section() /* ************************************************************************ */ void -report_maker::begin_table(table_type ttype) -{ - assert(ttype >= 0 && ttype < TABLE_MAX); - assert(section_opened); - - if (table_opened) - end_table(); /* Close previous */ - else if (paragraph_opened) - end_paragraph(); - - table_opened = true; - formatter->begin_table(ttype); -} - -/* ************************************************************************ */ - -void -report_maker::end_table() -{ - assert(section_opened); - assert(table_opened); - - if (row_opened) - end_row(); - - table_opened = false; - formatter->end_table(); -} - -/* ************************************************************************ */ - -void -report_maker::begin_row(row_type rtype) -{ - assert(section_opened); - assert(table_opened); - assert(rtype >= 0 && rtype < ROW_MAX); - - if (row_opened) - end_row(); /* Close previous */ - - row_opened = true; - formatter->begin_row(rtype); -} - -/* ************************************************************************ */ - -void -report_maker::end_row() -{ - assert(section_opened); - assert(table_opened); - assert(row_opened); - - if (cell_opened) - end_cell(); - - row_opened = false; - formatter->end_row(); -} - -/* ************************************************************************ */ - -void -report_maker::begin_cell(cell_type ctype) -{ - assert(section_opened); - assert(table_opened); - assert(row_opened); - assert(ctype >= 0 && ctype < CELL_MAX); - - if (cell_opened) - end_cell(); /* Close previous */ - - cell_opened = true; - formatter->begin_cell(ctype); -} - -/* ************************************************************************ */ - -void -report_maker::end_cell() -{ - assert(section_opened); - assert(table_opened); - assert(row_opened); - assert(cell_opened); - - cell_opened = false; - formatter->end_cell(); -} - -/* ************************************************************************ */ - -void -report_maker::add_empty_cell() -{ - formatter->add_empty_cell(); -} - -/* ************************************************************************ */ - -void report_maker::set_cpu_number(int nr) { formatter->set_cpu_number(nr); @@ -310,9 +200,7 @@ report_maker::begin_paragraph() { assert(section_opened); - if (table_opened) - end_table(); - else if (paragraph_opened) + if (paragraph_opened) end_paragraph(); /* Close previous */ paragraph_opened = true; diff --git a/src/report/report-maker.h b/src/report/report-maker.h index f6897cf..cfa25dd 100644 --- a/src/report/report-maker.h +++ b/src/report/report-maker.h @@ -184,10 +184,6 @@ public: void add_header(const char *header, int level = 2); void begin_section(section_type stype = SECTION_DEFAULT); - void begin_table(table_type ttype = TABLE_DEFAULT); - void begin_row(row_type rtype = ROW_DEFAULT); - void begin_cell(cell_type ctype = CELL_DEFAULT); - void add_empty_cell(); void begin_paragraph(); void set_cpu_number(int nr); @@ -207,15 +203,11 @@ private: void setup_report_formatter(); void end_section(); - void end_table(); - void end_row(); - void end_cell(); void end_paragraph(); report_type type; report_formatter *formatter; - bool cell_opened, row_opened, table_opened, section_opened, - paragraph_opened; + bool section_opened, paragraph_opened; }; #endif /* _REPORT_MAKER_H_ */ -- 1.7.9.5

Hi Alexandra, Alexandra Yates wrote: ... ... Here is some garbage after merge. -- Best regards, Igor Zhbanov, Expert Software Engineer, phone: +7 (495) 797 25 00 ext 3981 e-mail: i.zhbanov(a)samsung.com Mobile group, Moscow R&D center, Samsung Electronics 12 Dvintsev street, building 1 127018, Moscow, Russian Federation