External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 03:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement interface stats for BSD

Browse Source
This commit is contained in:
Roman Bogorodskiy 2014-07-06 13:53:40 +04:00
parent 5559a8b838
commit 61bbdbb94c
2 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -275,7 +275,7 @@ dnl and various less common threadsafe functions
AC_CHECK_FUNCS_ONCE([cfmakeraw fallocate geteuid getgid getgrnam_r \ AC_CHECK_FUNCS_ONCE([cfmakeraw fallocate geteuid getgid getgrnam_r \
getmntent_r getpwuid_r getuid kill mmap newlocale posix_fallocate \ getmntent_r getpwuid_r getuid kill mmap newlocale posix_fallocate \
posix_memalign prlimit regexec sched_getaffinity setgroups setns \ posix_memalign prlimit regexec sched_getaffinity setgroups setns \
setrlimit symlink sysctlbyname]) setrlimit symlink sysctlbyname getifaddrs])
dnl Availability of pthread functions. Because of $LIB_PTHREAD, we dnl Availability of pthread functions. Because of $LIB_PTHREAD, we
dnl cannot use AC_CHECK_FUNCS_ONCE. LIB_PTHREAD and LIBMULTITHREAD dnl cannot use AC_CHECK_FUNCS_ONCE. LIB_PTHREAD and LIBMULTITHREAD
@ -2691,6 +2691,17 @@ if test $with_freebsd = yes; then
) )
fi fi
# FreeBSD 10-STABLE requires _IFI_OQDROPS to be defined for if_data.ifi_oqdrops
# field be available
old_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -D_IFI_OQDROPS"
AC_CHECK_MEMBERS([struct if_data.ifi_oqdrops],
[],
[CFLAGS="$old_CFLAGS"],
[#include <net/if.h>
])
# Check if we need to look for ifconfig # Check if we need to look for ifconfig
if test "$want_ifconfig" = "yes"; then if test "$want_ifconfig" = "yes"; then
AC_PATH_PROG([IFCONFIG_PATH], [ifconfig]) AC_PATH_PROG([IFCONFIG_PATH], [ifconfig])

51
src/util/virstats.c
View File

@ -29,6 +29,11 @@
#include <unistd.h> #include <unistd.h>
#include <regex.h> #include <regex.h>
#ifdef HAVE_GETIFADDRS
# include <net/if.h>
# include <ifaddrs.h>
#endif
#include "virerror.h" #include "virerror.h"
#include "datatypes.h" #include "datatypes.h"
#include "virstats.h" #include "virstats.h"
@ -114,6 +119,52 @@ virNetInterfaceStats(const char *path,
_("/proc/net/dev: Interface not found")); _("/proc/net/dev: Interface not found"));
return -1; return -1;
} }
#elif defined(HAVE_GETIFADDRS)
int
virNetInterfaceStats(const char *path,
struct _virDomainInterfaceStats *stats)
{
struct ifaddrs *ifap, *ifa;
struct if_data *ifd;
int ret = -1;
if (getifaddrs(&ifap) < 0) {
virReportSystemError(errno, "%s",
_("Could not get interface list"));
return -1;
}
for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
if (ifa->ifa_addr->sa_family != AF_LINK)
continue;
if (STREQ(ifa->ifa_name, path)) {
ifd = (struct if_data *)ifa->ifa_data;
stats->tx_bytes = ifd->ifi_ibytes;
stats->tx_packets = ifd->ifi_ipackets;
stats->tx_errs = ifd->ifi_ierrors;
stats->tx_drop = ifd->ifi_iqdrops;
stats->rx_bytes = ifd->ifi_obytes;
stats->rx_packets = ifd->ifi_opackets;
stats->rx_errs = ifd->ifi_oerrors;
# ifdef HAVE_STRUCT_IF_DATA_IFI_OQDROPS
stats->rx_drop = ifd->ifi_oqdrops;
# else
stats->rx_drop = 0;
# endif
ret = 0;
break;
}
}
if (ret < 0)
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Interface not found"));
freeifaddrs(ifap);
return ret;
}
#else #else
int int
virNetInterfaceStats(const char *path ATTRIBUTE_UNUSED, virNetInterfaceStats(const char *path ATTRIBUTE_UNUSED,