[TMP] finding memory usage raise culprit

Author: andreagilardoni

src/cbor/CborEncoder.cpp

@@ -1,5 +1,6 @@
 #include "CborEncoder.h"
 
+static CBORMessageEncoderClass* singleton = nullptr;
 CBORMessageEncoderClass& CBORMessageEncoder = CBORMessageEncoderClass::getInstance();
 
 Encoder::Status CBORMessageEncoderClass::encode(Message* message, uint8_t * data, size_t& len) { // TODO do we need to propagate the maximum length?
@@ -25,6 +26,13 @@ Encoder::Status CBORMessageEncoderClass::encode(Message* message, uint8_t * data
   return Encoder::Status::Complete;
 }
 
+CBORMessageEncoderClass& CBORMessageEncoderClass::getInstance() {
+  if(singleton == nullptr) {
+    singleton = new CBORMessageEncoderClass();
+  }
+  return *singleton;
+}
+
 CBORMessageEncoderInterface::CBORMessageEncoderInterface(const CBORTag tag, const MessageId id)
 : tag(tag), id(id) {
   // call singleton/global variable and insert this encoder

src/cbor/CborEncoder.h

@@ -35,9 +35,8 @@ class CBORMessageEncoderInterface {
 // TODO make a private constructor?
 class CBORMessageEncoderClass: public Encoder {
 public:
-  static CBORMessageEncoderClass& getInstance() {
-    return singleton;
-  }
+CBORMessageEncoderClass() {}
+  static CBORMessageEncoderClass& getInstance();
 
   void append(CBORTag id, CBORMessageEncoderInterface* encoder) {
     encoders[id] = encoder;
@@ -46,7 +45,6 @@ class CBORMessageEncoderClass: public Encoder {
   Encoder::Status encode(Message* message, uint8_t * data, size_t& len);
 private:
   std::map<MessageId, CBORMessageEncoderInterface*> encoders;
-  static CBORMessageEncoderClass singleton;
 };
 
 extern CBORMessageEncoderClass& CBORMessageEncoder;