Print memory stats

page/src/components/emulation-summary.tsx

@@ -1,6 +1,6 @@
 import { EmulationStatus } from "@/emulator";
 import { TextTooltip } from "./text-tooltip";
-import { BarChartSteps, CpuFill } from "react-bootstrap-icons";
+import { BarChartSteps, CpuFill, FloppyFill } from "react-bootstrap-icons";
 
 import "./emulation-summary.css";
 
@@ -8,6 +8,20 @@ export interface EmulationSummaryProps {
   status?: EmulationStatus;
 }
 
+function formatMemory(value: BigInt): string {
+  const abbr = ["B", "KB", "MB", "GB", "PB"];
+
+  let num = Number(value);
+  let index = 0;
+
+  while (num >= 1024 && index < abbr.length - 1) {
+    num /= 1024;
+    index++;
+  }
+
+  return num.toFixed(2) + " " + abbr[index];
+}
+
 export function EmulationSummary(props: EmulationSummaryProps) {
   if (!props.status) {
     return <></>;
@@ -20,6 +34,11 @@ export function EmulationSummary(props: EmulationSummaryProps) {
         <BarChartSteps className="inline ml-3" />
       </TextTooltip>
       <br />
+      <TextTooltip tooltip={"Application memory"}>
+        {formatMemory(props.status.committedMemory)}
+        <FloppyFill className="inline ml-3" />
+      </TextTooltip>
+      <br />
       <TextTooltip tooltip={"Executed instructions"}>
         {props.status.executedInstructions.toLocaleString()}
         <CpuFill className="inline ml-3" />

page/src/emulator.ts

@@ -14,14 +14,18 @@ export enum EmulationState {
 }
 
 export interface EmulationStatus {
-  executedInstructions: BigInt;
   activeThreads: number;
+  reservedMemory: BigInt;
+  committedMemory: BigInt;
+  executedInstructions: BigInt;
 }
 
 function createDefaultEmulationStatus(): EmulationStatus {
   return {
     executedInstructions: BigInt(0),
     activeThreads: 0,
+    reservedMemory: BigInt(0),
+    committedMemory: BigInt(0),
   };
 }
 
@@ -239,6 +243,8 @@ export class Emulator {
     this.stautsUpdateHandler({
       activeThreads: info.activeThreads,
       executedInstructions: info.executedInstructions,
+      reservedMemory: info.reservedMemory,
+      committedMemory: info.committedMemory,
     });
   }
 

page/src/fb/debugger/emulation-status.ts

@@ -24,29 +24,13 @@ static getSizePrefixedRootAsEmulationStatus(bb:flatbuffers.ByteBuffer, obj?:Emul
   return (obj || new EmulationStatus()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
 }
 
-executedInstructions():bigint {
-  const offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? this.bb!.readUint64(this.bb_pos + offset) : BigInt('0');
-}
-
-mutate_executed_instructions(value:bigint):boolean {
-  const offset = this.bb!.__offset(this.bb_pos, 4);
-
-  if (offset === 0) {
-    return false;
-  }
-
-  this.bb!.writeUint64(this.bb_pos + offset, value);
-  return true;
-}
-
 activeThreads():number {
-  const offset = this.bb!.__offset(this.bb_pos, 6);
+  const offset = this.bb!.__offset(this.bb_pos, 4);
   return offset ? this.bb!.readUint32(this.bb_pos + offset) : 0;
 }
 
 mutate_active_threads(value:number):boolean {
-  const offset = this.bb!.__offset(this.bb_pos, 6);
+  const offset = this.bb!.__offset(this.bb_pos, 4);
 
   if (offset === 0) {
     return false;
@@ -56,16 +40,72 @@ mutate_active_threads(value:number):boolean {
   return true;
 }
 
-static startEmulationStatus(builder:flatbuffers.Builder) {
-  builder.startObject(2);
+reservedMemory():bigint {
+  const offset = this.bb!.__offset(this.bb_pos, 6);
+  return offset ? this.bb!.readUint64(this.bb_pos + offset) : BigInt('0');
 }
 
-static addExecutedInstructions(builder:flatbuffers.Builder, executedInstructions:bigint) {
-  builder.addFieldInt64(0, executedInstructions, BigInt('0'));
+mutate_reserved_memory(value:bigint):boolean {
+  const offset = this.bb!.__offset(this.bb_pos, 6);
+
+  if (offset === 0) {
+    return false;
+  }
+
+  this.bb!.writeUint64(this.bb_pos + offset, value);
+  return true;
+}
+
+committedMemory():bigint {
+  const offset = this.bb!.__offset(this.bb_pos, 8);
+  return offset ? this.bb!.readUint64(this.bb_pos + offset) : BigInt('0');
+}
+
+mutate_committed_memory(value:bigint):boolean {
+  const offset = this.bb!.__offset(this.bb_pos, 8);
+
+  if (offset === 0) {
+    return false;
+  }
+
+  this.bb!.writeUint64(this.bb_pos + offset, value);
+  return true;
+}
+
+executedInstructions():bigint {
+  const offset = this.bb!.__offset(this.bb_pos, 10);
+  return offset ? this.bb!.readUint64(this.bb_pos + offset) : BigInt('0');
+}
+
+mutate_executed_instructions(value:bigint):boolean {
+  const offset = this.bb!.__offset(this.bb_pos, 10);
+
+  if (offset === 0) {
+    return false;
+  }
+
+  this.bb!.writeUint64(this.bb_pos + offset, value);
+  return true;
+}
+
+static startEmulationStatus(builder:flatbuffers.Builder) {
+  builder.startObject(4);
 }
 
 static addActiveThreads(builder:flatbuffers.Builder, activeThreads:number) {
-  builder.addFieldInt32(1, activeThreads, 0);
+  builder.addFieldInt32(0, activeThreads, 0);
+}
+
+static addReservedMemory(builder:flatbuffers.Builder, reservedMemory:bigint) {
+  builder.addFieldInt64(1, reservedMemory, BigInt('0'));
+}
+
+static addCommittedMemory(builder:flatbuffers.Builder, committedMemory:bigint) {
+  builder.addFieldInt64(2, committedMemory, BigInt('0'));
+}
+
+static addExecutedInstructions(builder:flatbuffers.Builder, executedInstructions:bigint) {
+  builder.addFieldInt64(3, executedInstructions, BigInt('0'));
 }
 
 static endEmulationStatus(builder:flatbuffers.Builder):flatbuffers.Offset {
@@ -73,38 +113,48 @@ static endEmulationStatus(builder:flatbuffers.Builder):flatbuffers.Offset {
   return offset;
 }
 
-static createEmulationStatus(builder:flatbuffers.Builder, executedInstructions:bigint, activeThreads:number):flatbuffers.Offset {
+static createEmulationStatus(builder:flatbuffers.Builder, activeThreads:number, reservedMemory:bigint, committedMemory:bigint, executedInstructions:bigint):flatbuffers.Offset {
   EmulationStatus.startEmulationStatus(builder);
-  EmulationStatus.addExecutedInstructions(builder, executedInstructions);
   EmulationStatus.addActiveThreads(builder, activeThreads);
+  EmulationStatus.addReservedMemory(builder, reservedMemory);
+  EmulationStatus.addCommittedMemory(builder, committedMemory);
+  EmulationStatus.addExecutedInstructions(builder, executedInstructions);
   return EmulationStatus.endEmulationStatus(builder);
 }
 
 unpack(): EmulationStatusT {
   return new EmulationStatusT(
-    this.executedInstructions(),
-    this.activeThreads()
+    this.activeThreads(),
+    this.reservedMemory(),
+    this.committedMemory(),
+    this.executedInstructions()
   );
 }
 
 
 unpackTo(_o: EmulationStatusT): void {
-  _o.executedInstructions = this.executedInstructions();
   _o.activeThreads = this.activeThreads();
+  _o.reservedMemory = this.reservedMemory();
+  _o.committedMemory = this.committedMemory();
+  _o.executedInstructions = this.executedInstructions();
 }
 }
 
 export class EmulationStatusT implements flatbuffers.IGeneratedObject {
 constructor(
-  public executedInstructions: bigint = BigInt('0'),
-  public activeThreads: number = 0
+  public activeThreads: number = 0,
+  public reservedMemory: bigint = BigInt('0'),
+  public committedMemory: bigint = BigInt('0'),
+  public executedInstructions: bigint = BigInt('0')
 ){}
 
 
 pack(builder:flatbuffers.Builder): flatbuffers.Offset {
   return EmulationStatus.createEmulationStatus(builder,
-    this.executedInstructions,
-    this.activeThreads
+    this.activeThreads,
+    this.reservedMemory,
+    this.committedMemory,
+    this.executedInstructions
   );
 }
 }