Changeset 6c86e7ccc32f1c99d204262844a52b1b06359145

Timestamp:

08/26/10 21:26:02 (18 months ago)

Author:

Antti-Juhani Kaijanaho <antti-juhani@…>

Children:

f3e4a78e6a3f99d9180ec560cdd26ba6c962132a

Parents:

43f521291669f483d361949fa6c886c0fbd94daf

git-committer:

Antti-Juhani Kaijanaho <antti-juhani@…> (08/26/10 21:26:02)

Message:

 boost::assertion_failed Improve on the logging speed.

Signed-off-by: Antti-Juhani Kaijanaho <antti-juhani@…>

Files:

• assert_handler.cc (modified) (2 diffs)

assert_handler.cc

@@ -27 +27 @@
 namespace boost
 {
-
         void assertion_failed(char const *expr,
                               char const *function,
@@ -51 +50 @@
                 for (size_t i = 0; i < size; i++)
                 {
+                        ll << "\t" << bt[i] << "\n";
+                }
+                logger::logger.flush();
+                std::string gdb = "gdb --batch ";
+                for (size_t i = 0; i < size; i++)
+                {
+                        std::string bta = bt[i];
+                        size_t ob = bta.find('[');
+                        size_t cb = bta.rfind(']');
+                        if (ob == std::string::npos ||
+                            cb == std::string::npos)
+                                continue;
+                        bta = bta.substr(ob + 1, cb - ob - 1);
+                        gdb += "--ex 'info line *";
+                        gdb += bta.c_str();
+                        gdb += "' ";
+                }
+                gdb += config["executable"].as<std::string>();
+                gdb += " </dev/null";
+                ll.open();
+                ll << gdb;
+                ll.close();
+                FILE *fp = ::popen(gdb.c_str(), "r");
+                if (fp != 0)
+                {
+                        ll.open();
+                        ll << "LINE INFORMATION FOLLOWS:";
                         ll.nl();
-                        ll << "\t" << bt[i] << "\n";
-                        std::string bta = bt[i];
-                        int ob = bta.find('[');
-                        int cb = bta.rfind(']');
-                        if (ob == std::string::npos || cb == std::string::npos) continue;
-                        bta = bta.substr(ob + 1, cb - ob - 1);
-                        std::string gdb = "gdb --batch --ex 'info line *";
-                        gdb += bta;
-                        gdb += "' ";
-                        gdb += config["executable"].as<std::string>(); 
-                        gdb += " </dev/null";
-                        FILE *fp = ::popen(gdb.c_str(), "r");
-                        if (fp != 0)
-                        {
-                                while (true)
-                                {
-                                        char buf[128];
-                                        int n = ::fread(buf, 1, sizeof buf, fp);
-                                        ll << std::string(buf, n); 
-                                        if (n == 0) break;
-                                }
-                                ::pclose(fp);
-                        }
+                        while (true)
+                        {
+                                char buf[128];
+                                int n = ::fread(buf, 1, sizeof buf, fp);
+                                ll << std::string(buf, n); 
+                                if (n == 0) break;
+                        }
+                        ::pclose(fp);
+                        ll.close();
+                        logger::logger.flush();
                 }
-                ll.close();
-                logger::logger.flush();
 
                 std::free(bt);