X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FException.cc;h=4c74f6cda185694ee17aed1976af5e381748e600;hb=d2459b6c8249291588fd3d0d125ed3d38e003b55;hp=c9a43f111f6ca8748406f9b7dfdc66af580286a9;hpb=c28e0df3accaafcc9a934275f80c80153f5a0e54;p=senf.git

diff --git a/Utils/Exception.cc b/Utils/Exception.cc
index c9a43f1..4c74f6c 100644
--- a/Utils/Exception.cc
+++ b/Utils/Exception.cc
@@ -1,9 +1,9 @@
 // $Id$
 //
-// Copyright (C) 2006 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Copyright (C) 2006
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+//     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -20,31 +20,82 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Definition of non-inline non-template functions
+/** \file
+    \brief Exception non-inline non-template implementation */
 
 #include "Exception.hh"
 //#include "Exception.ih"
 
 // Custom includes
-#include <cstring>
+#include <execinfo.h>
 #include <sstream>
+#include "../config.hh"
+#include "impl/demangle.h"
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-prefix_ void satcom::lib::SystemException::init()
+///////////////////////////////////////////////////////////////////////////
+// senf::Exception
+
+#ifdef SENF_DEBUG
+prefix_ void senf::ExceptionMixin::addBacktrace()
 {
-    std::stringstream s;
-    if (where)
-        s << where << ": ";
-    s << "(" << err << ") " << std::strerror(err);
-    buffer_ = s.str();
+    void * entries[SENF_DEBUG_BACKTRACE_NUMCALLERS];
+    unsigned nEntries( ::backtrace(entries, SENF_DEBUG_BACKTRACE_NUMCALLERS) );
+    char ** symbols = ::backtrace_symbols(entries, nEntries);
+    
+    std::stringstream ss;
+    ss << "\nException at\n";
+    for (unsigned i=0; i<nEntries; ++i) {
+        std::string sym (symbols[i]);
+        std::string::size_type fnStart (sym.find("("));
+        if (fnStart != std::string::npos) {
+            std::string::size_type fnEnd (sym.find(")",fnStart+1));
+            if (fnEnd != std::string::npos) {
+                std::string fn (sym,fnStart+1, fnEnd-fnStart-1);
+                char * demangled ( ::cplus_demangle(fn.c_str(), 
+                                                    DMGL_TYPES|DMGL_AUTO) );
+                if (demangled) {
+                    ss << "  " << demangled << "( ... )" << std::string(sym,fnEnd+1) << "\n";
+                    continue;
+                }
+            }
+        }
+        ss << "  " << sym << "\n";
+    }
+    ss << "-- \n" << message_;
+    message_ = ss.str();
+    free(symbols);
 }
+#endif
+
+/////////////////////////////////////////////////////////////////////////// 
+// senf::Exception
 
-prefix_ char const * satcom::lib::SystemException::what()
+prefix_ senf::Exception::~Exception()
+    throw()
+{}
+
+prefix_ char const * senf::Exception::what()
     const throw()
 {
-    return buffer_.c_str();
+    return message().c_str();
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::SystemException
+
+prefix_ void senf::SystemException::init(std::string const & descr, int code
+                                         _SENF_EXC_DEBUG_ARGS_ND)
+{
+    code_ = code;
+#   ifdef SENF_DEBUG
+    if (file && line)
+        (*this) << "Exception at " << file << ":" << line << "\n";
+#   endif
+    (*this) << "[" << errorString() << "]";
+    if (! descr.empty()) (*this) << " " << descr;
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////
@@ -53,5 +104,10 @@ prefix_ char const * satcom::lib::SystemException::what()
 
 // Local Variables:
 // mode: c++
-// c-file-style: "satcom"
+// fill-column: 100
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End: