Display init refactoring, move cleanup to instance constructor

djphoenix · Nov 14, 2016 · f507551 · f507551
1 parent cd7879e
commit f507551
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/boot/boot.cpp b/src/boot/boot.cpp
@@ -23,7 +23,6 @@
 #include "processmanager.hpp"
 
 void NORETURN main() {
-  Display::getInstance()->clean();
   Pagetable::init();
   SMP::init();
   ModuleManager::init();

diff --git a/src/kernlib/display.cpp b/src/kernlib/display.cpp
@@ -22,6 +22,7 @@ const size_t ConsoleDisplay::size = ConsoleDisplay::top - ConsoleDisplay::base;
 
 ConsoleDisplay::ConsoleDisplay() {
   display = base;
+  clean();
 }
 
 void ConsoleDisplay::putc(const char c) {
@@ -60,16 +61,18 @@ void ConsoleDisplay::clean() {
 }
 
 static Mutex instanceMutex;
-static ConsoleDisplay defaultDisplay;
-Display *Display::instance;
+static ConsoleDisplay sharedConsole;
+Display *Display::instance = Display::initInstance();
+
+Display *Display::initInstance() {
+  return &sharedConsole;
+}
 
 Display *Display::getInstance() {
   if (instance) return instance;
   instanceMutex.lock();
-  if (!instance) {
-    instance = &defaultDisplay;
-    // TODO: create dynamic instance
-  }
+  if (!instance)
+    instance = initInstance();
   instanceMutex.release();
   return instance;
 }

diff --git a/src/kernlib/include/kernlib/display.hpp b/src/kernlib/include/kernlib/display.hpp
@@ -20,7 +20,10 @@
 
 class Display {
  private:
+  static Display *initInstance();
   static Display *instance;
+ protected:
+  Mutex mutex;
  public:
   static Display *getInstance();
   virtual void clean() = 0;
@@ -35,7 +38,6 @@ class ConsoleDisplay: public Display {
   static const size_t size;
   char *display;
   void putc(const char c);
-  Mutex mutex;
  public:
   ConsoleDisplay();
   void write(const char *str);