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

Timestamp:

04/22/15 04:14:59 (8 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.h (copied) (copied from cpp/frams/errmgr/errmanager.h) (8 diffs)

cpp/frams/mhandlers/mhandlers.h

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#ifndef _ERRMANAGER_H_
-#define _ERRMANAGER_H_
+#ifndef _MHANDLERS_H_
+#define _MHANDLERS_H_
 
 #include <frams/util/list.h>
 #include <frams/util/sstring.h>
-#include <common/framsg.h>
+#include <common/hmessage.h>
 #include <common/threads.h>
 
-class ErrorHandlerBase;
+class MessageHandlerBase;
 
-class ErrorManager
+class MessageHandlerManager
 {
-        friend class ErrorHandlerBase;
-        SListTempl<ErrorHandlerBase*> handlers;
+        friend class MessageHandlerBase;
+        SListTempl<MessageHandlerBase*> handlers;
         void send(int level, const char *o, const char *m, const char *bl, int w);
 public:
-        int find(ErrorHandlerBase *r) { return handlers.find(r); }
-        int add(ErrorHandlerBase *r);
+        int find(MessageHandlerBase *r) { return handlers.find(r); }
+        int add(MessageHandlerBase *r);
         void remove(int i);
-        void remove(ErrorHandlerBase *r);
+        void remove(MessageHandlerBase *r);
         void removeAll();
         void send(const char *o, const char *m, const char *bl, int w)
@@ -28 +28 @@
                 send(handlers.size() - 1, o, m, bl, w);
         }
-        ~ErrorManager() { removeAll(); }
+        ~MessageHandlerManager() { removeAll(); }
 };
 
-extern THREAD_LOCAL_DECL(ErrorManager, errmgr_instance);
+extern THREAD_LOCAL_DECL(MessageHandlerManager, message_handler_manager_instance);
 
 ////////////////////////////////////////
 
-class ErrorHandlerBase
+class MessageHandlerBase
 {
-        friend class ErrorManager;
+        friend class MessageHandlerManager;
 protected:
-        ErrorManager* mgr;
+        MessageHandlerManager* mgr;
         int options;
 
@@ -46 +46 @@
         enum HandlerOptions
         {
-                DontBlock = 1, CannotBeBlocked = 2, DontEnable = 4, Paused = 8
+                DontBlock = 1, CannotBeBlocked = 2, Enable = 4, Paused = 8
         };
 
-        void FMprintf(const char *o, const char *m, int w, const char *bl, ...);
+        void Hprintf(const char *o, const char *m, int w, const char *bl, ...);
         void send(const char *o, const char *m, const char *bl, int w);
 
@@ -59 +59 @@
         void resume();
 
-        ErrorHandlerBase(int opts = 0) :mgr(0), options(opts)
+        MessageHandlerBase(int opts = 0) :mgr(0), options(opts)
         {
-                if (!(options&DontEnable)) enable();
+                if (options&Enable) enable();
         }
-        virtual ~ErrorHandlerBase()
+        virtual ~MessageHandlerBase()
         {
                 disable();
@@ -73 +73 @@
 ///////////////////////////////////////////
 
-class ErrorHandler : public ErrorHandlerBase
+class MessageHandlerToMemory : public MessageHandlerBase
 {
 protected:
@@ -81 +81 @@
 public:
 
-        void reset() { maxlevel = FMLV_INFO - 1; errcount = warncount = storcount = infocount = 0; msgs = 0; }
+        void reset() { maxlevel = HMLV_INFO - 1; errcount = warncount = storcount = infocount = 0; msgs = 0; }
 
         enum Options2
@@ -95 +95 @@
         const SString& getMessages() { return msgs; }
 
-        ErrorHandler(int opts = 0, int store = FMLV_ERROR) :ErrorHandlerBase(opts), storlevel(store)
+        MessageHandlerToMemory(int opts = 0, int minimal_level_to_store = HMLV_ERROR) :MessageHandlerBase(opts), storlevel(minimal_level_to_store)
         {
                 reset();
@@ -103 +103 @@
 };
 
-class ErrorRedirector : public ErrorHandlerBase
+class RedirectingMessageHandler : public MessageHandlerBase
 {
-        ErrorManager *other_mgr;
+        MessageHandlerManager *other_mgr;
 public:
-        ErrorRedirector(ErrorManager *om)
-                :ErrorHandlerBase(), other_mgr(om) {}
+        RedirectingMessageHandler(MessageHandlerManager *om,int opts=0)
+                :MessageHandlerBase(opts), other_mgr(om) {}
 
         void handle(const char *o, const char *m, const char *bl, int w)