improve statistics

lib/log/GWLog.cpp

@@ -21,13 +21,16 @@ void GwLog::logString(const char *fmt,...){
     va_list args;
     va_start(args,fmt);
     xSemaphoreTake(locker, portMAX_DELAY);
-    vsnprintf(buffer,99,fmt,args);
-    buffer[99]=0;
+    vsnprintf(buffer,bufferSize-1,fmt,args);
+    buffer[bufferSize-1]=0;
     if (! writer) {
         xSemaphoreGive(locker);
         return;
     }
     writer->write(prefix.c_str());
+    char buf[20];
+    snprintf(buf,20,"%lu:",millis());
+    writer->write(buf);
     writer->write(buffer);
     writer->write("\n");
     xSemaphoreGive(locker);
@@ -37,8 +40,8 @@ void GwLog::logDebug(int level,const char *fmt,...){
     va_list args;
     va_start(args,fmt);
     xSemaphoreTake(locker, portMAX_DELAY);
-    vsnprintf(buffer,99,fmt,args);
-    buffer[99]=0;
+    vsnprintf(buffer,bufferSize-1,fmt,args);
+    buffer[bufferSize-1]=0;
     if (! writer) {
         xSemaphoreGive(locker);
         return;

lib/log/GwLog.h

@@ -10,7 +10,8 @@ class GwLogWriter{
 };
 class GwLog{
     private:
-        char buffer[100];
+        static const size_t bufferSize=200;
+        char buffer[bufferSize];
         int logLevel=1;
         GwLogWriter *writer;
         SemaphoreHandle_t locker;

lib/statistics/GwStatistics.h

@@ -0,0 +1,105 @@
+#pragma once
+#include <Arduino.h>
+class TimeAverage{
+  double factor=0.3;
+  double current=0;
+  unsigned long count=0;
+  unsigned long max=0;
+  bool init=false;
+  public:
+    TimeAverage(double factor){
+      this->factor=factor;
+    }
+    void add(unsigned long diff){
+      if (diff > max) max=diff;  
+      count++;
+      if (! init){
+          current=(double)diff;
+          init=true;
+      }
+      else{
+          double add=((double)diff - current)*factor;
+          current+=add;
+      }
+    }
+    double getCurrent(){
+      return current;
+    }
+
+    unsigned long getCount(){
+      return count;
+    }
+    void resetMax(){
+        max=0;
+    }
+    unsigned long getMax(){
+        return max;
+    }
+
+};
+class TimeMonitor{
+  public:
+    TimeAverage **times=NULL;
+    unsigned long start=0;
+    unsigned long lastLog=0;
+    unsigned long lastLogCount=0;
+    unsigned long count=0;
+    size_t len;
+    TimeMonitor(size_t len,double factor=0.3){
+      this->len=len;
+      times=new TimeAverage*[len];
+      for (size_t i=0;i<len;i++){
+          times[i]=new TimeAverage(factor);
+      }
+      reset();
+      count=0;
+    }
+    void reset(){
+      start=millis();
+      count++;
+      
+    }
+    double getMax(){
+        double rt=0;
+        for (size_t i=0;i<len;i++){
+            if (times[i]->getCurrent() == 0) continue;
+            if (times[i]->getCurrent() > rt) rt=times[i]->getCurrent();
+        }
+        return rt;
+    }
+    String getLog(){
+      unsigned long now=millis();
+      String log;  
+      if (lastLog != 0){
+          unsigned long num=count-lastLogCount;
+          unsigned long tdif=now-lastLog;
+          if (tdif > 0){
+            log+=String((double)(num*1000)/(double)tdif);
+            log+="/s,";
+            log+=String(getMax());
+            log+="ms#";
+          }
+      }
+      lastLog=now;
+      lastLogCount=count; 
+      for (size_t i=1;i<len;i++){
+        if (times[i]->getCount()){
+          log+=String(i);
+          log+=":";
+          log+=String(times[i]->getCurrent());
+          log+="[";
+          log+=String(times[i]->getMax());
+          log+="],";
+        }
+      }
+      for (size_t i=0;i<len;i++){
+          times[i]->resetMax();
+      }
+      return log;
+    }
+    void setTime(size_t index){
+      if (index < 1 || index >= len) return;
+      unsigned long current=millis()-start;
+      times[index-1]->add(current);
+    }
+};