diff options
author | Alessio Vanni <vannilla@firemail.cc> | 2021-11-25 20:47:49 +0100 |
---|---|---|
committer | Alessio Vanni <vannilla@firemail.cc> | 2021-11-25 20:47:49 +0100 |
commit | a24bbd5b39c7d26d97af357531ed05579016bd69 (patch) | |
tree | aa6094e8ce1c41f2b323ceba803701d385ba3ade /src/transport | |
parent | 63854ee52ec8d24928c2346928a3dbea22ebd1fe (diff) | |
parent | 0bd99177d2424a76bcf26b5347bfe8ee568348e8 (diff) | |
download | gnunet-a24bbd5b39c7d26d97af357531ed05579016bd69.tar.gz gnunet-a24bbd5b39c7d26d97af357531ed05579016bd69.zip |
Merge branch 'dev/vanni/bcd-new'
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/tcp_service_legacy.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/transport/tcp_service_legacy.c b/src/transport/tcp_service_legacy.c index 8606b353b..65b090187 100644 --- a/src/transport/tcp_service_legacy.c +++ b/src/transport/tcp_service_legacy.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include "gnunet_constants.h" | 29 | #include "gnunet_constants.h" |
30 | #include "gnunet_resolver_service.h" | 30 | #include "gnunet_resolver_service.h" |
31 | 31 | ||
32 | #if HAVE_MALLINFO | 32 | #if HAVE_MALLINFO2 |
33 | #include <malloc.h> | 33 | #include <malloc.h> |
34 | #include "gauger.h" | 34 | #include "gauger.h" |
35 | #endif | 35 | #endif |
@@ -1450,7 +1450,7 @@ shutdown: | |||
1450 | LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "write"); | 1450 | LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "write"); |
1451 | GNUNET_break (0 == close (sctx.ready_confirm_fd)); | 1451 | GNUNET_break (0 == close (sctx.ready_confirm_fd)); |
1452 | } | 1452 | } |
1453 | #if HAVE_MALLINFO | 1453 | #if HAVE_MALLINFO2 |
1454 | { | 1454 | { |
1455 | char *counter; | 1455 | char *counter; |
1456 | 1456 | ||
@@ -1462,9 +1462,9 @@ shutdown: | |||
1462 | "GAUGER_HEAP", | 1462 | "GAUGER_HEAP", |
1463 | &counter))) | 1463 | &counter))) |
1464 | { | 1464 | { |
1465 | struct mallinfo mi; | 1465 | struct mallinfo2 mi; |
1466 | 1466 | ||
1467 | mi = mallinfo (); | 1467 | mi = mallinfo2 (); |
1468 | GAUGER (service_name, counter, mi.usmblks, "blocks"); | 1468 | GAUGER (service_name, counter, mi.usmblks, "blocks"); |
1469 | GNUNET_free (counter); | 1469 | GNUNET_free (counter); |
1470 | } | 1470 | } |
@@ -1599,7 +1599,7 @@ LEGACY_SERVICE_stop (struct LEGACY_SERVICE_Context *sctx) | |||
1599 | { | 1599 | { |
1600 | unsigned int i; | 1600 | unsigned int i; |
1601 | 1601 | ||
1602 | #if HAVE_MALLINFO | 1602 | #if HAVE_MALLINFO2 |
1603 | { | 1603 | { |
1604 | char *counter; | 1604 | char *counter; |
1605 | 1605 | ||
@@ -1611,9 +1611,9 @@ LEGACY_SERVICE_stop (struct LEGACY_SERVICE_Context *sctx) | |||
1611 | "GAUGER_HEAP", | 1611 | "GAUGER_HEAP", |
1612 | &counter))) | 1612 | &counter))) |
1613 | { | 1613 | { |
1614 | struct mallinfo mi; | 1614 | struct mallinfo2 mi; |
1615 | 1615 | ||
1616 | mi = mallinfo (); | 1616 | mi = mallinfo2 (); |
1617 | GAUGER (sctx->service_name, counter, mi.usmblks, "blocks"); | 1617 | GAUGER (sctx->service_name, counter, mi.usmblks, "blocks"); |
1618 | GNUNET_free (counter); | 1618 | GNUNET_free (counter); |
1619 | } | 1619 | } |