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

* Move comment in powerpc atomic to where it should actually be

Просмотр исходного кода 
* Remove old version of ifinit since no one has complained recently

This commit was SVN r4199.
Этот коммит содержится в:
Brian Barrett 2005-01-28 01:10:50 +00:00
родитель 5955006dde
Коммит b9ccc45008
3 изменённых файлов: 9 добавлений и 133 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

11
src/include/sys/powerpc/atomic.h
Просмотреть файл

@ -175,11 +175,6 @@ int ompi_atomic_cmpset_rel_32(volatile int32_t *addr,
#if OMPI_POWERPC_SUPPORT_64BIT
#if OMPI_GCC_INLINE_ASSEMBLY
/* these two functions aren't inlined in the non-gcc case because then
there would be two function calls (since neither cmpset_64 nor
atomic_?mb can be inlined). Instead, we "inline" them by hand in
the assembly, meaning there is one function call overhead instead
of two */
static inline int ompi_atomic_cmpset_64(volatile int64_t *addr,
int64_t oldval, int64_t newval)
{
@ -199,6 +194,12 @@ static inline int ompi_atomic_cmpset_64(volatile int64_t *addr,
return (ret == oldval);
}
/* these two functions aren't inlined in the non-gcc case because then
there would be two function calls (since neither cmpset_64 nor
atomic_?mb can be inlined). Instead, we "inline" them by hand in
the assembly, meaning there is one function call overhead instead
of two */
static inline int ompi_atomic_cmpset_acq_64(volatile int64_t *addr,
int64_t oldval, int64_t newval)
{

5
src/include/sys/powerpc/update.sh
Просмотреть файл

@ -25,8 +25,9 @@ cat > $CFILE<<EOF
#define static
#define inline
#define OMPI_GCC_INLINE_ASSEMBLY 1
#define OMPI_POWERPC_SUPPORT_64BIT 0
#include "atomic.h"
EOF
gcc -DHAVE_SMP -I. -S $CFILE -o atomic.s
gcc -mcpu=970 -DOMPI_POWERPC_SUPPORT_64BIT=1 -I. -S $CFILE -o atomic-32-64.s
gcc -DOMPI_POWERPC_SUPPORT_64BIT=0 -I. -S $CFILE -o atomic-32.s
gcc -m64 -DOMPI_POWERPC_SUPPORT_64BIT=1 -I. -S $CFILE -o atomic-64.s

126
src/util/if.c
Просмотреть файл

@ -74,127 +74,6 @@ static bool already_done = false;
#define DEFAULT_NUMBER_INTERFACES 10
#ifndef WIN32
static int old_ompi_ifinit(void)
{
char buff[1024];
char *ptr;
struct ifconf ifconf;
int sd;
ifconf.ifc_len = sizeof(buff);
ifconf.ifc_buf = buff;
if (already_done) {
return OMPI_SUCCESS;
}
already_done = true;
if((sd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
ompi_output(0, "ompi_ifinit: socket() failed with errno=%d\n", errno);
return OMPI_ERROR;
}
if(ioctl(sd, SIOCGIFCONF, &ifconf) < 0) {
ompi_output(0, "ompi_ifinit: ioctl(SIOCGIFCONF) failed with errno=%d", errno);
close(sd);
return OMPI_ERROR;
}
OBJ_CONSTRUCT(&ompi_if_list, ompi_list_t);
for(ptr = buff; ptr < buff + ifconf.ifc_len; ) {
struct ifreq* ifr = (struct ifreq*)ptr;
ompi_if_t intf;
ompi_if_t *intf_ptr;
OBJ_CONSTRUCT(&intf, ompi_list_item_t);
#if defined(__APPLE__)
ptr += (sizeof(ifr->ifr_name) +
MAX(sizeof(struct sockaddr),ifr->ifr_addr.sa_len));
#else
#if 0
switch(ifr->ifr_addr.sa_family) {
case AF_INET6:
ptr += sizeof(ifr->ifr_name) + sizeof(struct sockaddr_in6);
break;
case AF_INET:
default:
ptr += sizeof(ifr->ifr_name) + sizeof(struct sockaddr);
break;
}
#else
/* Jeff/George/Graham fix. According to LAM/MPI and FT-MPI
and /usr/include/linux/if.h, you should really be advancing
by sizeof(struct ifreq) -- sizeof(ifr->ifr_name) +
sizeof(struct sockaddr) may be smaller than sizeof(struct
ifreq). More specifically, the second element of struct
ifreq may be a union, of which struct sockaddr is only one
element (and may not be the smallest). */
ptr += sizeof(struct ifreq);
#endif
#endif
if(ifr->ifr_addr.sa_family != AF_INET)
continue;
if(ioctl(sd, SIOCGIFFLAGS, ifr) < 0) {
ompi_output(0, "ompi_ifinit: ioctl(SIOCGIFFLAGS) failed with errno=%d", errno);
continue;
}
if ((ifr->ifr_flags & IFF_UP) == 0)
continue;
#if 0
if ((ifr->ifr_flags & IFF_LOOPBACK) != 0)
continue;
#endif
strcpy(intf.if_name, ifr->ifr_name);
intf.if_flags = ifr->ifr_flags;
#if defined(__APPLE__)
intf.if_index = ompi_list_get_size(&ompi_if_list)+1;
#else
if(ioctl(sd, SIOCGIFINDEX, ifr) < 0) {
ompi_output(0,"ompi_ifinit: ioctl(SIOCGIFINDEX) failed with errno=%d", errno);
continue;
}
#if defined(ifr_ifindex)
intf.if_index = ifr->ifr_ifindex;
#elif defined(ifr_index)
intf.if_index = ifr->ifr_index;
#else
intf.if_index = -1;
#endif
#endif /* __APPLE__ */
if(ioctl(sd, SIOCGIFADDR, ifr) < 0) {
ompi_output(0, "ompi_ifinit: ioctl(SIOCGIFADDR) failed with errno=%d", errno);
break;
}
if(ifr->ifr_addr.sa_family != AF_INET)
continue;
memcpy(&intf.if_addr, &ifr->ifr_addr, sizeof(intf.if_addr));
if(ioctl(sd, SIOCGIFNETMASK, ifr) < 0) {
ompi_output(0, "ompi_ifinit: ioctl(SIOCGIFNETMASK) failed with errno=%d", errno);
continue;
}
memcpy(&intf.if_mask, &ifr->ifr_addr, sizeof(intf.if_mask));
intf_ptr = (ompi_if_t*) malloc(sizeof(ompi_if_t));
if(intf_ptr == 0) {
ompi_output(0, "ompi_ifinit: unable to allocated %d bytes\n", sizeof(ompi_if_t));
return OMPI_ERR_OUT_OF_RESOURCE;
}
memcpy(intf_ptr, &intf, sizeof(intf));
ompi_list_append(&ompi_if_list, (ompi_list_item_t*)intf_ptr);
}
close(sd);
return OMPI_SUCCESS;
}
#endif
/*
* Discover the list of configured interfaces. Don't care about any
* interfaces that are not up or are local loopbacks.
@ -209,11 +88,6 @@ static int ompi_ifinit(void)
struct ifconf ifconf;
int ifc_len;
/* BWB - remove once this code is better tested */
if (NULL != getenv("OMPI_orig_if")) {
return old_ompi_ifinit();
}
if (already_done) {
return OMPI_SUCCESS;
}