From: "François Dumont" <frs.dumont@gmail.com>
To: "libstdc++@gcc.gnu.org" <libstdc++@gcc.gnu.org>
Cc: gcc-patches <gcc-patches@gcc.gnu.org>
Subject: [PATCH] Use mallinfo2 with glibc >= 2.33
Date: Wed, 7 Sep 2022 19:02:39 +0200 [thread overview]
Message-ID: <e5b4b0e9-eebf-3ad5-3c3f-86080816c330@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 447 bytes --]
libstdc++: Use glibc >= 2.33 mallinfo2 function
mallinfo started to be deprecated which makes performance tests failed
to build, just
adopt mallinfo2.
libstdcxx-v3/ChangeLog:
* testsuite/util/testsuite_performance.h (__mallinfo): New, our
own mallinfo
struct with just what we need. When using glibc >= 2.33 use
mallinfo2 to
populate it.
Tested under Linux x86_64,
Ok to commit ?
François
[-- Attachment #2: mallinfo.patch --]
[-- Type: text/x-patch, Size: 2521 bytes --]
diff --git a/libstdc++-v3/testsuite/util/testsuite_performance.h b/libstdc++-v3/testsuite/util/testsuite_performance.h
index 2e05bef8460..dc002b8c390 100644
--- a/libstdc++-v3/testsuite/util/testsuite_performance.h
+++ b/libstdc++-v3/testsuite/util/testsuite_performance.h
@@ -35,37 +35,49 @@
#include <cxxabi.h>
#include <testsuite_common_types.h>
-#if defined (__linux__) || defined (__GLIBC__)
-#include <malloc.h>
-#elif defined (__FreeBSD__)
extern "C"
{
- struct mallinfo
+ struct __mallinfo
{
- int uordblks;
- int hblkhd;
+ size_t uordblks;
+ size_t hblkhd;
};
+}
- struct mallinfo
- mallinfo(void)
+#if defined (__linux__) || defined (__GLIBC__)
+#include <malloc.h>
+extern "C"
+{
+ struct __mallinfo
+ __mallinfo(void)
+ {
+#if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 33
+ struct mallinfo2 mi = mallinfo2();
+ struct __mallinfo m = { mi.uordblks, mi.hblkhd };
+#else
+ struct mallinfo mi = mallinfo();
+ struct __mallinfo m = { mi.uordblks, mi.hblkhd };
+#endif
+ return m;
+ }
+}
+#elif defined (__FreeBSD__)
+extern "C"
+{
+ struct __mallinfo
+ __mallinfo(void)
{
- struct mallinfo m = { (((std::size_t) sbrk (0) + 1023) / 1024), 0 };
+ struct __mallinfo m = { (((std::size_t) sbrk (0) + 1023) / 1024), 0 };
return m;
}
}
#elif !defined (__hpux__)
extern "C"
{
- struct mallinfo
- {
- int uordblks;
- int hblkhd;
- };
-
- struct mallinfo empty = { 0, 0 };
+ struct __mallinfo empty = { 0, 0 };
- struct mallinfo
- mallinfo(void)
+ struct __mallinfo
+ __mallinfo(void)
{ return empty; }
}
#endif
@@ -146,8 +158,8 @@ namespace __gnu_test
int who;
rusage rusage_begin;
rusage rusage_end;
- struct mallinfo allocation_begin;
- struct mallinfo allocation_end;
+ struct __mallinfo allocation_begin;
+ struct __mallinfo allocation_end;
public:
resource_counter(int i = RUSAGE_SELF) : who(i)
@@ -168,7 +180,7 @@ namespace __gnu_test
if (getrusage(who, &rusage_begin) != 0 )
memset(&rusage_begin, 0, sizeof(rusage_begin));
void* p __attribute__((unused)) = malloc(0); // Needed for some implementations.
- allocation_begin = mallinfo();
+ allocation_begin = __mallinfo();
}
void
@@ -176,7 +188,7 @@ namespace __gnu_test
{
if (getrusage(who, &rusage_end) != 0 )
memset(&rusage_end, 0, sizeof(rusage_end));
- allocation_end = mallinfo();
+ allocation_end = __mallinfo();
}
int
next reply other threads:[~2022-09-07 17:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-07 17:02 François Dumont [this message]
2022-09-07 17:10 ` Jonathan Wakely
2022-09-08 5:03 ` François Dumont
2022-09-08 8:48 ` Jonathan Wakely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e5b4b0e9-eebf-3ad5-3c3f-86080816c330@gmail.com \
--to=frs.dumont@gmail.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).