sigar 0.7.0 → 0.7.1

data/bindings/ruby/sigar_version.c

@@ -0,0 +1,22 @@
+#include "sigar.h"
+
+static sigar_version_t sigar_version = {
+    "03/26/2012 12:16 PM",
+    "6e30384",
+    "1.7.0.0",
+    "x86_64-darwin10.8.0",
+    "sigar.bundle",
+    "sigar.bundle",
+    "SIGAR-1.7.0.0, "
+    "SCM revision 6e30384, "
+    "built 03/26/2012 12:16 PM as sigar.bundle",
+    1,
+    7,
+    0,
+    0
+};
+
+SIGAR_DECLARE(sigar_version_t *) sigar_version_get(void)
+{
+    return &sigar_version;
+}

data/bindings/ruby/test/file_system_test.rb

@@ -30,7 +30,7 @@ class FileSystemTest < Test::Unit::TestCase
 
       begin
         usage = sigar.file_system_usage fs.dir_name
-      rescue err
+      rescue => err
         if fs.type == Sigar::FSTYPE_LOCAL_DISK
           raise err
         end

data/include/sigar.h

@@ -23,6 +23,10 @@
 
 #include <limits.h>
 
+#ifndef MAX_INTERFACE_NAME_LEN
+#define MAX_INTERFACE_NAME_LEN 256
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -529,7 +533,7 @@ typedef struct {
 
 typedef struct {
     char default_gateway[SIGAR_INET6_ADDRSTRLEN];
-    char default_gateway_interface[16];
+    char default_gateway_interface[MAX_INTERFACE_NAME_LEN];
     char host_name[SIGAR_MAXHOSTNAMELEN];
     char domain_name[SIGAR_MAXDOMAINNAMELEN];
     char primary_dns[SIGAR_INET6_ADDRSTRLEN];
@@ -556,7 +560,7 @@ typedef struct {
         mtu,
         window,
         irtt;
-    char ifname[16];
+    char ifname[MAX_INTERFACE_NAME_LEN];
 } sigar_net_route_t;
 
 typedef struct {
@@ -602,7 +606,7 @@ SIGAR_DECLARE(int) sigar_net_route_list_destroy(sigar_t *sigar,
 #define SIGAR_IPV6_ADDR_COMPATv4   0x0080
 
 typedef struct {
-    char name[16];
+    char name[MAX_INTERFACE_NAME_LEN];
     char type[64];
     char description[256];
     sigar_net_address_t hwaddr;
@@ -847,7 +851,7 @@ sigar_net_listen_address_get(sigar_t *sigar,
                              sigar_net_address_t *address);
 
 typedef struct {
-    char ifname[16];
+    char ifname[MAX_INTERFACE_NAME_LEN];
     char type[64];
     sigar_net_address_t hwaddr;
     sigar_net_address_t address;

data/include/sigar_private.h

@@ -403,7 +403,7 @@ int sigar_get_iftype(const char *name, int *type, int *inst);
 #include <netdb.h>
 #endif
 
-#define SIGAR_HOSTENT_LEN 512
+#define SIGAR_HOSTENT_LEN 1024
 #if defined(_AIX)
 #define SIGAR_HAS_HOSTENT_DATA
 #endif

data/src/os/darwin/darwin_sigar.c

@@ -50,8 +50,7 @@
 #endif
 #include <mach-o/dyld.h>
 #define __OPENTRANSPORTPROVIDERS__
-#include <Gestalt.h>
-#include <CFString.h>
+#include <CoreServices/CoreServices.h>
 #include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/IOBSD.h>
 #include <IOKit/IOKitLib.h>
@@ -3661,6 +3660,9 @@ int sigar_os_sys_info_get(sigar_t *sigar,
           case 6:
             codename = "Snow Leopard";
             break;
+          case 7:
+            codename = "Lion";
+            break;
           default:
             codename = "Unknown";
             break;

data/src/os/win32/sigar_os.h

@@ -19,11 +19,24 @@
 #ifndef SIGAR_OS_H
 #define SIGAR_OS_H
 
+#if !defined(MSVC) && defined(_MSC_VER)
+#define MSVC
+#endif
+
+#ifdef MSVC
+#define WIN32_LEAN_AND_MEAN
+#define snprintf _snprintf
 #if _MSC_VER <= 1200
 #define SIGAR_USING_MSC6 /* Visual Studio version 6 */
+#define HAVE_MIB_IPADDRROW_WTYPE 0
+#else
+#define HAVE_MIB_IPADDRROW_WTYPE 1
+#endif
+#else
+/* Cross compiling */
+#define _WIN32_WINNT 0x0501
 #endif
 
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <winreg.h>
 #include <winperf.h>
@@ -38,12 +51,27 @@
 
 #include "sigar_util.h"
 
-#define INT64_C(val) val##i64
+#ifdef MSVC
+#  define INT64_C(val) val##i64
+#  define SIGAR_DLLFUNC(api, name) \
+    struct { \
+         const char *name; \
+         ##api##_##name func; \
+    } ##name
+#else
+/* The GCC compiler doesn't require/accept the ## prefix */
+#  define INT64_C(val) val##L
+#  define SIGAR_DLLFUNC(api, name)		\
+    struct { \
+         const char *name; \
+         api##_##name func; \
+    } name
+#endif
 
 /* see apr/include/arch/win32/atime.h */
 #define EPOCH_DELTA INT64_C(11644473600000000)
 
-#define SIGAR_CMDLINE_MAX 4096
+#define SIGAR_CMDLINE_MAX 4096<<2
 
 /* XXX: support CP_UTF8 ? */
 
@@ -457,12 +485,6 @@ typedef BOOL (CALLBACK *mpr_get_net_connection)(LPCTSTR,
                                                 LPTSTR,
                                                 LPDWORD);
 
-#define SIGAR_DLLFUNC(api, name) \
-    struct { \
-         const char *name; \
-         ##api##_##name func; \
-    } ##name
-
 typedef struct {
     sigar_dll_handle_t handle;
 
@@ -567,6 +589,7 @@ struct sigar_t {
     sigar_cache_t *netif_mib_rows;
     sigar_cache_t *netif_addr_rows;
     sigar_cache_t *netif_names; /* dwIndex -> net_interface_config.name */
+    int netif_name_short;
 
     WORD ws_version;
     int ws_error;

data/src/os/win32/win32_sigar.c

@@ -23,6 +23,9 @@
 #include "sigar_util.h"
 #include "sigar_format.h"
 #include <shellapi.h>
+#ifndef MSVC
+#include <iphlpapi.h>
+#endif
 
 #define USING_WIDE_S(s) (s)->using_wide
 #define USING_WIDE()    USING_WIDE_S(sigar)
@@ -124,6 +127,9 @@ typedef enum {
 #define MS_LOOPBACK_ADAPTER "Microsoft Loopback Adapter"
 #define NETIF_LA "la"
 
+static int get_proc_info(sigar_t *sigar, sigar_pid_t pid);
+static int netif_hash(char *s);
+
 sigar_uint64_t sigar_FileTimeToTime(FILETIME *ft)
 {
     sigar_uint64_t time;
@@ -375,13 +381,13 @@ static sigar_mpr_t sigar_mpr = {
 };
 
 #define DLLMOD_COPY(name) \
-    memcpy(&(sigar->##name), &sigar_##name, sizeof(sigar_##name))
+    memcpy(&(sigar->name), &sigar_##name, sizeof(sigar_##name))
 
 #define DLLMOD_INIT(name, all) \
-    sigar_dllmod_init(sigar, (sigar_dll_module_t *)&(sigar->##name), all)
+    sigar_dllmod_init(sigar, (sigar_dll_module_t *)&(sigar->name), all)
 
 #define DLLMOD_FREE(name) \
-    sigar_dllmod_free((sigar_dll_module_t *)&(sigar->##name))
+    sigar_dllmod_free((sigar_dll_module_t *)&(sigar->name))
 
 static void sigar_dllmod_free(sigar_dll_module_t *module)
 {
@@ -507,6 +513,19 @@ static int sigar_enable_privilege(char *name)
     return status;
 }
 
+static int netif_name_short(void)
+{
+    char value[32767]; /* max size from msdn docs */
+    DWORD retval =
+        GetEnvironmentVariable("SIGAR_NETIF_NAME_SHORT", value, sizeof(value));
+    if ((retval > 0) && (strEQ(value, "1") || (strEQ(value, "true")))) {
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+
 int sigar_os_open(sigar_t **sigar_ptr)
 {
     LONG result;
@@ -567,6 +586,8 @@ int sigar_os_open(sigar_t **sigar_ptr)
     sigar->netif_addr_rows = NULL;
     sigar->netif_adapters = NULL;
     sigar->netif_names = NULL;
+    sigar->netif_name_short = netif_name_short();
+
     sigar->pinfo.pid = -1;
     sigar->ws_version = 0;
     sigar->lcpu = -1;
@@ -1470,7 +1491,9 @@ static int sigar_remote_proc_args_get(sigar_t *sigar, sigar_pid_t pid,
     }
 
     /* likely we are 32-bit, pid process is 64-bit */
+#ifdef MSVC
     status = sigar_proc_args_wmi_get(sigar, pid, procargs);
+#endif
     if (status == ERROR_NOT_FOUND) {
         status = SIGAR_NO_SUCH_PROCESS;
     }
@@ -1507,7 +1530,7 @@ static int sigar_proc_env_parse(UCHAR *ptr, sigar_proc_env_t *procenv,
             break; /*XXX*/
         }
 
-        klen = val - ptr;
+        klen = val - (char*)ptr;
         SIGAR_SSTRCPY(key, ptr);
         key[klen] = '\0';
         ++val;
@@ -1640,6 +1663,7 @@ SIGAR_DECLARE(int) sigar_proc_exe_get(sigar_t *sigar, sigar_pid_t pid,
     }
 
     status = sigar_proc_exe_peb_get(sigar, proc, procexe);
+#ifdef MSVC
     if (procexe->name[0] == '\0') {
         /* likely we are 32-bit, pid process is 64-bit */
         /* procexe->cwd[0] = XXX where else can we try? */
@@ -1648,7 +1672,7 @@ SIGAR_DECLARE(int) sigar_proc_exe_get(sigar_t *sigar, sigar_pid_t pid,
             status = SIGAR_NO_SUCH_PROCESS;
         }
     }
-
+#endif
     if (procexe->cwd[0] != '\0') {
         /* strip trailing '\' */
         int len = strlen(procexe->cwd);
@@ -2279,9 +2303,9 @@ static int sigar_get_adapter_info(sigar_t *sigar,
 
 static int sigar_get_adapters_addresses(sigar_t *sigar,
                                         ULONG family, ULONG flags,
-                                        PIP_ADAPTER_ADDRESSES *addrs)
+                                        PIP_ADAPTER_ADDRESSES *addrs,
+                                        ULONG *size)
 {
-    ULONG size = sigar->ifconf_len;
     ULONG rc;
 
     DLLMOD_INIT(iphlpapi, FALSE);
@@ -2290,28 +2314,23 @@ static int sigar_get_adapters_addresses(sigar_t *sigar,
         return SIGAR_ENOTIMPL;
     }
 
-    *addrs = (PIP_ADAPTER_ADDRESSES)sigar->ifconf_buf;
     rc = sigar_GetAdaptersAddresses(family,
                                     flags,
                                     NULL,
                                     *addrs,
-                                    &size);
+                                    size);
 
     if (rc == ERROR_BUFFER_OVERFLOW) {
         sigar_log_printf(sigar, SIGAR_LOG_DEBUG,
-                         "GetAdaptersAddresses "
-                         "realloc ifconf_buf old=%d, new=%d",
-                         sigar->ifconf_len, size);
-        sigar->ifconf_len = size;
-        sigar->ifconf_buf = realloc(sigar->ifconf_buf,
-                                    sigar->ifconf_len);
+                         "GetAdaptersAddresses realloc to %d", size);
+
+        *addrs = realloc(*addrs, *size);
 
-        *addrs = (PIP_ADAPTER_ADDRESSES)sigar->ifconf_buf;
         rc = sigar_GetAdaptersAddresses(family,
                                         flags,
                                         NULL,
-                                        *addrs,
-                                        &size);
+                                        (PIP_ADAPTER_ADDRESSES)*addrs,
+                                        size);
     }
 
     if (rc != ERROR_SUCCESS) {
@@ -2394,10 +2413,10 @@ static int sigar_get_netif_ipaddr(sigar_t *sigar,
             MIB_IPADDRROW *row = &mib->table[i];
             short type;
 
-#ifdef SIGAR_USING_MSC6
-            type = row->unused2;
-#else
+#if HAVE_MIB_IPADDRROW_WTYPE
             type = row->wType;
+#else
+            type = row->unused2;
 #endif
             if (!(type & MIB_IPADDR_PRIMARY)) {
                 continue;
@@ -2651,6 +2670,33 @@ static int netif_hash(char *s)
 #define IF_TYPE_IEEE80211 71
 #endif
 
+static int
+sigar_net_interface_name_get(sigar_t *sigar, MIB_IFROW *ifr, PIP_ADAPTER_ADDRESSES address_list, char *name)
+{
+    PIP_ADAPTER_ADDRESSES iter;
+    int lpc = 0;
+
+    if (address_list == NULL) {
+        return SIGAR_ENOTIMPL;
+    }
+
+    for (iter = address_list; iter != NULL; iter = iter->Next) {
+        for (lpc = 0; lpc < iter->PhysicalAddressLength; lpc++) {
+            if (iter->PhysicalAddress[lpc] != ifr->bPhysAddr[lpc]) {
+                break;
+            }
+        }
+
+        if (lpc == iter->PhysicalAddressLength) {
+            wcstombs(name, iter->FriendlyName, MAX_INTERFACE_NAME_LEN);
+            name[MAX_INTERFACE_NAME_LEN-1] = '\0';
+            return SIGAR_OK;
+        }
+    }
+
+    return SIGAR_ENOENT;
+}
+
 SIGAR_DECLARE(int)
 sigar_net_interface_list_get(sigar_t *sigar,
                              sigar_net_interface_list_t *iflist)
@@ -2658,6 +2704,14 @@ sigar_net_interface_list_get(sigar_t *sigar,
     MIB_IFTABLE *ift;
     int i, status;
     int lo=0, eth=0, la=0;
+    PIP_ADAPTER_ADDRESSES address_list = NULL;
+    ULONG size = 0;
+
+    status = sigar_get_adapters_addresses(sigar, AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, &address_list, &size);
+
+    if (status != SIGAR_OK) {
+        address_list = NULL;
+    }
 
     if (!sigar->netif_mib_rows) {
         sigar->netif_mib_rows =
@@ -2670,6 +2724,9 @@ sigar_net_interface_list_get(sigar_t *sigar,
     }
 
     if ((status = sigar_get_if_table(sigar, &ift)) != SIGAR_OK) {
+        if (address_list) {
+            free(address_list);
+        }
         return status;
     }
 
@@ -2681,22 +2738,43 @@ sigar_net_interface_list_get(sigar_t *sigar,
     }
 
     for (i=0; i<ift->dwNumEntries; i++) {
-        char name[16];
+        char name[MAX_INTERFACE_NAME_LEN];
         int key;
         MIB_IFROW *ifr = ift->table + i;
         sigar_cache_entry_t *entry;
 
+        status = SIGAR_ENOENT;
+
         if (strEQ(ifr->bDescr, MS_LOOPBACK_ADAPTER)) {
             /* special-case */
             sprintf(name, NETIF_LA "%d", la++);
         }
         else if (ifr->dwType == MIB_IF_TYPE_LOOPBACK) {
-            sprintf(name, "lo%d", lo++);
+            if (!sigar->netif_name_short) {
+                status = sigar_net_interface_name_get(sigar, ifr, address_list, name);
+            }
+            if (status != SIGAR_OK) {
+                sprintf(name, "lo%d", lo++);
+            }
         }
         else if ((ifr->dwType == MIB_IF_TYPE_ETHERNET) ||
                  (ifr->dwType == IF_TYPE_IEEE80211))
         {
-            sprintf(name, "eth%d", eth++);
+            if (!sigar->netif_name_short &&
+                (strstr(ifr->bDescr, "Scheduler") == NULL) &&
+                (strstr(ifr->bDescr, "Filter") == NULL))
+            {
+                status = sigar_net_interface_name_get(sigar, ifr, address_list, name);
+            }
+
+            if (status != SIGAR_OK) {
+                if (sigar->netif_name_short) {
+                    sprintf(name, "eth%d", eth++);
+                }
+                else {
+                    snprintf(name, ifr->dwDescrLen, "%s", ifr->bDescr);
+                }
+            }
         }
         else {
             continue; /*XXX*/
@@ -2720,6 +2798,10 @@ sigar_net_interface_list_get(sigar_t *sigar,
         }
     }
 
+    if (address_list != NULL) {
+        free(address_list);
+    }
+
     return SIGAR_OK;
 }
 
@@ -2730,10 +2812,9 @@ static int sigar_net_interface_ipv6_config_find(sigar_t *sigar, int index,
     return SIGAR_ENOTIMPL;
 #else
     int status;
-    PIP_ADAPTER_ADDRESSES aa, addrs;
+    PIP_ADAPTER_ADDRESSES aa = (PIP_ADAPTER_ADDRESSES)sigar->ifconf_buf, addrs;
     ULONG flags = GAA_FLAG_INCLUDE_PREFIX;
-
-    status = sigar_get_adapters_addresses(sigar, AF_UNSPEC, flags, &aa);
+    status = sigar_get_adapters_addresses(sigar, AF_UNSPEC, flags, &aa, &sigar->ifconf_len);
 
     if (status != SIGAR_OK) {
         return status;