Changeset 336 for cpp/frams/errmgr/errmanager.cpp

Timestamp:

03/12/15 04:19:45 (9 years ago)

Author:

Maciej Komosinski

Message:

Error message formatting: - "[x] x::x - " -> "[x] x.x: "
Error managers support configurable multi-line "call stack" messages

File:

• cpp/frams/errmgr/errmanager.cpp (modified) (3 diffs)

cpp/frams/errmgr/errmanager.cpp

@@ -8 +8 @@
 void _FramMessageSingleLine(const char *o, const char *m, const char *txt, int w)
 {
-tlsGetRef(errmgr_instance).send(o,m,txt,w);
+        tlsGetRef(errmgr_instance).send(o, m, txt, w);
 }
 
-THREAD_LOCAL_DEF(ErrorManager,errmgr_instance);
+THREAD_LOCAL_DEF(ErrorManager, errmgr_instance);
 
-void ErrorManager::send(int level,const char *o,const char *m,const char *bl,int w)
+void ErrorManager::send(int level, const char *o, const char *m, const char *bl, int w)
 {
-if (level>=handlers.size()) level=handlers.size()-1;
-bool blocked=0;
-for(int i=level;i>=0;i--)
+        if (level >= handlers.size()) level = handlers.size() - 1;
+        bool blocked = 0;
+        for (int i = level; i >= 0; i--)
         {
-        ErrorHandlerBase *r=handlers(i);
-        if ((!blocked)||(r->options & ErrorHandlerBase::CannotBeBlocked))
-                r->handle(o,m,bl,w);
-        if (!(r->options & ErrorHandlerBase::DontBlock)) blocked=1;
+                ErrorHandlerBase *r = handlers(i);
+                if ((!(r->options & ErrorHandlerBase::Paused)) &&
+                        ((!blocked) || (r->options & ErrorHandlerBase::CannotBeBlocked)))
+                {
+                        r->handle(o, m, bl, w);
+                        if (!(r->options & ErrorHandlerBase::DontBlock)) blocked = 1;
+                }
         }
 }
@@ -28 +31 @@
 int ErrorManager::add(ErrorHandlerBase *h)
 {
-h->mgr=this;
-handlers+=h;
-return handlers.size()-1;
+        h->mgr = this;
+        handlers += h;
+        return handlers.size() - 1;
 }
 
 void ErrorManager::remove(int i)
 {
-ErrorHandlerBase *h=handlers(i);
-h->mgr=0;
-handlers.remove(i);
+        ErrorHandlerBase *h = handlers(i);
+        h->mgr = 0;
+        handlers.remove(i);
 }
 
 void ErrorManager::remove(ErrorHandlerBase *h)
 {
-int i;
-if ((i=handlers.find(h))<0) return;
-remove(i);
+        int i;
+        if ((i = handlers.find(h)) < 0) return;
+        remove(i);
 }
 
 void ErrorManager::removeAll()
 {
-while(handlers.size()>0)
-        remove(handlers.size()-1);
+        while (handlers.size() > 0)
+                remove(handlers.size() - 1);
 }
 
 //////////////////////////////////
 
-void ErrorHandlerBase::send(const char *o,const char *m,const char *bl,int w)
+void ErrorHandlerBase::send(const char *o, const char *m, const char *bl, int w)
 {
-if (!isEnabled()) return;
-int level=mgr->find(this);
-if (level>=0) mgr->send(level-1,o,m,bl,w);
+        if (!isEnabled()) return;
+        int level = mgr->find(this);
+        if (level >= 0) mgr->send(level - 1, o, m, bl, w);
 }
 
-void ErrorHandlerBase::FMprintf(const char *o,const char *m,int w,const char *bl, ...)
+void ErrorHandlerBase::FMprintf(const char *o, const char *m, int w, const char *bl, ...)
 {
-if (!isEnabled()) return;
-string buf;
-va_list argptr;
-va_start(argptr,bl);
-buf=ssprintf_va(bl,argptr);
-va_end(argptr);
-send(o,m,buf.c_str(),w);
+        if (!isEnabled()) return;
+        string buf;
+        va_list argptr;
+        va_start(argptr, bl);
+        buf = ssprintf_va(bl, argptr);
+        va_end(argptr);
+        send(o, m, buf.c_str(), w);
 }
 
@@ -76 +79 @@
 void ErrorHandlerBase::enable()
 {
-if (isEnabled()) return;
-tlsGetRef(errmgr_instance).add(this);
+        if (isEnabled()) return;
+        tlsGetRef(errmgr_instance).add(this);
 }
 
 void ErrorHandlerBase::disable()
 {
-if (!isEnabled()) return;
-tlsGetRef(errmgr_instance).remove(this);
+        if (!isEnabled()) return;
+        tlsGetRef(errmgr_instance).remove(this);
+}
+
+void ErrorHandlerBase::pause()
+{
+        if (isPaused()) return;
+        options |= Paused;
+}
+
+void ErrorHandlerBase::resume()
+{
+        if (!isPaused()) return;
+        options &= ~Paused;
 }
 
 /////////////////////////////////
 
-void ErrorHandler::handle(const char *o,const char *m,const char *bl,int w)
+void ErrorHandler::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 > maxlevel) maxlevel = w;
+        if (w >= FMLV_INFO) infocount++;
+        if (w >= FMLV_WARN) warncount++;
+        if (w >= FMLV_ERROR) errcount++;
 
-if (w>=storlevel)
+        if (w >= storlevel)
         {
-        storcount++;
-        if (options & (StoreFirstMessage|StoreAllMessages))
+                storcount++;
+                if (options & (StoreFirstMessage | StoreAllMessages))
                 {
-                if (!((options&StoreFirstMessage)&&(msgs.len()>0)))
+                        if (!((options&StoreFirstMessage) && (msgs.len() > 0)))
                         {
-                        if (msgs.len()>0) msgs+='\n';
-                        msgs+=o; msgs+="::"; msgs+=m;
-                        msgs+=" - "; msgs+=bl;
+                                if (msgs.len() > 0) msgs += '\n';
+                                msgs += o; msgs += "::"; msgs += m;
+                                msgs += " - "; msgs += bl;
                         }
                 }