Remove unused file and minimize the usock uri contribution (add explanation as to why)
Refs trac:4280 This commit was SVN r30744. The following Trac tickets were found above: Ticket 4280 --> https://svn.open-mpi.org/trac/ompi/ticket/4280
Этот коммит содержится в:
родитель
a91d358c48
Коммит
ea0217c337
@ -1,84 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
|
|
||||||
* University Research and Technology
|
|
||||||
* Corporation. All rights reserved.
|
|
||||||
* Copyright (c) 2004-2011 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 (c) 2006-2013 Los Alamos National Security, LLC.
|
|
||||||
* All rights reserved.
|
|
||||||
* Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
|
|
||||||
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
|
|
||||||
* Copyright (c) 2013 Intel, Inc. All rights reserved.
|
|
||||||
* $COPYRIGHT$
|
|
||||||
*
|
|
||||||
* Additional copyrights may follow
|
|
||||||
*
|
|
||||||
* $HEADER$
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "orte_config.h"
|
|
||||||
#include "orte/types.h"
|
|
||||||
#include "opal/types.h"
|
|
||||||
|
|
||||||
#ifdef HAVE_UNISTD_H
|
|
||||||
#include <unistd.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_SYS_TYPES_H
|
|
||||||
#include <sys/types.h>
|
|
||||||
#endif
|
|
||||||
#include <fcntl.h>
|
|
||||||
#ifdef HAVE_NETINET_IN_H
|
|
||||||
#include <netinet/in.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_ARPA_INET_H
|
|
||||||
#include <arpa/inet.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_NETDB_H
|
|
||||||
#include <netdb.h>
|
|
||||||
#endif
|
|
||||||
#include <ctype.h>
|
|
||||||
|
|
||||||
#include "opal/util/show_help.h"
|
|
||||||
#include "opal/util/error.h"
|
|
||||||
#include "opal/util/output.h"
|
|
||||||
#include "opal/opal_socket_errno.h"
|
|
||||||
#include "opal/util/if.h"
|
|
||||||
#include "opal/util/net.h"
|
|
||||||
#include "opal/util/argv.h"
|
|
||||||
#include "opal/class/opal_hash_table.h"
|
|
||||||
#include "opal/class/opal_list.h"
|
|
||||||
|
|
||||||
#include "orte/mca/errmgr/errmgr.h"
|
|
||||||
#include "orte/mca/ess/ess.h"
|
|
||||||
#include "orte/util/name_fns.h"
|
|
||||||
#include "orte/util/parse_options.h"
|
|
||||||
#include "orte/util/show_help.h"
|
|
||||||
#include "orte/runtime/orte_globals.h"
|
|
||||||
|
|
||||||
#include "orte/mca/oob/usock/oob_usock.h"
|
|
||||||
#include "orte/mca/oob/usock/oob_usock_component.h"
|
|
||||||
#include "oob_usock_peer.h"
|
|
||||||
#include "oob_usock_common.h"
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set socket buffering
|
|
||||||
*/
|
|
||||||
|
|
||||||
mca_oob_usock_peer_t* mca_oob_usock_peer_lookup(const orte_process_name_t *name)
|
|
||||||
{
|
|
||||||
mca_oob_usock_peer_t *peer;
|
|
||||||
uint64_t ui64;
|
|
||||||
|
|
||||||
memcpy(&ui64, (char*)name, sizeof(uint64_t));
|
|
||||||
if (OPAL_SUCCESS != opal_hash_table_get_value_uint64(&mca_oob_usock_module.peers, ui64, (void**)&peer)) {
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
return peer;
|
|
||||||
}
|
|
||||||
|
|
@ -276,10 +276,18 @@ static int component_send(orte_rml_send_t *msg)
|
|||||||
return ORTE_SUCCESS;
|
return ORTE_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* although we do not use the uri to determine a peer's
|
||||||
|
* address (since we know the path via the session directory),
|
||||||
|
* we have to provide something to the uri. This is needed
|
||||||
|
* as other places in ORTE use a NULL uri to indicate lack
|
||||||
|
* of a daemon. We may eventually remove that dependency,
|
||||||
|
* but for now, just ensure that the uri is never NULL,
|
||||||
|
* even if we are the only active OOB transport.
|
||||||
|
*/
|
||||||
static char* component_get_addr(void)
|
static char* component_get_addr(void)
|
||||||
{
|
{
|
||||||
char *tmp;
|
char *tmp;
|
||||||
tmp = strdup(mca_oob_usock_component.address.sun_path);
|
tmp = strdup("usock");
|
||||||
return tmp;
|
return tmp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user