[TMP] finding memory usage raise culprit

Author: andreagilardoni

src/cbor/CborDecoder.cpp

@@ -1,5 +1,6 @@
 #include "CborDecoder.h"
 
+static CBORMessageDecoderClass* singleton = nullptr;
 CBORMessageDecoderClass& CBORMessageDecoder = CBORMessageDecoderClass::getInstance();
 
 Decoder::Status CBORMessageDecoderClass::decode(Message* msg, const uint8_t* const buf, size_t &len) { // TODO do we need to propagate the maximum length?
@@ -39,6 +40,13 @@ Decoder::Status CBORMessageDecoderClass::decode(Message* msg, const uint8_t* con
   return Decoder::Status::Complete;
 }
 
+CBORMessageDecoderClass& CBORMessageDecoderClass::getInstance() {
+  if(singleton == nullptr) {
+    singleton = new CBORMessageDecoderClass();
+  }
+  return *singleton;
+}
+
 CBORMessageDecoderInterface::CBORMessageDecoderInterface(const CBORTag tag, const MessageId id)
 : tag(tag), id(id) {
   // call singleton/global variable and insert this encoder

src/cbor/CborDecoder.h

@@ -35,10 +35,8 @@ class CBORMessageDecoderInterface {
 // TODO make a private constructor?
 class CBORMessageDecoderClass: public Decoder {
 public:
-  static CBORMessageDecoderClass& getInstance() {
-    return singleton;
-  }
-
+  CBORMessageDecoderClass() {}
+  static CBORMessageDecoderClass& getInstance();
 
   void append(CBORTag id, CBORMessageDecoderInterface* encoder) {
     decoders[id] = encoder;
@@ -47,7 +45,6 @@ class CBORMessageDecoderClass: public Decoder {
   Decoder::Status decode(Message* msg, const uint8_t* const buf, size_t &len);
 private:
   std::map<CBORTag, CBORMessageDecoderInterface*> decoders;
-  static CBORMessageDecoderClass singleton;
 };
 
 extern CBORMessageDecoderClass& CBORMessageDecoder;