9613b3176c
After much work by Jeff and myself, and quite a lot of discussion, it has become clear that we simply cannot resolve the infinite loops caused by RML-involved subsystems calling orte_output. The original rationale for the change to orte_output has also been reduced by shifting the output of XML-formatted vs human readable messages to an alternative approach. I have globally replaced the orte_output/ORTE_OUTPUT calls in the code base, as well as the corresponding .h file name. I have test compiled and run this on the various environments within my reach, so hopefully this will prove minimally disruptive. This commit was SVN r18619.
197 строки
6.7 KiB
C
197 строки
6.7 KiB
C
/*
|
|
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
|
* University Research and Technology
|
|
* Corporation. All rights reserved.
|
|
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
|
* of Tennessee Research Foundation. All rights
|
|
* reserved.
|
|
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
|
* University of Stuttgart. All rights reserved.
|
|
* Copyright (c) 2004-2005 The Regents of the University of California.
|
|
* All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "orte_config.h"
|
|
#include "orte/types.h"
|
|
#include "orte/constants.h"
|
|
|
|
#include "orte/util/show_help.h"
|
|
|
|
#include "orte/util/name_fns.h"
|
|
|
|
#include "orte/mca/iof/base/iof_base_header.h"
|
|
#include "iof_svc.h"
|
|
#include "iof_svc_proxy.h"
|
|
#include "iof_svc_pub.h"
|
|
#include "iof_svc_sub.h"
|
|
|
|
|
|
|
|
OBJ_CLASS_INSTANCE(
|
|
orte_iof_svc_pub_t,
|
|
opal_list_item_t,
|
|
NULL, NULL);
|
|
|
|
|
|
/**
|
|
* (1) Create an entry to represent the published endpoint
|
|
* (2) Lookup any subscriptions that match and install on the
|
|
* subscription as a destination endpoint.
|
|
*/
|
|
|
|
int orte_iof_svc_pub_create(
|
|
const orte_process_name_t *pub_name,
|
|
const orte_process_name_t *pub_proxy,
|
|
orte_ns_cmp_bitmask_t pub_mask,
|
|
orte_iof_base_tag_t pub_tag)
|
|
{
|
|
orte_iof_svc_pub_t* pub;
|
|
opal_list_item_t* item;
|
|
|
|
OPAL_THREAD_LOCK(&mca_iof_svc_component.svc_lock);
|
|
|
|
/* has matching publish already been created? */
|
|
for(item = opal_list_get_first(&mca_iof_svc_component.svc_published);
|
|
item != opal_list_get_end(&mca_iof_svc_component.svc_published);
|
|
item = opal_list_get_next(item)) {
|
|
pub = (orte_iof_svc_pub_t*)item;
|
|
if(OPAL_EQUAL == orte_util_compare_name_fields(pub_mask,pub_name,&pub->pub_name) &&
|
|
OPAL_EQUAL == orte_util_compare_name_fields(ORTE_NS_CMP_ALL,pub_proxy,&pub->pub_proxy) &&
|
|
pub_tag == pub->pub_tag) {
|
|
OPAL_THREAD_UNLOCK(&mca_iof_svc_component.svc_lock);
|
|
return ORTE_SUCCESS;
|
|
}
|
|
}
|
|
|
|
/* create a new publish entry; associate it with the corresponding
|
|
endpoint */
|
|
pub = OBJ_NEW(orte_iof_svc_pub_t);
|
|
pub->pub_name = *pub_name;
|
|
pub->pub_proxy = *pub_proxy;
|
|
pub->pub_mask = pub_mask;
|
|
pub->pub_tag = pub_tag;
|
|
pub->pub_endpoint =
|
|
orte_iof_base_endpoint_match(pub_name,pub_mask,pub_tag);
|
|
opal_output_verbose(1, orte_iof_base.iof_output, "created svc pub, name %s, proxy %s, tag %d / mask %x, endpoint %p\n",
|
|
ORTE_NAME_PRINT((orte_process_name_t*)pub_name), ORTE_NAME_PRINT((orte_process_name_t*)pub_proxy),
|
|
pub_tag, pub_mask, (char*) pub->pub_endpoint);
|
|
|
|
/* append this published endpoint to any matching subscription */
|
|
for(item = opal_list_get_first(&mca_iof_svc_component.svc_subscribed);
|
|
item != opal_list_get_end(&mca_iof_svc_component.svc_subscribed);
|
|
item = opal_list_get_next(item)) {
|
|
orte_iof_svc_sub_t* sub = (orte_iof_svc_sub_t*)item;
|
|
if(orte_iof_svc_fwd_match(sub,pub)) {
|
|
orte_iof_svc_fwd_create(sub,pub);
|
|
}
|
|
}
|
|
|
|
/* append this published endpoint to the global list */
|
|
opal_list_append(&mca_iof_svc_component.svc_published, &pub->super);
|
|
OPAL_THREAD_UNLOCK(&mca_iof_svc_component.svc_lock);
|
|
return ORTE_SUCCESS;
|
|
}
|
|
|
|
|
|
/**
|
|
* Look for a matching publish
|
|
*/
|
|
|
|
orte_iof_svc_pub_t* orte_iof_svc_pub_lookup(
|
|
const orte_process_name_t *pub_name,
|
|
const orte_process_name_t *pub_proxy,
|
|
orte_ns_cmp_bitmask_t pub_mask,
|
|
orte_iof_base_tag_t pub_tag)
|
|
{
|
|
opal_list_item_t* item;
|
|
for(item = opal_list_get_first(&mca_iof_svc_component.svc_published);
|
|
item != opal_list_get_end(&mca_iof_svc_component.svc_published);
|
|
item = opal_list_get_next(item)) {
|
|
orte_iof_svc_pub_t* pub = (orte_iof_svc_pub_t*)item;
|
|
if (OPAL_EQUAL == orte_util_compare_name_fields(ORTE_NS_CMP_ALL, &pub->pub_name,pub_name) &&
|
|
OPAL_EQUAL == orte_util_compare_name_fields(ORTE_NS_CMP_ALL, &pub->pub_proxy,pub_proxy) &&
|
|
pub->pub_mask == pub_mask &&
|
|
pub->pub_tag == pub_tag) {
|
|
return pub;
|
|
}
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
/**
|
|
* Remove the published endpoint and cleanup any associated
|
|
* forwarding entries.
|
|
*/
|
|
|
|
int orte_iof_svc_pub_delete(
|
|
const orte_process_name_t *pub_name,
|
|
const orte_process_name_t *pub_proxy,
|
|
orte_ns_cmp_bitmask_t pub_mask,
|
|
orte_iof_base_tag_t pub_tag)
|
|
{
|
|
opal_list_item_t* item;
|
|
orte_iof_svc_pub_t* pub;
|
|
|
|
OPAL_THREAD_LOCK(&mca_iof_svc_component.svc_lock);
|
|
pub = orte_iof_svc_pub_lookup(pub_name,pub_proxy,pub_mask,pub_tag);
|
|
if(NULL == pub) {
|
|
OPAL_THREAD_UNLOCK(&mca_iof_svc_component.svc_lock);
|
|
return ORTE_ERR_NOT_FOUND;
|
|
}
|
|
|
|
for(item = opal_list_get_first(&mca_iof_svc_component.svc_subscribed);
|
|
item != opal_list_get_end(&mca_iof_svc_component.svc_subscribed);
|
|
item = opal_list_get_next(item)) {
|
|
orte_iof_svc_sub_t* sub = (orte_iof_svc_sub_t*)item;
|
|
if(orte_iof_svc_fwd_match(sub,pub)) {
|
|
orte_iof_svc_fwd_delete(sub,pub);
|
|
}
|
|
}
|
|
opal_list_remove_item(&mca_iof_svc_component.svc_published, &pub->super);
|
|
OBJ_RELEASE(pub);
|
|
OPAL_THREAD_UNLOCK(&mca_iof_svc_component.svc_lock);
|
|
return ORTE_SUCCESS;
|
|
}
|
|
|
|
|
|
/*
|
|
* Remove all publications associated w/ the given process name.
|
|
*/
|
|
|
|
void orte_iof_svc_pub_delete_all(
|
|
const orte_process_name_t* name)
|
|
{
|
|
opal_list_item_t* p_item;
|
|
|
|
OPAL_THREAD_LOCK(&mca_iof_svc_component.svc_lock);
|
|
p_item = opal_list_get_first(&mca_iof_svc_component.svc_published);
|
|
while(p_item != opal_list_get_end(&mca_iof_svc_component.svc_published)) {
|
|
opal_list_item_t* p_next = opal_list_get_next(p_item);
|
|
orte_iof_svc_pub_t* pub = (orte_iof_svc_pub_t*)p_item;
|
|
|
|
if (OPAL_EQUAL == orte_util_compare_name_fields(ORTE_NS_CMP_ALL, &pub->pub_name,name) ||
|
|
OPAL_EQUAL == orte_util_compare_name_fields(ORTE_NS_CMP_ALL, &pub->pub_proxy,name)) {
|
|
|
|
opal_list_item_t* s_item;
|
|
for(s_item = opal_list_get_first(&mca_iof_svc_component.svc_subscribed);
|
|
s_item != opal_list_get_end(&mca_iof_svc_component.svc_subscribed);
|
|
s_item = opal_list_get_next(s_item)) {
|
|
orte_iof_svc_sub_t* sub = (orte_iof_svc_sub_t*)s_item;
|
|
if(orte_iof_svc_fwd_match(sub,pub)) {
|
|
orte_iof_svc_fwd_delete(sub,pub);
|
|
}
|
|
}
|
|
opal_list_remove_item(&mca_iof_svc_component.svc_published, p_item);
|
|
OBJ_RELEASE(pub);
|
|
}
|
|
p_item = p_next;
|
|
}
|
|
OPAL_THREAD_UNLOCK(&mca_iof_svc_component.svc_lock);
|
|
}
|
|
|