Revision 0:caae6cde6ca8, committed 2016-05-27

Comitter:

ketjow

Date:

Fri May 27 10:27:41 2016 +0000

Commit message:

Initial

Changed in this revision

diff -r 000000000000 -r caae6cde6ca8 logger.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/logger.cpp	Fri May 27 10:27:41 2016 +0000
@@ -0,0 +1,120 @@
+/*!
+  @file logger.cpp
+
+  The implementation of the logger base class.
+
+  @par Full Description
+  The implementation of the logger base class.
+
+  @if REVISION_HISTORY_INCLUDED
+  @par Edit History
+  @li [0]    wojciech.rynczuk@wp.pl    20-JAN-2015    Initial file revision.
+  @endif
+
+  @ingroup Logger
+
+  The MIT License (MIT)
+  Copyright (c) 2016 Wojciech Rynczuk
+
+*/
+
+#include "logger.hpp"
+
+#include <new>
+#include <cstring>
+
+Logger::Logger(uint32_t nLines, uint32_t nCharacters) : m_Lines(nLines), m_Characters(nCharacters)
+{
+    m_ReadMarker = 0;
+    m_WriteMarker = 0;
+    m_isRecording = false;
+    m_pLogData = new(std::nothrow) char [sizeof(char) * m_Lines * m_Characters];
+    m_Timer.start();
+}
+
+Logger::~Logger()
+{
+    delete m_pLogData;
+}
+
+uint32_t Logger::Log(const char* line)
+{
+    int32_t was_masked;
+    
+    if (m_pLogData != NULL)
+    {
+        if (true == m_isRecording)
+        {
+            //Disable interrupts
+            was_masked = __disable_irq();
+    
+            if ((m_ReadMarker == (m_WriteMarker + 1)) || \
+               ((m_WriteMarker == (m_Lines - 1)) && (m_ReadMarker == 0)))
+            {
+                AlarmFull();
+            } 
+            else
+            {
+                (void)std::strncpy(m_pLogData + (m_WriteMarker * m_Characters), line, m_Characters);
+                m_WriteMarker++;
+                if (m_WriteMarker == m_Lines)
+                {
+                    m_WriteMarker = 0;
+                }
+            }
+    
+            //Enable interrupts (or not)
+            if (!was_masked)
+            {
+                __enable_irq();
+            }
+        } 
+    }
+    else
+    {
+        Printf("Not enough memory for logging.\n");
+    }
+    return 0;
+}
+
+uint32_t Logger::Print()
+{
+    uint32_t counter = 0;
+    if (m_pLogData != NULL)
+    {
+        while(m_ReadMarker != m_WriteMarker)
+        {
+            Printf(m_pLogData + (m_ReadMarker++ * m_Characters));
+            if (m_ReadMarker == m_Lines)
+            {
+                m_ReadMarker = 0;
+            }
+            counter++;
+        }
+    }
+    return counter;
+}
+
+int32_t Logger::GetTime()
+{
+    return m_Timer.read_us();
+}
+
+void Logger::StartRecording()
+{
+    if (0 == StartAction())
+    {
+        m_isRecording = true;
+    }
+}
+
+void Logger::StopRecording()
+{
+    m_isRecording = false;
+    StopAction();
+}
+
+bool Logger::IsRecording()
+{
+    return m_isRecording;
+}

diff -r 000000000000 -r caae6cde6ca8 logger.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/logger.hpp	Fri May 27 10:27:41 2016 +0000
@@ -0,0 +1,55 @@
+/*!
+  @file logger.hpp
+
+  The header of the logger base class.
+
+  @par Full Description
+  The header of the logger base class.
+
+  @if REVISION_HISTORY_INCLUDED
+  @par Edit History
+  @li [0]    wojciech.rynczuk@wp.pl    20-JAN-2015    Initial file revision.
+  @endif
+
+  @ingroup Logger
+
+  The MIT License (MIT)
+  Copyright (c) 2016 Wojciech Rynczuk
+
+*/
+
+#ifndef _LOGGER_HPP_
+#define _LOGGER_HPP_
+
+#include <stdint.h>
+#include "mbed.h" //Timer
+
+class Logger {
+    
+    public:
+    Logger(uint32_t nLines, uint32_t nCharacters);
+    ~Logger();
+    uint32_t Log(const char* line);
+    uint32_t Print();
+    int32_t  GetTime();
+    void     StartRecording();
+    void     StopRecording();
+    bool     IsRecording();
+    
+    //protected:
+    virtual void Printf(const char*) = 0;
+    virtual void AlarmFull() = 0;
+    virtual uint32_t StartAction() = 0;
+    virtual uint32_t StopAction() = 0;
+    
+    private:
+    bool     m_isRecording;
+    Timer    m_Timer;
+    char*    m_pLogData;
+    uint32_t m_Lines;
+    uint32_t m_Characters;
+    uint32_t m_ReadMarker;
+    volatile uint32_t m_WriteMarker;
+};
+   
+#endif
\ No newline at end of file