Impl sheet maps

Author: hikalium

.gitignore

@@ -10,5 +10,6 @@ mnt/
 *.o
 *.dat
 *.log
+*.tmp
 cc_cache.gen.mk
 prebuilt/

src/command.cc

@@ -655,17 +655,21 @@ void Run(TextBox& tbox) {
     Virtio::Net& net = Virtio::Net::GetInstance();
     auto ip_addr = net.GetSelfIPv4Addr();
     auto mac_addr = net.GetSelfEtherAddr();
-    ip_addr.Print();
-    PutString(" eth ");
-    mac_addr.Print();
+
     auto& network = Network::GetInstance();
-    PutString(" mask ");
     auto mask = network.GetIPv4NetMask();
-    mask.Print();
-    PutString(" gateway ");
     auto gateway_ip = network.GetIPv4DefaultGateway();
-    gateway_ip.Print();
-    PutString("\n");
+
+    StringBuffer<128> line;
+    ip_addr.WriteString(line);
+    line.WriteString(" eth ");
+    mac_addr.WriteString(line);
+    line.WriteString(" mask ");
+    mask.WriteString(line);
+    line.WriteString(" gateway ");
+    gateway_ip.WriteString(line);
+    line.WriteChar('\n');
+    PutString(line.GetString());
     return;
   }
   if (IsEqualString(args.GetArg(0), "arp")) {

src/kernel.cc

@@ -6,6 +6,7 @@
 #include <vector>
 
 #include "corefunc.h"
+#include "kernel.h"
 #include "liumos.h"
 #include "panic_printer.h"
 #include "pci.h"
@@ -104,6 +105,8 @@ void InitializeVRAMForKernel() {
   virtual_vram_.Init(reinterpret_cast<uint32_t*>(kernel_virtual_vram_base),
                      xsize, ysize, ppsl);
   liumos->vram_sheet = &virtual_vram_;
+  virtual_vram_.SetMap(AllocKernelMemory<Sheet**>(
+      virtual_vram_.GetXSize() * virtual_vram_.GetYSize() * sizeof(Sheet*)));
 
   constexpr uint64_t kernel_virtual_screen_base = 0xFFFF'FFFF'8800'0000ULL;
   CreatePageMapping(

src/network.cc

@@ -4,27 +4,21 @@
 #include "virtio_net.h"
 
 void Network::IPv4Addr::Print() const {
-  for (int i = 0; i < 4; i++) {
-    PutDecimal64(addr[i]);
-    if (i != 3)
-      PutChar('.');
-  }
+  StringBuffer<128> line;
+  WriteString(line);
+  PutString(line.GetString());
 }
 
 void Network::IPv4NetMask::Print() const {
-  for (int i = 0; i < 4; i++) {
-    PutDecimal64(mask[i]);
-    if (i != 3)
-      PutChar('.');
-  }
+  StringBuffer<128> line;
+  WriteString(line);
+  PutString(line.GetString());
 }
 
 void Network::EtherAddr::Print() const {
-  for (int i = 0; i < 6; i++) {
-    PutHex8ZeroFilled(mac[i]);
-    if (i != 5)
-      PutChar(':');
-  }
+  StringBuffer<128> line;
+  WriteString(line);
+  PutString(line.GetString());
 }
 
 Network* Network::network_;

src/network.h

@@ -7,6 +7,8 @@
 #include "generic.h"
 #include "ring_buffer.h"
 
+#include "string_buffer.h"
+
 class Network {
  public:
   //
@@ -23,6 +25,15 @@ class Network {
     }
     bool operator==(const EtherAddr& rhs) const { return IsEqualTo(rhs); }
     void Print() const;
+
+    template <typename T>
+    void WriteString(T & string_buf) const {
+      for (int i = 0; i < 6; i++) {
+        string_buf.WriteHex8ZeroFilled(mac[i]);
+        if (i != 5)
+          string_buf.WriteChar(':');
+      }
+    }
   };
   static constexpr EtherAddr kBroadcastEtherAddr = {0xFF, 0xFF, 0xFF,
                                                     0xFF, 0xFF, 0xFF};
@@ -79,6 +90,15 @@ class Network {
   packed_struct IPv4NetMask {
     uint8_t mask[4];
     void Print() const;
+
+    template <typename T>
+    void WriteString(T & string_buf) const {
+      for (int i = 0; i < 4; i++) {
+        string_buf.WriteDecimal64(mask[i]);
+        if (i != 3)
+          string_buf.WriteChar('.');
+      }
+    }
   };
   packed_struct IPv4Addr {
     uint8_t addr[4];
@@ -107,6 +127,15 @@ class Network {
                *reinterpret_cast<const uint32_t*>(another.addr)) &
               *reinterpret_cast<const uint32_t*>(mask.mask)) == 0;
     }
+
+    template <typename T>
+    void WriteString(T & string_buf) const {
+      for (int i = 0; i < 4; i++) {
+        string_buf.WriteDecimal64(addr[i]);
+        if (i != 3)
+          string_buf.WriteChar('.');
+      }
+    }
   };
   struct IPv4AddrHash {
     std::size_t operator()(const IPv4Addr& v) const {

src/sheet.cc

@@ -61,15 +61,24 @@ void Sheet::Flush(int rx, int ry, int rw, int rh) {
   for (int y = ty; y < ty + th; y++) {
     int tbegin = tx;
     for (int x = tx; x < tx + tw; x++) {
-      bool is_covered = false;
-      for (Sheet* s = parent_->children_; s && s != this; s = s->below_) {
-        if (s->IsInRectOnParent(x, y)) {
-          is_covered = true;
-          break;
+      if (parent_->map_) {
+        // Fast path
+        if (parent_->map_[y * parent_->GetXSize() + x] == this) {
+          continue;
+        }
+      } else {
+        // Slow path (should be removed)
+        bool is_covered = false;
+        for (Sheet* s = parent_->children_; s && s != this; s = s->below_) {
+          if (s->IsInRectOnParent(x, y)) {
+            is_covered = true;
+            break;
+          }
+        }
+        if (!is_covered) {
+          continue;
         }
       }
-      if (!is_covered)
-        continue;
       parent_->TransferLineFrom(*this, y, tbegin, x - tbegin);
       tbegin = x + 1;
     }

src/sheet.h

@@ -26,16 +26,45 @@ class Sheet {
     pixels_per_scan_line_ = pixels_per_scan_line;
     rect_.x = x;
     rect_.y = y;
+    map_ = nullptr;
+  }
+  void SetMap(Sheet** map) {
+    map_ = map;
+    UpdateMap();
+  }
+  void UpdateMap() {
+    if (!map_) {
+      return;
+    }
+    for (int y = 0; y < GetYSize(); y++) {
+      for (int x = 0; x < GetXSize(); x++) {
+        map_[y * GetXSize() + x] = nullptr;
+      }
+    }
+    Rect client_rect = GetClientRect();
+    for (Sheet* s = children_; s; s = s->below_) {
+      Rect in_view = client_rect.GetIntersectionWith(s->GetRect());
+      for (int y = in_view.y; y < in_view.y + in_view.ysize; y++) {
+        for (int x = in_view.x; x < in_view.x + in_view.xsize; x++) {
+          if (map_[y * GetXSize() + x]) {
+            continue;
+          }
+          map_[y * GetXSize() + x] = s;
+        }
+      }
+    }
   }
   void SetParent(Sheet* parent) {
     // Insert at front
     below_ = parent->children_;
     parent_ = parent;
-    parent->children_ = this;
+    parent_->children_ = this;
+    parent_->UpdateMap();
   }
   void SetPosition(int x, int y) {
     rect_.x = x;
     rect_.y = y;
+    parent_->UpdateMap();
   }
   void MoveRelative(int dx, int dy) {
     SetPosition(GetX() + dx, GetY() + dy);
@@ -70,6 +99,7 @@ class Sheet {
   void TransferLineFrom(Sheet& src, int py, int px, int w);
   Sheet *parent_, *below_, *children_;
   uint32_t* buf_;
+  Sheet** map_;
   Rect rect_;
   int pixels_per_scan_line_;
 };