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

Cleanup a few bugs in the rmcast subsystem

Просмотр исходного кода 
This commit was SVN r22650.
Этот коммит содержится в:
Ralph Castain 2010-02-18 01:54:45 +00:00
родитель a46cecf4f2
Коммит 2be03b4fb6
2 изменённых файлов: 13 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -45,12 +45,12 @@ typedef int32_t orte_rmcast_tag_t;
#define ORTE_RMCAST_TAG_T OPAL_INT32 #define ORTE_RMCAST_TAG_T OPAL_INT32
/* tag values for well-known services */ /* tag values for well-known services */
#define ORTE_RMCAST_TAG_WILDCARD -1 #define ORTE_RMCAST_TAG_WILDCARD 0
#define ORTE_RMCAST_TAG_INVALID 0 #define ORTE_RMCAST_TAG_INVALID 1
#define ORTE_RMCAST_TAG_BOOTSTRAP 1 #define ORTE_RMCAST_TAG_BOOTSTRAP 2
#define ORTE_RMCAST_TAG_ANNOUNCE 2 #define ORTE_RMCAST_TAG_ANNOUNCE 3
#define ORTE_RMCAST_TAG_OUTPUT 3 #define ORTE_RMCAST_TAG_OUTPUT 4
#define ORTE_RMCAST_TAG_PS 4 #define ORTE_RMCAST_TAG_PS 5
/* starting value for dynamically assignable tags */ /* starting value for dynamically assignable tags */
#define ORTE_RMCAST_TAG_DYNAMIC 100 #define ORTE_RMCAST_TAG_DYNAMIC 100

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

@ -227,7 +227,7 @@ static void finalize(void)
OBJ_DESTRUCT(&channels); OBJ_DESTRUCT(&channels);
for (j=0; j < msg_log.size; j++) { for (j=0; j < msg_log.size; j++) {
if (NULL != (log = opal_pointer_array_get_item(&msg_log, j))) { if (NULL != (log = opal_pointer_array_get_item(&msg_log, j))) {
OBJ_RELEASE(item); OBJ_RELEASE(log);
} }
} }
OBJ_DESTRUCT(&msg_log); OBJ_DESTRUCT(&msg_log);
@ -266,6 +266,11 @@ static int queue_xmit(rmcast_base_send_t *snd,
opal_list_item_t *item; opal_list_item_t *item;
rmcast_base_channel_t *chptr, *ch; rmcast_base_channel_t *chptr, *ch;
OPAL_OUTPUT_VERBOSE((2, orte_rmcast_base.rmcast_output,
"%s rmcast:udp: queue_xmit to %d:%d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
channel, tag));
/* if we were asked to send this on our group output /* if we were asked to send this on our group output
* channel, substitute it * channel, substitute it
*/ */
@ -932,7 +937,7 @@ static void process_recv(int fd, short event, void *cbdata)
} }
if (NULL == log) { if (NULL == log) {
/* new sender - create a log */ /* new sender - create a log */
OPAL_OUTPUT_VERBOSE((-1, orte_rmcast_base.rmcast_output, OPAL_OUTPUT_VERBOSE((2, orte_rmcast_base.rmcast_output,
"%s rmcast:udp:recv creating new msg log for %s channel %d seq# %d", "%s rmcast:udp:recv creating new msg log for %s channel %d seq# %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(&name), (int)msg->channel->channel, recvd_seq_num)); ORTE_NAME_PRINT(&name), (int)msg->channel->channel, recvd_seq_num));