Boot framework rework (#45)

[lunaix-os.git] / lunaix-os / scripts / gdb / lunadbg / mem.py

diff --git a/lunaix-os/scripts/gdb/lunadbg/mem.py b/lunaix-os/scripts/gdb/lunadbg/mem.py
index 8829e1b0c35538760f834b551a56f7234ed443cf..b7e55b8b5b5286b397511f344e023f8b837a791a 100644 (file)
--- a/lunaix-os/scripts/gdb/lunadbg/mem.py
+++ b/lunaix-os/scripts/gdb/lunadbg/mem.py
@@ -1,7 +1,7 @@
 from .commands import LunadbgCommand
 from .pp import MyPrettyPrinter
 from .profiling.pmstat import PhysicalMemProfile
 from .commands import LunadbgCommand
 from .pp import MyPrettyPrinter
 from .profiling.pmstat import PhysicalMemProfile

-from .structs.pagetable import PageTable, PageTableEntry
+from .structs.pagetable import PageTable

 
 class MMStats(LunadbgCommand):
     def __init__(self) -> None:
 
 class MMStats(LunadbgCommand):
     def __init__(self) -> None:


@@ -27,16 +27,17 @@ class MMStats(LunadbgCommand):
         pmem.rescan_pmem(optn.granule)
 
         pp.printf("Total: %dKiB (%d@4K)", 
         pmem.rescan_pmem(optn.granule)
 
         pp.printf("Total: %dKiB (%d@4K)", 

-                  pmem.max_mem_sz, pmem.max_mem_pg)
+                  pmem.max_mem_sz / 1024, pmem.max_mem_pg)

         
         pp.printf("Used:  %dKiB (%d@4K) ~%.2f%%", 
         
         pp.printf("Used:  %dKiB (%d@4K) ~%.2f%%", 

-                  pmem.consumed_pg * 4096, 
+                  pmem.consumed_pg * 4096 / 1024, 

                   pmem.consumed_pg, pmem.utilisation * 100)
         
         pp.printf("Fragmentations: %d ~%.2f%%", pmem.discontig, pmem.fragmentation * 100)
         pp.print()
         
         pp.print("Distribution")
                   pmem.consumed_pg, pmem.utilisation * 100)
         
         pp.printf("Fragmentations: %d ~%.2f%%", pmem.discontig, pmem.fragmentation * 100)
         pp.print()
         
         pp.print("Distribution")

+        pp.print("( . = empty, * = full, [0-9]0% full )")

         pp2 = pp.next_level(2)
         row = []
         for i in range(0, len(pmem.mem_distr)):
         pp2 = pp.next_level(2)
         row = []
         for i in range(0, len(pmem.mem_distr)):


@@ -45,14 +46,14 @@ class MMStats(LunadbgCommand):
             if ratio == 0:
                 row.append('.')
             elif ratio == 1:
             if ratio == 0:
                 row.append('.')
             elif ratio == 1:

-                row.append('F')
+                row.append('*')

             else:
                 row.append(str(cat))
                 
             if (i + 1) % optn.cols == 0:
                 pp2.print(''.join(row))
                 row.clear()
             else:
                 row.append(str(cat))
                 
             if (i + 1) % optn.cols == 0:
                 pp2.print(''.join(row))
                 row.clear()

-        if (i + 1) % optn.cols != 0:
+        if len(row) > 0:

             pp2.print(''.join(row))
         
         pp.printf("(granule: %d, density: %d@4K)", optn.granule, pmem.page_per_granule)
             pp2.print(''.join(row))
         
         pp.printf("(granule: %d, density: %d@4K)", optn.granule, pmem.page_per_granule)


@@ -79,8 +80,7 @@ class MMStats(LunadbgCommand):
         else:
             print("unknow mem type:", optn.state_type)
 
         else:
             print("unknow mem type:", optn.state_type)
 

-    def invoke(self, argument: str, from_tty: bool) -> None:
-        optn = self._parse_args(argument)
+    def on_execute(self, optn, gdb_args, from_tty) -> None:

         pp = MyPrettyPrinter()
 
         if optn.cmd == 'stats':
         pp = MyPrettyPrinter()
 
         if optn.cmd == 'stats':