Move logic to stats service

Author: mdanilov

src/app/app.component.html

@@ -5,13 +5,13 @@
     </button>
     <form>
       <mat-form-field>
-        <input matInput placeholder="Bss section filter" [value]="bssSectionNames" (input)="bssSectionNames = $event.target.value">
+        <input matInput placeholder="Bss section filter" [value]="statsParams.bssSectionNames" (input)="statsParams.bssSectionNames = $event.target.value">
       </mat-form-field>
       <mat-form-field>
-        <input matInput placeholder="Data section filter" [value]="dataSectionNames" (input)="dataSectionNames = $event.target.value">
+        <input matInput placeholder="Data section filter" [value]="statsParams.dataSectionNames" (input)="statsParams.dataSectionNames = $event.target.value">
       </mat-form-field>
       <mat-form-field>
-        <input matInput placeholder="Text section filter" [value]="textSectionNames" (input)="textSectionNames = $event.target.value">
+        <input matInput placeholder="Text section filter" [value]="statsParams.textSectionNames" (input)="statsParams.textSectionNames = $event.target.value">
       </mat-form-field>
     </form>
   </div>

src/app/app.component.ts

@@ -3,8 +3,7 @@ import { HotTableRegisterer } from '@handsontable/angular';
 import * as Handsontable from 'handsontable';
 
 import { FileService, FileProgressCallback } from './file.service';
-import { StatsService } from './stats.service';
-import { LinkerMap, LinkRecord, SectionType, LocateRecord } from '../../common/interfaces/linkermap';
+import { StatsService, StatsParams } from './stats.service';
 
 @Component({
   selector: 'app-root',
@@ -14,18 +13,13 @@ import { LinkerMap, LinkRecord, SectionType, LocateRecord } from '../../common/i
 export class AppComponent implements OnInit {
   title = 'map-viewer';
   filePath: string;
-  linkerMap: LinkerMap;
-  dataset = [];
   showProgressBar: boolean;
   currentView: string;
-  showObjectFiles = false;
-  groupByGroup = true;
-  groupByModule = true;
-  bssSectionNames = '.bss';
-  dataSectionNames = '.data';
-  textSectionNames = '.text';
+  statsParams: StatsParams = new StatsParams();
 
   private hotRegisterer = new HotTableRegisterer();
+
+  dataset = [];
   modulesTableId = 'modules-table-id';
   tableSettings: Handsontable.default.GridSettings = {
     rowHeaders: false,
@@ -83,10 +77,27 @@ export class AppComponent implements OnInit {
   constructor(private fileService: FileService, private statsService: StatsService, private cd: ChangeDetectorRef) {
     this.showProgressBar = false;
     this.currentView = 'main';
+
+    this.statsParams.showObjectFiles = false;
+    this.statsParams.groupByGroup = true;
+    this.statsParams.groupByModule = true;
+    this.statsParams.bssSectionNames = '.bss';
+    this.statsParams.dataSectionNames = '.data';
+    this.statsParams.textSectionNames = '.text';
+    this.statsService.setParams(this.statsParams);
   }
 
   ngOnInit() {
-    //
+    this.statsService.locationStats.subscribe(res => {
+      this.locationTableDataset = Array.from(res.values()).map(loc => {
+        loc.group = Array.from(loc.group.values()).join(', ');
+        loc.name = Array.from(loc.name.values()).join(', ');
+        return loc;
+      });
+    });
+    this.statsService.dataStats.subscribe(res => {
+      this.dataset = Array.from(res.values());
+    });
   }
 
   onSelect() {
@@ -98,9 +109,9 @@ export class AppComponent implements OnInit {
   }
 
   onClose() {
-    if (this.linkerMap) {
-      this.dataset = this.prepareDataset(this.linkerMap);
-    }
+    // if (this.linkerMap) {
+    //   this.dataset = this.prepareDataset(this.linkerMap);
+    // }
     this.currentView = 'main';
   }
 
@@ -125,133 +136,18 @@ export class AppComponent implements OnInit {
   }
 
   toggleShowObjectFilesCheckbox(checked: boolean) {
-    this.showObjectFiles = checked;
-    if (this.linkerMap) {
-      this.dataset = this.prepareDataset(this.linkerMap);
-    }
+    this.statsParams.showObjectFiles = checked;
+    this.statsService.setParams(this.statsParams);
   }
 
   checkGroupByGroup(checked: boolean) {
-    this.groupByGroup = checked;
-    if (this.linkerMap) {
-      this.dataset = this.prepareDataset(this.linkerMap);
-    }
+    this.statsParams.groupByGroup = checked;
+    this.statsService.setParams(this.statsParams);
   }
 
   checkGroupByModule(checked: boolean) {
-    this.groupByModule = checked;
-    if (this.linkerMap) {
-      this.dataset = this.prepareDataset(this.linkerMap);
-    }
-  }
-
-  getSectionType(section: string): SectionType {
-    const name = section.substring(0, section.indexOf('.', 1));
-    if (this.bssSectionNames.split(/\s*,\s*/).includes(name)) {
-      return SectionType.Bss;
-    } else if (this.dataSectionNames.split(/\s*,\s*/).includes(name)) {
-      return SectionType.Data;
-    } else if (this.textSectionNames.split(/\s*,\s*/).includes(name)) {
-      return SectionType.Text;
-    } else {
-      return SectionType.Other;
-    }
-  }
-
-  calcTotalSectionSizes(record: LinkRecord): Map<SectionType, number> {
-    const result = new Map([
-      [SectionType.Bss, 0],
-      [SectionType.Data, 0],
-      [SectionType.Text, 0],
-      [SectionType.Other, 0],
-    ]);
-
-    record.sections.forEach((section) => {
-      section.type = this.getSectionType(section.in.section);
-      result.set(section.type, result.get(section.type) + section.in.size);
-    });
-
-    return result;
-  }
-
-  prepareDataset(linkerMap: LinkerMap) {
-    const fileToArchive = new Map<string, string>();
-    const sectionLocationMapping = new Map<string, LocateRecord>();
-
-    linkerMap.locateResult.forEach((locationRecord) => {
-      sectionLocationMapping.set(locationRecord.section, locationRecord);
-    });
-
-    linkerMap.processedFiles.forEach((file) => {
-      if (file.archiveName) {
-        fileToArchive.set(file.name, file.archiveName);
-      }
-    });
-
-    const dataset = new Map();
-    const locationDataset = new Map();
-    linkerMap.linkResult.forEach((record) => {
-      const archiveName = fileToArchive.get(record.fileName);
-      const totalSize = this.calcTotalSectionSizes(record);
-      const name = archiveName ? (this.showObjectFiles ? archiveName + '(' + record.fileName + ')' : archiveName) : record.fileName;
-
-      if (!dataset.has(name)) {
-        dataset.set(name, {
-          name,
-          bssSize: totalSize.get(SectionType.Bss),
-          dataSize: totalSize.get(SectionType.Data),
-          textSize: totalSize.get(SectionType.Text),
-          otherSize: totalSize.get(SectionType.Other),
-        });
-      } else {
-        dataset.get(name).bssSize += totalSize.get(SectionType.Bss);
-        dataset.get(name).dataSize += totalSize.get(SectionType.Data);
-        dataset.get(name).textSize += totalSize.get(SectionType.Text);
-        dataset.get(name).otherSize += totalSize.get(SectionType.Other);
-      }
-
-      // chip <-> size
-      record.sections.forEach((section) => {
-        const location = sectionLocationMapping.get(section.out.section);
-        if (location) {
-          let key = location.chip;
-          if (this.groupByGroup) {
-            key += location.group;
-          }
-          if (this.groupByModule) {
-            key += name;
-          }
-          if (!locationDataset.has(key)) {
-            locationDataset.set(key, {
-              name: new Set(),
-              chip: location.chip,
-              group: new Set(),
-              size: location.size,
-              actualSize: this.statsService.calcActualSize(location)
-            });
-            locationDataset.get(key).name.add(name);
-            locationDataset.get(key).group.add(location.group);
-          } else {
-            locationDataset.get(key).size += location.size;
-            locationDataset.get(key).actualSize += this.statsService.calcActualSize(location);
-            if (!this.groupByGroup) {
-              locationDataset.get(key).group.add(location.group);
-            }
-            if (!this.groupByModule) {
-              locationDataset.get(key).name.add(name);
-            }
-          }
-        }
-      });
-    });
-
-    this.locationTableDataset = Array.from(locationDataset.values()).map(loc => {
-      loc.group = Array.from(loc.group.values()).join(', ');
-      loc.name = Array.from(loc.name.values()).join(', ');
-      return loc;
-    });
-
-    return Array.from(dataset.values());
+    this.statsParams.groupByModule = checked;
+    this.statsService.setParams(this.statsParams);
   }
 
   loadFile(path?: string) {
@@ -261,11 +157,9 @@ export class AppComponent implements OnInit {
         this.cd.detectChanges(); // notify angular about view changes
       }).then(fileInfo => {
         this.filePath = fileInfo.path;
-        this.linkerMap = fileInfo.payload as LinkerMap;
-        this.dataset = this.prepareDataset(this.linkerMap);
         this.showProgressBar = false;
 
-        this.statsService.analyze(this.linkerMap);
+        this.statsService.analyze(fileInfo.payload);
 
         this.cd.detectChanges(); // notify angular about view changes