OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

testsuite_performance.h: Tweak mallinfo. 

2003-06-24  Benjamin Kosnik  <bkoz@redhat.com>
            Ulrich Drepper  <drepper@redhat.com>

	* testsuite/testsuite_performance.h: Tweak mallinfo.

Co-Authored-By: Ulrich Drepper <drepper@redhat.com>

From-SVN: r68436
This commit is contained in:
Benjamin Kosnik 2003-06-24 19:38:36 +00:00 committed by Benjamin Kosnik
parent 61f33c67c2
commit 1b6f0a561f
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2003-06-24 Benjamin Kosnik <bkoz@redhat.com>
Ulrich Drepper <drepper@redhat.com>
* testsuite/testsuite_performance.h: Tweak mallinfo.
2003-06-24 Paolo Carlini <pcarlini@unitus.it>
Nathan C. Myers <ncm-nospam@cantrip.org>

31
libstdc++-v3/testsuite/testsuite_performance.h
View File

@ -33,15 +33,22 @@
#include <sys/times.h>
#include <sys/resource.h>
#ifdef __FreeBSD__
#include <stdlib.h>
#else
#include <malloc.h>
#endif
#include <cstdlib>
#include <string>
#include <fstream>
#include <iomanip>
#ifdef __linux__
#include <malloc.h>
#else
extern "C"
{
struct mallinfo { int uordblks; };
struct mallinfo empty = { 0 };
struct mallinfo mallinfo(void) { return empty; }
}
#endif
namespace __gnu_cxx_test
{
class time_counter
@ -85,11 +92,6 @@ namespace __gnu_cxx_test
{ return tms_end.tms_stime - tms_begin.tms_stime; }
};
#ifdef __FreeBSD__
struct mallinfo { int arena; };
int mallinfo (void) { return 0; }
#endif
class resource_counter
{
int who;
@ -116,7 +118,8 @@ namespace __gnu_cxx_test
{
if (getrusage(who, &rusage_begin) != 0 )
memset(&rusage_begin, 0, sizeof(rusage_begin));
// allocation_begin = mallinfo();
malloc(0); // Needed for some implementations.
allocation_begin = mallinfo();
}
void
@ -124,12 +127,12 @@ namespace __gnu_cxx_test
{
if (getrusage(who, &rusage_end) != 0 )
memset(&rusage_end, 0, sizeof(rusage_end));
// allocation_end = mallinfo();
allocation_end = mallinfo();
}
int
allocated_memory() const
{ return allocation_end.arena - allocation_begin.arena; }
{ return allocation_end.uordblks - allocation_begin.uordblks; }
long
hard_page_fault() const
@ -181,7 +184,7 @@ namespace __gnu_cxx_test
out << std::setw(4) << t.real_time() << "r" << space;
out << std::setw(4) << t.user_time() << "u" << space;
out << std::setw(4) << t.system_time() << "s" << space;
// out << std::setw(4) << r.allocated_memory() << "mem" << space;
out << std::setw(4) << r.allocated_memory() << "mem" << space;
out << std::setw(4) << r.hard_page_fault() << "pf" << space;
out << std::endl;