added check and match counters in log parser rules

diff --git a/include/nxlpapi.h b/include/nxlpapi.h
index 5c5a98a..83e356d 100644 (file)
--- a/include/nxlpapi.h
+++ b/include/nxlpapi.h
@@ -112,6 +112,8 @@ private:
        int m_repeatCount;
    IntegerArray<time_t> *m_matchArray;
        bool m_resetRepeat;
        int m_repeatCount;
    IntegerArray<time_t> *m_matchArray;
        bool m_resetRepeat;

+       UINT32 m_checkCount;
+       UINT32 m_matchCount;

 
        bool matchInternal(bool extMode, const TCHAR *source, UINT32 eventId, UINT32 level,
                           const TCHAR *line, LogParserCallback cb, UINT32 objectId, void *userArg);
 
        bool matchInternal(bool extMode, const TCHAR *source, UINT32 eventId, UINT32 level,
                           const TCHAR *line, LogParserCallback cb, UINT32 objectId, void *userArg);


@@ -127,7 +129,7 @@ public:
        LogParserRule(LogParserRule *src, LogParser *parser);
        ~LogParserRule();
 
        LogParserRule(LogParserRule *src, LogParser *parser);
        ~LogParserRule();
 

-       bool isValid() { return m_isValid; }
+       bool isValid() const { return m_isValid; }

        bool match(const TCHAR *line, LogParserCallback cb, UINT32 objectId, void *userArg);
        bool matchEx(const TCHAR *source, UINT32 eventId, UINT32 level,
                     const TCHAR *line, LogParserCallback cb, UINT32 objectId, void *userArg);
        bool match(const TCHAR *line, LogParserCallback cb, UINT32 objectId, void *userArg);
        bool matchEx(const TCHAR *source, UINT32 eventId, UINT32 level,
                     const TCHAR *line, LogParserCallback cb, UINT32 objectId, void *userArg);


@@ -137,37 +139,40 @@ public:
        void setContextAction(int action) { m_contextAction = action; }
 
        void setInverted(bool flag) { m_isInverted = flag; }
        void setContextAction(int action) { m_contextAction = action; }
 
        void setInverted(bool flag) { m_isInverted = flag; }

-       BOOL isInverted() { return m_isInverted; }
+       BOOL isInverted() const { return m_isInverted; }

 
        void setBreakFlag(bool flag) { m_breakOnMatch = flag; }
 
        void setBreakFlag(bool flag) { m_breakOnMatch = flag; }

-       BOOL getBreakFlag() { return m_breakOnMatch; }
+       BOOL getBreakFlag() const { return m_breakOnMatch; }

 
 

-       const TCHAR *getContext() { return m_context; }
-       const TCHAR *getContextToChange() { return m_contextToChange; }
-       int getContextAction() { return m_contextAction; }
+       const TCHAR *getContext() const { return m_context; }
+       const TCHAR *getContextToChange() const { return m_contextToChange; }
+       int getContextAction() const { return m_contextAction; }

 
        void setDescription(const TCHAR *descr) { safe_free(m_description); m_description = (descr != NULL) ? _tcsdup(descr) : NULL; }
 
        void setDescription(const TCHAR *descr) { safe_free(m_description); m_description = (descr != NULL) ? _tcsdup(descr) : NULL; }

-       const TCHAR *getDescription() { return CHECK_NULL_EX(m_description); }
+       const TCHAR *getDescription() const { return CHECK_NULL_EX(m_description); }

 
        void setSource(const TCHAR *source) { safe_free(m_source); m_source = (source != NULL) ? _tcsdup(source) : NULL; }
 
        void setSource(const TCHAR *source) { safe_free(m_source); m_source = (source != NULL) ? _tcsdup(source) : NULL; }

-       const TCHAR *getSource() { return CHECK_NULL_EX(m_source); }
+       const TCHAR *getSource() const { return CHECK_NULL_EX(m_source); }

 
        void setLevel(UINT32 level) { m_level = level; }
 
        void setLevel(UINT32 level) { m_level = level; }

-       UINT32 getLevel() { return m_level; }
+       UINT32 getLevel() const { return m_level; }

 
        void setIdRange(UINT32 start, UINT32 end) { m_idStart = start; m_idEnd = end; }
 
        void setIdRange(UINT32 start, UINT32 end) { m_idStart = start; m_idEnd = end; }

-       QWORD getIdRange() { return ((QWORD)m_idStart << 32) | (QWORD)m_idEnd; }
+       QWORD getIdRange() const { return ((QWORD)m_idStart << 32) | (QWORD)m_idEnd; }

 
    void setRepeatInterval(int repeatInterval) { m_repeatInterval = repeatInterval; }
 
    void setRepeatInterval(int repeatInterval) { m_repeatInterval = repeatInterval; }

-   int getRepeatInterval() { return m_repeatInterval; }
+   int getRepeatInterval() const { return m_repeatInterval; }

 
    void setRepeatCount(int repeatCount) { m_repeatCount = repeatCount; }
 
    void setRepeatCount(int repeatCount) { m_repeatCount = repeatCount; }

-   int getRepeatCount() { return m_repeatCount; }
+   int getRepeatCount() const { return m_repeatCount; }

 
    void setRepeatReset(bool resetRepeat) { m_resetRepeat = resetRepeat; }
 
    void setRepeatReset(bool resetRepeat) { m_resetRepeat = resetRepeat; }

-   bool isRepeatReset() { return m_resetRepeat; }
+   bool isRepeatReset() const { return m_resetRepeat; }

 
 

-       const TCHAR *getRegexpSource() { return CHECK_NULL(m_regexp); }
+       const TCHAR *getRegexpSource() const { return CHECK_NULL(m_regexp); }
+
+       UINT32 getCheckCount() const { return m_checkCount; }
+   UINT32 getMatchCount() const { return m_matchCount; }

 };
 
 /**
 };
 
 /**

diff --git a/src/libnxlp/rule.cpp b/src/libnxlp/rule.cpp
index 7bdf350..483d67c 100644 (file)
--- a/src/libnxlp/rule.cpp
+++ b/src/libnxlp/rule.cpp
@@ -54,6 +54,8 @@ LogParserRule::LogParserRule(LogParser *parser, const TCHAR *regexp, UINT32 even
        m_repeatCount = repeatCount;
        m_matchArray = new IntegerArray<time_t>();
        m_resetRepeat = resetRepeat;
        m_repeatCount = repeatCount;
        m_matchArray = new IntegerArray<time_t>();
        m_resetRepeat = resetRepeat;

+       m_checkCount = 0;
+       m_matchCount = 0;

 }
 
 /**
 }
 
 /**


@@ -91,6 +93,8 @@ LogParserRule::LogParserRule(LogParserRule *src, LogParser *parser)
    {
       m_matchArray = new IntegerArray<time_t>();
    }
    {
       m_matchArray = new IntegerArray<time_t>();
    }

+   m_checkCount = src->m_checkCount;
+   m_matchCount = src->m_matchCount;

 }
 
 /**
 }
 
 /**


@@ -116,6 +120,7 @@ LogParserRule::~LogParserRule()
 bool LogParserRule::matchInternal(bool extMode, const TCHAR *source, UINT32 eventId, UINT32 level,
                                                                          const TCHAR *line, LogParserCallback cb, UINT32 objectId, void *userArg)
 {
 bool LogParserRule::matchInternal(bool extMode, const TCHAR *source, UINT32 eventId, UINT32 level,
                                                                          const TCHAR *line, LogParserCallback cb, UINT32 objectId, void *userArg)
 {

+   m_checkCount++;

    if (extMode)
    {
           if (m_source != NULL)
    if (extMode)
    {
           if (m_source != NULL)


@@ -156,6 +161,7 @@ bool LogParserRule::matchInternal(bool extMode, const TCHAR *source, UINT32 even
                        if ((cb != NULL) && ((m_eventCode != 0) || (m_eventName != NULL)))
                                cb(m_eventCode, m_eventName, line, source, eventId, level, 0, NULL, objectId, 
                ((m_repeatCount > 0) && (m_repeatInterval > 0)) ? m_matchArray->size() : 1, userArg);
                        if ((cb != NULL) && ((m_eventCode != 0) || (m_eventName != NULL)))
                                cb(m_eventCode, m_eventName, line, source, eventId, level, 0, NULL, objectId, 
                ((m_repeatCount > 0) && (m_repeatInterval > 0)) ? m_matchArray->size() : 1, userArg);

+                       m_matchCount++;

                        return true;
                }
        }
                        return true;
                }
        }


@@ -201,6 +207,8 @@ bool LogParserRule::matchInternal(bool extMode, const TCHAR *source, UINT32 even
 #if !HAVE_ALLOCA
             free(params);
 #endif
 #if !HAVE_ALLOCA
             free(params);
 #endif

+
+            m_matchCount++;

                        }
                        return true;
                }
                        }
                        return true;
                }