ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Fix non-updated opal_output channel

Просмотр исходного кода 
This commit was SVN r28245.
Этот коммит содержится в:
Ralph Castain 2013-03-27 21:57:24 +00:00
родитель 1b5b9afa85
Коммит 95cf39b224
1 изменённых файлов: 6 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
opal/mca/if/bsdx_ipv6/if_bsdx_ipv6.c
Просмотреть файл

@ -105,7 +105,7 @@ static int if_bsdx_ipv6_open(void)
struct ifaddrs *cur_ifaddrs; struct ifaddrs *cur_ifaddrs;
struct sockaddr_in6* sin_addr; struct sockaddr_in6* sin_addr;
opal_output_verbose(1, opal_if_base_output, opal_output_verbose(1, opal_if_base_framework.framework_output,
"searching for IPv6 interfaces"); "searching for IPv6 interfaces");
/* /*
@ -130,7 +130,7 @@ static int if_bsdx_ipv6_open(void)
/* skip non-ipv6 interface addresses */ /* skip non-ipv6 interface addresses */
if (AF_INET6 != cur_ifaddrs->ifa_addr->sa_family) { if (AF_INET6 != cur_ifaddrs->ifa_addr->sa_family) {
opal_output_verbose(1, opal_if_base_output, opal_output_verbose(1, opal_if_base_framework.framework_output,
"skipping non-ipv6 interface %s[%d].\n", "skipping non-ipv6 interface %s[%d].\n",
cur_ifaddrs->ifa_name, (int)cur_ifaddrs->ifa_addr->sa_family); cur_ifaddrs->ifa_name, (int)cur_ifaddrs->ifa_addr->sa_family);
continue; continue;
@ -138,7 +138,7 @@ static int if_bsdx_ipv6_open(void)
/* skip interface if it is down (IFF_UP not set) */ /* skip interface if it is down (IFF_UP not set) */
if (0 == (cur_ifaddrs->ifa_flags & IFF_UP)) { if (0 == (cur_ifaddrs->ifa_flags & IFF_UP)) {
opal_output_verbose(1, opal_if_base_output, opal_output_verbose(1, opal_if_base_framework.framework_output,
"skipping non-up interface %s.\n", cur_ifaddrs->ifa_name); "skipping non-up interface %s.\n", cur_ifaddrs->ifa_name);
continue; continue;
} }
@ -151,7 +151,7 @@ static int if_bsdx_ipv6_open(void)
/* or if it is a point-to-point interface */ /* or if it is a point-to-point interface */
/* TODO: do we really skip p2p? */ /* TODO: do we really skip p2p? */
if (0!= (cur_ifaddrs->ifa_flags & IFF_POINTOPOINT)) { if (0!= (cur_ifaddrs->ifa_flags & IFF_POINTOPOINT)) {
opal_output_verbose(1, opal_if_base_output, opal_output_verbose(1, opal_if_base_framework.framework_output,
"skipping loopback interface %s.\n", cur_ifaddrs->ifa_name); "skipping loopback interface %s.\n", cur_ifaddrs->ifa_name);
continue; continue;
} }
@ -177,14 +177,14 @@ static int if_bsdx_ipv6_open(void)
*/ */
if ((IN6_IS_ADDR_LINKLOCAL (&sin_addr->sin6_addr))) { if ((IN6_IS_ADDR_LINKLOCAL (&sin_addr->sin6_addr))) {
opal_output_verbose(1, opal_if_base_output, opal_output_verbose(1, opal_if_base_framework.framework_output,
"skipping link-local ipv6 address on interface " "skipping link-local ipv6 address on interface "
"%s with scope %d.\n", "%s with scope %d.\n",
cur_ifaddrs->ifa_name, sin_addr->sin6_scope_id); cur_ifaddrs->ifa_name, sin_addr->sin6_scope_id);
continue; continue;
} }
if (0 < opal_output_get_verbosity(opal_if_base_output)) { if (0 < opal_output_get_verbosity(opal_if_base_framework.framework_output)) {
char *addr_name = (char *) malloc(48*sizeof(char)); char *addr_name = (char *) malloc(48*sizeof(char));
inet_ntop(AF_INET6, &sin_addr->sin6_addr, addr_name, 48*sizeof(char)); inet_ntop(AF_INET6, &sin_addr->sin6_addr, addr_name, 48*sizeof(char));
opal_output(0, "ipv6 capable interface %s discovered, address %s.\n", opal_output(0, "ipv6 capable interface %s discovered, address %s.\n",