From e9be5c6dbfcebdbc9ff0ee5ee161b7fa338a6726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9a=20Saviot?= <lea.saviot@numworks.com>
Date: Thu, 30 Aug 2018 10:53:06 +0200
Subject: [PATCH] [poincare] Init Poincare by creating a shared TreePool

---
 apps/main.cpp                         | 4 ++++
 poincare/Makefile                     | 4 ++++
 poincare/include/poincare/tree_pool.h | 4 +++-
 poincare/src/tree_pool.cpp            | 5 -----
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/apps/main.cpp b/apps/main.cpp
index 9c2adde8b..f258c8c09 100644
--- a/apps/main.cpp
+++ b/apps/main.cpp
@@ -1,7 +1,11 @@
 #include "apps_container_storage.h"
 #include "global_preferences.h"
+#include <poincare/init.h>
 
 void ion_main(int argc, char * argv[]) {
+  // Initialize Poincare::TreePool::sharedPool
+  Poincare::init();
+
 #if EPSILON_GETOPT
   for (int i=1; i<argc; i++) {
     if (argv[i][0] != '-' || argv[i][1] != '-') {
diff --git a/poincare/Makefile b/poincare/Makefile
index 5a37da89e..4431bdaa6 100644
--- a/poincare/Makefile
+++ b/poincare/Makefile
@@ -33,6 +33,10 @@ objs += $(addprefix poincare/src/,\
   vertical_offset_layout_node.o\
 )
 
+objs += $(addprefix poincare/src/,\
+  init.o\
+)
+
 objs += $(addprefix poincare/src/,\
   absolute_value.o\
   addition.o\
diff --git a/poincare/include/poincare/tree_pool.h b/poincare/include/poincare/tree_pool.h
index 7228e1213..8b183b9b1 100644
--- a/poincare/include/poincare/tree_pool.h
+++ b/poincare/include/poincare/tree_pool.h
@@ -20,7 +20,8 @@ class TreePool {
 public:
   static constexpr int NoNodeIdentifier = -1;
 
-  static TreePool * sharedPool();
+  static TreePool * sharedPool() { assert(SharedPool != nullptr); return SharedPool; }
+  void registerPool(TreePool * pool) {  assert(SharedPool == nullptr); SharedPool = pool; }
 
   // Node
   TreeNode * node(int identifier) const {
@@ -128,6 +129,7 @@ private:
   constexpr static int BufferSize = 32768;
   constexpr static int MaxNumberOfNodes = BufferSize/sizeof(TreeNode);
   constexpr static int MaxNumberOfStaticNodes = 200; // TODO: count how may are needed
+  static TreePool * SharedPool = nullptr;
 
   // TreeNode
   void discardTreeNode(TreeNode * node) {
diff --git a/poincare/src/tree_pool.cpp b/poincare/src/tree_pool.cpp
index 4c331c3a8..bfa8a3d18 100644
--- a/poincare/src/tree_pool.cpp
+++ b/poincare/src/tree_pool.cpp
@@ -5,11 +5,6 @@
 
 namespace Poincare {
 
-TreePool * TreePool::sharedPool() {
-  static TreePool pool;
-  return &pool;
-}
-
 static void memmove32(uint32_t * dst, uint32_t * src, size_t len) {
   if (src < dst && dst < src + len) {
     /* Copy backwards to avoid overwrites */