Changeset 372 for cpp/frams/mhandlers/mhandlers.cpp

Timestamp:

04/22/15 04:14:59 (9 years ago)

Author:

sz

Message:

Renamed some classes and functions to make their purpose more obvious:

• FramMessage?, FMprintf, etc. become Hmessage, Hprintf, etc... (H for handled message).
• ErrorManager? (and its family) becomes MessageHandler?. Handler names reflect their function better, e.g. MessageHandlerToStdout?.

All MessageHandlers? must now be given the explicit "Enable" argument if you want them to automatically become active. This makes side effects clearly visible.

Location:

cpp/frams/mhandlers

Files:

• . (moved) (moved from cpp/frams/errmgr)
• mhandlers.cpp (copied) (copied from cpp/frams/errmgr/errmanager.cpp) (9 diffs)

cpp/frams/mhandlers/mhandlers.cpp

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#include "errmanager.h"
+#include "mhandlers.h"
 #include <common/stl-util.h>
 
-void _FramMessageSingleLine(const char *o, const char *m, const char *txt, int w)
+void _HmessageSingleLine(const char *o, const char *m, const char *txt, int w)
 {
-        tlsGetRef(errmgr_instance).send(o, m, txt, w);
+        tlsGetRef(message_handler_manager_instance).send(o, m, txt, w);
 }
 
-THREAD_LOCAL_DEF(ErrorManager, errmgr_instance);
+THREAD_LOCAL_DEF(MessageHandlerManager, message_handler_manager_instance);
 
-void ErrorManager::send(int level, const char *o, const char *m, const char *bl, int w)
+void MessageHandlerManager::send(int level, const char *o, const char *m, const char *bl, int w)
 {
         if (level >= handlers.size()) level = handlers.size() - 1;
@@ -19 +19 @@
         for (int i = level; i >= 0; i--)
         {
-                ErrorHandlerBase *r = handlers(i);
-                if ((!(r->options & ErrorHandlerBase::Paused)) &&
-                        ((!blocked) || (r->options & ErrorHandlerBase::CannotBeBlocked)))
+                MessageHandlerBase *r = handlers(i);
+                if ((!(r->options & MessageHandlerBase::Paused)) &&
+                        ((!blocked) || (r->options & MessageHandlerBase::CannotBeBlocked)))
                 {
                         r->handle(o, m, bl, w);
-                        if (!(r->options & ErrorHandlerBase::DontBlock)) blocked = 1;
+                        if (!(r->options & MessageHandlerBase::DontBlock)) blocked = 1;
                 }
         }
 }
 
-int ErrorManager::add(ErrorHandlerBase *h)
+int MessageHandlerManager::add(MessageHandlerBase *h)
 {
         h->mgr = this;
@@ -36 +36 @@
 }
 
-void ErrorManager::remove(int i)
+void MessageHandlerManager::remove(int i)
 {
-        ErrorHandlerBase *h = handlers(i);
+        MessageHandlerBase *h = handlers(i);
         h->mgr = 0;
         handlers.remove(i);
 }
 
-void ErrorManager::remove(ErrorHandlerBase *h)
+void MessageHandlerManager::remove(MessageHandlerBase *h)
 {
         int i;
@@ -50 +50 @@
 }
 
-void ErrorManager::removeAll()
+void MessageHandlerManager::removeAll()
 {
         while (handlers.size() > 0)
@@ -58 +58 @@
 //////////////////////////////////
 
-void ErrorHandlerBase::send(const char *o, const char *m, const char *bl, int w)
+void MessageHandlerBase::send(const char *o, const char *m, const char *bl, int w)
 {
         if (!isEnabled()) return;
@@ -65 +65 @@
 }
 
-void ErrorHandlerBase::FMprintf(const char *o, const char *m, int w, const char *bl, ...)
+void MessageHandlerBase::Hprintf(const char *o, const char *m, int w, const char *bl, ...)
 {
         if (!isEnabled()) return;
@@ -77 +77 @@
 
 
-void ErrorHandlerBase::enable()
+void MessageHandlerBase::enable()
 {
         if (isEnabled()) return;
-        tlsGetRef(errmgr_instance).add(this);
+        tlsGetRef(message_handler_manager_instance).add(this);
 }
 
-void ErrorHandlerBase::disable()
+void MessageHandlerBase::disable()
 {
         if (!isEnabled()) return;
-        tlsGetRef(errmgr_instance).remove(this);
+        tlsGetRef(message_handler_manager_instance).remove(this);
 }
 
-void ErrorHandlerBase::pause()
+void MessageHandlerBase::pause()
 {
         if (isPaused()) return;
@@ -95 +95 @@
 }
 
-void ErrorHandlerBase::resume()
+void MessageHandlerBase::resume()
 {
         if (!isPaused()) return;
@@ -103 +103 @@
 /////////////////////////////////
 
-void ErrorHandler::handle(const char *o, const char *m, const char *bl, int w)
+void MessageHandlerToMemory::handle(const char *o, const char *m, const char *bl, int w)
 {
         if (w > maxlevel) maxlevel = w;
-        if (w >= FMLV_INFO) infocount++;
-        if (w >= FMLV_WARN) warncount++;
-        if (w >= FMLV_ERROR) errcount++;
+        if (w >= HMLV_INFO) infocount++;
+        if (w >= HMLV_WARN) warncount++;
+        if (w >= HMLV_ERROR) errcount++;
 
         if (w >= storlevel)