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

Make the mcast channel assignments unsigned ints so they can be used as array indices. Assign input/output channels for apps. Cleanup some bugs in open_channel

Просмотр исходного кода 
This commit was SVN r23275.
Этот коммит содержится в:
Ralph Castain 2010-06-16 19:40:59 +00:00
родитель 1467f2db52
Коммит 628ffd1d6e
3 изменённых файлов: 36 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
orte/mca/rmcast/rmcast_types.h
Просмотреть файл

@ -22,19 +22,19 @@
BEGIN_C_DECLS
/* channel type */
typedef int32_t orte_rmcast_channel_t;
#define ORTE_RMCAST_CHANNEL_T OPAL_INT32
typedef uint32_t orte_rmcast_channel_t;
#define ORTE_RMCAST_CHANNEL_T OPAL_UINT32
/* ORTE IP multicast channels */
#define ORTE_RMCAST_GROUP_INPUT_CHANNEL -3
#define ORTE_RMCAST_GROUP_OUTPUT_CHANNEL -2
#define ORTE_RMCAST_WILDCARD_CHANNEL -1
#define ORTE_RMCAST_INVALID_CHANNEL 0
#define ORTE_RMCAST_SYS_CHANNEL 1
#define ORTE_RMCAST_APP_PUBLIC_CHANNEL 2
#define ORTE_RMCAST_DATA_SERVER_CHANNEL 3
#define ORTE_RMCAST_GROUP_INPUT_CHANNEL 0
#define ORTE_RMCAST_GROUP_OUTPUT_CHANNEL 1
#define ORTE_RMCAST_WILDCARD_CHANNEL 2
#define ORTE_RMCAST_INVALID_CHANNEL 3
#define ORTE_RMCAST_SYS_CHANNEL 4
#define ORTE_RMCAST_APP_PUBLIC_CHANNEL 5
#define ORTE_RMCAST_DATA_SERVER_CHANNEL 6
#define ORTE_RMCAST_DYNAMIC_CHANNELS 4
#define ORTE_RMCAST_DYNAMIC_CHANNELS 7
/* define channel directions */

20
orte/mca/rmcast/tcp/rmcast_tcp.c
Просмотреть файл

@ -204,15 +204,13 @@ static int init(void)
/* finally, if we are an app, setup our grp xmit/recv channels, if given */
if (ORTE_PROC_IS_APP && NULL != orte_rmcast_base.my_group_name) {
if (ORTE_SUCCESS != (rc = open_channel(orte_rmcast_base.my_group_number,
orte_rmcast_base.my_group_name,
NULL, -1, NULL, ORTE_RMCAST_RECV))) {
"recv", NULL, -1, NULL, ORTE_RMCAST_RECV))) {
ORTE_ERROR_LOG(rc);
return rc;
}
orte_rmcast_base.my_input_channel = (rmcast_base_channel_t*)opal_list_get_last(&orte_rmcast_base.channels);
if (ORTE_SUCCESS != (rc = open_channel(orte_rmcast_base.my_group_number+1,
orte_rmcast_base.my_group_name,
NULL, -1, NULL, ORTE_RMCAST_XMIT))) {
"xmit", NULL, -1, NULL, ORTE_RMCAST_XMIT))) {
ORTE_ERROR_LOG(rc);
return rc;
}
@ -687,6 +685,10 @@ static int open_channel(orte_rmcast_channel_t channel, char *name,
opal_list_item_t *item;
rmcast_base_channel_t *chan;
OPAL_OUTPUT_VERBOSE((2, orte_rmcast_base.rmcast_output,
"%s opening channel %d for %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), channel, name));
/* see if this name has already been assigned a channel on the specified network */
for (item = opal_list_get_first(&orte_rmcast_base.channels);
item != opal_list_get_end(&orte_rmcast_base.channels);
@ -708,6 +710,10 @@ static int open_channel(orte_rmcast_channel_t channel, char *name,
}
/* we didn't find an existing match, so create a new channel */
OPAL_OUTPUT_VERBOSE((2, orte_rmcast_base.rmcast_output,
"%s creating new channel %d for %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), channel, name));
chan = OBJ_NEW(rmcast_base_channel_t);
chan->name = strdup(name);
chan->channel = channel;
@ -840,6 +846,12 @@ static void relay_handler(int status, orte_process_name_t* sender,
{
int rc;
/* if the message is from myself, ignore it */
if (sender->jobid == ORTE_PROC_MY_NAME->jobid &&
sender->vpid == ORTE_PROC_MY_NAME->vpid) {
return;
}
OPAL_OUTPUT_VERBOSE((2, orte_rmcast_base.rmcast_output,
"%s rmcast:tcp relay multicast msg from %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),

12
orte/mca/rmcast/udp/rmcast_udp.c
Просмотреть файл

@ -192,14 +192,14 @@ static int init(void)
/* finally, if we are an app, setup our grp xmit/recv channels, if given */
if (ORTE_PROC_IS_APP && NULL != orte_rmcast_base.my_group_name) {
if (ORTE_SUCCESS != (rc = open_channel(orte_rmcast_base.my_group_number,
orte_rmcast_base.my_group_name,
"recv",
NULL, -1, NULL, ORTE_RMCAST_RECV))) {
ORTE_ERROR_LOG(rc);
return rc;
}
orte_rmcast_base.my_input_channel = (rmcast_base_channel_t*)opal_list_get_last(&orte_rmcast_base.channels);
if (ORTE_SUCCESS != (rc = open_channel(orte_rmcast_base.my_group_number+1,
orte_rmcast_base.my_group_name,
"xmit",
NULL, -1, NULL, ORTE_RMCAST_XMIT))) {
ORTE_ERROR_LOG(rc);
return rc;
@ -566,6 +566,10 @@ static int open_channel(orte_rmcast_channel_t channel, char *name,
uint32_t netaddr=0, netmask=0, intr=0;
int rc;
OPAL_OUTPUT_VERBOSE((2, orte_rmcast_base.rmcast_output,
"%s opening channel %d for %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), channel, name));
/* parse the network, if provided */
if (NULL != network) {
if (ORTE_SUCCESS != (rc = opal_iftupletoaddr(network, &netaddr, &netmask))) {
@ -628,6 +632,10 @@ static int open_channel(orte_rmcast_channel_t channel, char *name,
}
/* we didn't find an existing match, so create a new channel */
OPAL_OUTPUT_VERBOSE((2, orte_rmcast_base.rmcast_output,
"%s creating new channel %d for %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), channel, name));
chan = OBJ_NEW(rmcast_base_channel_t);
chan->name = strdup(name);
chan->channel = channel;