chore: strip out memory logs

Author: zfields

src/Arduino_NotecardConnectionHandler.cpp

@@ -52,16 +52,6 @@
    STLINK DEBUG OUTPUT
  ******************************************************************************/
 
-// Report memory usage when enabled
-#if defined(LOG_MEMORY_USAGE)
-  #include <malloc.h>
-
-  void logMemoryUsage (const char *ctx_, bool enter_ = false) {
-    struct mallinfo mi = mallinfo();
-    Debug.print(DBG_DEBUG, F("[MEMORY][%s %s] Allocated: %d bytes"), (enter_ ? ">>>>" : "<<<<"), ctx_, mi.uordblks);
-  }
-#endif
-
 // Provide Notehub debug output via STLINK serial port when available
 #if defined(ARDUINO_SWAN_R5) || defined(ARDUINO_CYGNET)
   #define STLINK_DEBUG
@@ -328,9 +318,6 @@ int NotecardConnectionHandler::write(const uint8_t * buf_, size_t size_)
 NetworkConnectionState NotecardConnectionHandler::update_handleInit()
 {
   NetworkConnectionState result = NetworkConnectionState::INIT;
-#if defined(LOG_MEMORY_USAGE)
-  logMemoryUsage(__FUNCTION__, true);
-#endif
 
  // Configure Hardware
 ///////////////////////
@@ -527,18 +514,12 @@ NetworkConnectionState NotecardConnectionHandler::update_handleInit()
     }
   }
 
-#if defined(LOG_MEMORY_USAGE)
-  logMemoryUsage(__FUNCTION__);
-#endif
   return result;
 }
 
 NetworkConnectionState NotecardConnectionHandler::update_handleConnecting()
 {
   NetworkConnectionState result;
-#if defined(LOG_MEMORY_USAGE)
-  logMemoryUsage(__FUNCTION__, true);
-#endif
 
   // Check the connection status
   const NotecardConnectionStatus conn_status = connected();
@@ -566,18 +547,12 @@ NetworkConnectionState NotecardConnectionHandler::update_handleConnecting()
     }
   }
 
-#if defined(LOG_MEMORY_USAGE)
-  logMemoryUsage(__FUNCTION__);
-#endif
   return result;
 }
 
 NetworkConnectionState NotecardConnectionHandler::update_handleConnected()
 {
   NetworkConnectionState result;
-#if defined(LOG_MEMORY_USAGE)
-  logMemoryUsage(__FUNCTION__, true);
-#endif
 
   const NotecardConnectionStatus conn_status = connected();
   if (!conn_status.connected_to_notehub) {
@@ -591,34 +566,22 @@ NetworkConnectionState NotecardConnectionHandler::update_handleConnected()
     result = NetworkConnectionState::CONNECTED;
   }
 
-#if defined(LOG_MEMORY_USAGE)
-  logMemoryUsage(__FUNCTION__);
-#endif
   return result;
 }
 
 NetworkConnectionState NotecardConnectionHandler::update_handleDisconnecting()
 {
   NetworkConnectionState result;
-#if defined(LOG_MEMORY_USAGE)
-  logMemoryUsage(__FUNCTION__, true);
-#endif
 
   Debug.print(DBG_ERROR, F("Connection to the network lost."));
   result = NetworkConnectionState::DISCONNECTED;
 
-#if defined(LOG_MEMORY_USAGE)
-  logMemoryUsage(__FUNCTION__);
-#endif
   return result;
 }
 
 NetworkConnectionState NotecardConnectionHandler::update_handleDisconnected()
 {
   NetworkConnectionState result;
-#if defined(LOG_MEMORY_USAGE)
-  logMemoryUsage(__FUNCTION__, true);
-#endif
 
   if (_keep_alive)
   {
@@ -636,9 +599,6 @@ NetworkConnectionState NotecardConnectionHandler::update_handleDisconnected()
     }
   }
 
-#if defined(LOG_MEMORY_USAGE)
-  logMemoryUsage(__FUNCTION__);
-#endif
   return result;
 }
 
@@ -649,9 +609,6 @@ NetworkConnectionState NotecardConnectionHandler::update_handleDisconnected()
 bool NotecardConnectionHandler::armInterrupt (void) const
 {
   bool result;
-#if defined(LOG_MEMORY_USAGE)
-  logMemoryUsage(__FUNCTION__, true);
-#endif
 
   if (J *req = _notecard.newRequest("card.attn")) {
     JAddStringToObject(req, "mode","rearm,files");
@@ -681,18 +638,12 @@ bool NotecardConnectionHandler::armInterrupt (void) const
     result = false;
   }
 
-#if defined(LOG_MEMORY_USAGE)
-  logMemoryUsage(__FUNCTION__);
-#endif
   return result;
 }
 
 bool NotecardConnectionHandler::configureConnection (bool connect_) const
 {
   bool result;
-#if defined(LOG_MEMORY_USAGE)
-  logMemoryUsage(__FUNCTION__, true);
-#endif
 
   if (J *req = _notecard.newRequest("hub.set")) {
     // Only update the product if it is not empty or the default value
@@ -733,18 +684,12 @@ bool NotecardConnectionHandler::configureConnection (bool connect_) const
     result = false; // Assume the worst
   }
 
-#if defined(LOG_MEMORY_USAGE)
-  logMemoryUsage(__FUNCTION__);
-#endif
   return result;
 }
 
 uint_fast8_t NotecardConnectionHandler::connected (void) const
 {
   NotecardConnectionStatus result;
-#if defined(LOG_MEMORY_USAGE)
-  logMemoryUsage(__FUNCTION__, true);
-#endif
 
   // Query the connection status from the Notecard
   if (J *rsp = _notecard.requestAndResponse(_notecard.newRequest("hub.status"))) {
@@ -775,18 +720,12 @@ uint_fast8_t NotecardConnectionHandler::connected (void) const
     result.host_error = true;
   }
 
-#if defined(LOG_MEMORY_USAGE)
-  logMemoryUsage(__FUNCTION__);
-#endif
   return result;
 }
 
 J * NotecardConnectionHandler::getNote (bool pop_) const
 {
   J * result;
-#if defined(LOG_MEMORY_USAGE)
-  logMemoryUsage(__FUNCTION__, true);
-#endif
 
   // Look for a Note in the NOTEFILE_SECURE_INBOUND file
   if (J *req = _notecard.newRequest("note.get")) {
@@ -824,15 +763,13 @@ J * NotecardConnectionHandler::getNote (bool pop_) const
     result = nullptr;
   }
 
-#if defined(LOG_MEMORY_USAGE)
-  logMemoryUsage(__FUNCTION__);
-#endif
   return result;
 }
 
 int NotecardConnectionHandler::initiateNotehubSync (void) const
 {
   int result;
+
   Debug.print(DBG_DEBUG, F("Initiating Notehub sync..."));
   if (J *rsp = _notecard.requestAndResponse(_notecard.newRequest("hub.sync"))) {
     // Check the response for errors
@@ -856,9 +793,6 @@ int NotecardConnectionHandler::initiateNotehubSync (void) const
 bool NotecardConnectionHandler::updateUidCache (void)
 {
   bool result;
-#if defined(LOG_MEMORY_USAGE)
-  logMemoryUsage(__FUNCTION__, true);
-#endif
 
   // This operation is safe to perform before a sync has occurred, because the
   // Notecard UID is static and the cloud value of Serial Number is strictly
@@ -885,9 +819,6 @@ bool NotecardConnectionHandler::updateUidCache (void)
     result = false;
   }
 
-#if defined(LOG_MEMORY_USAGE)
-  logMemoryUsage(__FUNCTION__);
-#endif
   return result;
 }