From 64cb2c4aedabfe9fc5f761411cadfeb1616b49a1 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <pcarlini@suse.de>
Date: Fri, 9 Jan 2004 10:09:31 +0000
Subject: [PATCH] allocator.cc: Demangle typeid(obj).name().
2004-01-09 Paolo Carlini <pcarlini@suse.de>
* testsuite/performance/allocator.cc: Demangle typeid(obj).name().
* testsuite/performance/allocator_thread.cc: Likewise.
From-SVN: r75571
---
libstdc++-v3/ChangeLog | 5 +++++
libstdc++-v3/testsuite/performance/allocator.cc | 5 ++++-
libstdc++-v3/testsuite/performance/allocator_thread.cc | 6 +++++-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5ac66961d580..ba2a6e90d4dd 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-09 Paolo Carlini <pcarlini@suse.de>
+
+ * testsuite/performance/allocator.cc: Demangle typeid(obj).name().
+ * testsuite/performance/allocator_thread.cc: Likewise.
+
2004-01-07 Benjamin Kosnik <bkoz@redhat.com>
* crossconfig.m4: Add LFS, io bits to linux cross config.
diff --git a/libstdc++-v3/testsuite/performance/allocator.cc b/libstdc++-v3/testsuite/performance/allocator.cc
index 53058edb3954..88314a13bef4 100644
--- a/libstdc++-v3/testsuite/performance/allocator.cc
+++ b/libstdc++-v3/testsuite/performance/allocator.cc
@@ -39,6 +39,7 @@
#include <sstream>
#include <ext/mt_allocator.h>
#include <ext/malloc_allocator.h>
+#include <cxxabi.h>
#include <testsuite_performance.h>
using namespace std;
@@ -108,6 +109,7 @@ template<typename Container>
test_container(Container obj)
{
using namespace __gnu_test;
+ int status;
time_counter time;
resource_counter resource;
@@ -118,7 +120,8 @@ template<typename Container>
std::ostringstream comment;
comment << "iterations: " << test_iterations << '\t';
- comment << "type: " << typeid(obj).name();
+ comment << "type: " << abi::__cxa_demangle(typeid(obj).name(),
+ 0, 0, &status);
report_header(__FILE__, comment.str());
report_performance(__FILE__, string(), time, resource);
}
diff --git a/libstdc++-v3/testsuite/performance/allocator_thread.cc b/libstdc++-v3/testsuite/performance/allocator_thread.cc
index 016f45a5d303..98cf2b14291a 100644
--- a/libstdc++-v3/testsuite/performance/allocator_thread.cc
+++ b/libstdc++-v3/testsuite/performance/allocator_thread.cc
@@ -40,6 +40,7 @@
#include <pthread.h>
#include <ext/mt_allocator.h>
#include <ext/malloc_allocator.h>
+#include <cxxabi.h>
#include <testsuite_performance.h>
using namespace std;
@@ -110,6 +111,8 @@ template<typename Container>
test_container(Container obj)
{
using namespace __gnu_test;
+ int status;
+
time_counter time;
resource_counter resource;
@@ -131,7 +134,8 @@ template<typename Container>
std::ostringstream comment;
comment << "iterations: " << iterations << '\t';
- comment << "type: " << typeid(obj).name();
+ comment << "type: " << abi::__cxa_demangle(typeid(obj).name(),
+ 0, 0, &status);
report_header(__FILE__, comment.str());
report_performance(__FILE__, string(), time, resource);
}
--
GitLab