2005-09-01 05:07:30 +04:00
|
|
|
/*
|
2004-11-22 04:38:40 +03:00
|
|
|
* Copyright (c) 2004-2005 The Trustees of Indiana University.
|
|
|
|
* All rights reserved.
|
|
|
|
* Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
|
|
|
|
* All rights reserved.
|
2005-09-01 05:07:30 +04:00
|
|
|
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
2004-11-28 23:09:25 +03:00
|
|
|
* University of Stuttgart. All rights reserved.
|
2005-03-24 15:43:37 +03:00
|
|
|
* Copyright (c) 2004-2005 The Regents of the University of California.
|
|
|
|
* All rights reserved.
|
2004-11-22 04:38:40 +03:00
|
|
|
* $COPYRIGHT$
|
2005-09-01 05:07:30 +04:00
|
|
|
*
|
2004-11-22 04:38:40 +03:00
|
|
|
* Additional copyrights may follow
|
2005-09-01 05:07:30 +04:00
|
|
|
*
|
2004-07-01 18:49:54 +04:00
|
|
|
* $HEADER$
|
|
|
|
*/
|
|
|
|
|
2004-10-20 05:03:09 +04:00
|
|
|
#include "ompi_config.h"
|
2005-03-14 23:57:21 +03:00
|
|
|
|
|
|
|
#include "include/orte_types.h"
|
|
|
|
|
2004-10-22 20:06:05 +04:00
|
|
|
#ifdef HAVE_UNISTD_H
|
2004-08-03 01:24:00 +04:00
|
|
|
#include <unistd.h>
|
2004-10-22 20:06:05 +04:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
2004-08-03 01:24:00 +04:00
|
|
|
#include <sys/types.h>
|
2004-10-22 20:06:05 +04:00
|
|
|
#endif
|
2004-08-03 01:24:00 +04:00
|
|
|
#include <fcntl.h>
|
2004-10-22 20:06:05 +04:00
|
|
|
#ifdef HAVE_NETINET_IN_H
|
2004-08-16 23:39:54 +04:00
|
|
|
#include <netinet/in.h>
|
2004-10-22 20:06:05 +04:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_ARPA_INET_H
|
2004-08-16 23:39:54 +04:00
|
|
|
#include <arpa/inet.h>
|
2004-10-22 20:06:05 +04:00
|
|
|
#endif
|
2005-01-20 03:03:23 +03:00
|
|
|
#include "include/ompi_socket_errno.h"
|
2005-07-04 03:31:27 +04:00
|
|
|
#include "opal/util/output.h"
|
2005-07-04 05:36:20 +04:00
|
|
|
#include "opal/util/if.h"
|
2005-07-19 16:25:19 +04:00
|
|
|
#include "orte/class/orte_proc_table.h"
|
2004-07-01 18:49:54 +04:00
|
|
|
#include "mca/oob/tcp/oob_tcp.h"
|
2005-03-14 23:57:21 +03:00
|
|
|
#include "mca/errmgr/errmgr.h"
|
|
|
|
#include "mca/ns/ns.h"
|
|
|
|
#include "mca/gpr/gpr.h"
|
2004-07-01 18:49:54 +04:00
|
|
|
|
2005-01-20 07:44:07 +03:00
|
|
|
#define IMPORTANT_WINDOWS_COMMENT() \
|
2005-01-20 03:03:23 +03:00
|
|
|
/* In windows, many of the socket functions return an EWOULDBLOCK instead of \
|
|
|
|
things like EAGAIN, EINPROGRESS, etc. It has been verified that this will \
|
|
|
|
not conflict with other error codes that are returned by these functions \
|
|
|
|
under UNIX/Linux environments */
|
2005-09-01 05:07:30 +04:00
|
|
|
|
2004-09-30 19:09:29 +04:00
|
|
|
/*
|
|
|
|
* Data structure for accepting connections.
|
|
|
|
*/
|
2005-09-01 05:07:30 +04:00
|
|
|
|
2004-09-30 19:09:29 +04:00
|
|
|
struct mca_oob_tcp_event_t {
|
2005-07-03 20:22:16 +04:00
|
|
|
opal_list_item_t item;
|
2005-07-04 03:09:55 +04:00
|
|
|
opal_event_t event;
|
2004-09-30 19:09:29 +04:00
|
|
|
};
|
|
|
|
typedef struct mca_oob_tcp_event_t mca_oob_tcp_event_t;
|
2005-09-01 05:07:30 +04:00
|
|
|
|
2004-09-30 19:09:29 +04:00
|
|
|
static void mca_oob_tcp_event_construct(mca_oob_tcp_event_t* event)
|
|
|
|
{
|
2005-07-04 02:45:48 +04:00
|
|
|
OPAL_THREAD_LOCK(&mca_oob_tcp_component.tcp_lock);
|
2005-07-03 20:22:16 +04:00
|
|
|
opal_list_append(&mca_oob_tcp_component.tcp_events, &event->item);
|
2005-07-04 02:45:48 +04:00
|
|
|
OPAL_THREAD_UNLOCK(&mca_oob_tcp_component.tcp_lock);
|
2004-09-30 19:09:29 +04:00
|
|
|
}
|
2005-09-01 05:07:30 +04:00
|
|
|
|
2004-09-30 19:09:29 +04:00
|
|
|
static void mca_oob_tcp_event_destruct(mca_oob_tcp_event_t* event)
|
|
|
|
{
|
2005-07-04 02:45:48 +04:00
|
|
|
OPAL_THREAD_LOCK(&mca_oob_tcp_component.tcp_lock);
|
2005-07-03 20:22:16 +04:00
|
|
|
opal_list_remove_item(&mca_oob_tcp_component.tcp_events, &event->item);
|
2005-07-04 02:45:48 +04:00
|
|
|
OPAL_THREAD_UNLOCK(&mca_oob_tcp_component.tcp_lock);
|
2004-09-30 19:09:29 +04:00
|
|
|
}
|
2005-09-01 05:07:30 +04:00
|
|
|
|
2004-09-30 19:09:29 +04:00
|
|
|
OBJ_CLASS_INSTANCE(
|
|
|
|
mca_oob_tcp_event_t,
|
2005-07-03 20:22:16 +04:00
|
|
|
opal_list_item_t,
|
2004-09-30 19:09:29 +04:00
|
|
|
mca_oob_tcp_event_construct,
|
|
|
|
mca_oob_tcp_event_destruct);
|
2005-09-01 05:07:30 +04:00
|
|
|
|
2004-09-30 19:09:29 +04:00
|
|
|
/*
|
|
|
|
* Local utility functions
|
|
|
|
*/
|
2004-08-03 01:24:00 +04:00
|
|
|
|
|
|
|
static int mca_oob_tcp_create_listen(void);
|
|
|
|
static void mca_oob_tcp_recv_handler(int sd, short flags, void* user);
|
|
|
|
static void mca_oob_tcp_accept(void);
|
|
|
|
|
|
|
|
|
2004-09-02 03:07:40 +04:00
|
|
|
struct mca_oob_tcp_subscription_t {
|
2005-07-03 20:22:16 +04:00
|
|
|
opal_list_item_t item;
|
2005-03-14 23:57:21 +03:00
|
|
|
orte_jobid_t jobid;
|
2005-06-24 20:59:37 +04:00
|
|
|
orte_gpr_subscription_id_t subid;
|
2004-09-02 03:07:40 +04:00
|
|
|
};
|
|
|
|
typedef struct mca_oob_tcp_subscription_t mca_oob_tcp_subscription_t;
|
|
|
|
|
|
|
|
OBJ_CLASS_INSTANCE(
|
|
|
|
mca_oob_tcp_subscription_t,
|
2005-07-03 20:22:16 +04:00
|
|
|
opal_list_item_t,
|
2004-09-02 03:07:40 +04:00
|
|
|
NULL,
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-07-01 18:49:54 +04:00
|
|
|
/*
|
|
|
|
* Struct of function pointers and all that to let us be initialized
|
|
|
|
*/
|
2004-08-02 04:24:22 +04:00
|
|
|
mca_oob_tcp_component_t mca_oob_tcp_component = {
|
|
|
|
{
|
2004-07-01 18:49:54 +04:00
|
|
|
{
|
|
|
|
MCA_OOB_BASE_VERSION_1_0_0,
|
|
|
|
"tcp", /* MCA module name */
|
2004-08-19 23:34:37 +04:00
|
|
|
1, /* MCA component major version */
|
|
|
|
0, /* MCA component minor version */
|
|
|
|
0, /* MCA component release version */
|
|
|
|
mca_oob_tcp_component_open, /* component open */
|
|
|
|
mca_oob_tcp_component_close /* component close */
|
2004-07-01 18:49:54 +04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
false /* checkpoint / restart */
|
|
|
|
},
|
2005-09-01 05:07:30 +04:00
|
|
|
mca_oob_tcp_component_init
|
2004-08-02 04:24:22 +04:00
|
|
|
}
|
2004-07-01 18:49:54 +04:00
|
|
|
};
|
|
|
|
|
2004-08-03 01:24:00 +04:00
|
|
|
static mca_oob_t mca_oob_tcp = {
|
2004-08-16 23:39:54 +04:00
|
|
|
mca_oob_tcp_get_addr,
|
Not as bad as this all may look. Tim and I made a significant change to the way we handle the startup of the oob, the seed, etc. We have made it backwards-compatible so that mpirun2 and singleton operations remain working. We had to adjust the name server and gpr as well, plus the process_info structure.
This also includes a checkpoint update to openmpi.c and ompid.c. I have re-enabled the ompid compile.
This latter raises an important point. The trunk compiles the programs like ompid just fine under Linux. It also does just fine for OSX under the dynamic libraries. However, we are seeing errors when compiling under OSX for the static case - the linker seems to have trouble resolving some variable names, even though linker diagnostics show the variables as being defined. Thus, a warning to Mac users that you may have to locally turn things off if you are trying to do static compiles. We ask, however, that you don't commit those changes that turn things off for everyone else - instead, let's try to figure out why the static compile is having a problem, and let everyone else continue to work.
Thanks
Ralph
This commit was SVN r2534.
2004-09-08 07:59:06 +04:00
|
|
|
mca_oob_tcp_set_addr,
|
2004-09-08 21:02:24 +04:00
|
|
|
mca_oob_tcp_ping,
|
2004-07-01 18:49:54 +04:00
|
|
|
mca_oob_tcp_send,
|
|
|
|
mca_oob_tcp_recv,
|
|
|
|
mca_oob_tcp_send_nb,
|
2004-08-11 01:02:36 +04:00
|
|
|
mca_oob_tcp_recv_nb,
|
2004-09-30 19:09:29 +04:00
|
|
|
mca_oob_tcp_recv_cancel,
|
2004-08-19 23:34:37 +04:00
|
|
|
mca_oob_tcp_init,
|
|
|
|
mca_oob_tcp_fini,
|
2004-12-09 09:32:44 +03:00
|
|
|
mca_oob_xcast
|
2004-07-01 18:49:54 +04:00
|
|
|
};
|
|
|
|
|
2004-08-03 01:24:00 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Utility function to register/lookup module parameters.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static inline int mca_oob_tcp_param_register_int(
|
|
|
|
const char* param_name,
|
|
|
|
int default_value)
|
|
|
|
{
|
2004-09-02 03:07:40 +04:00
|
|
|
int id = mca_base_param_register_int("oob","tcp",param_name,NULL,default_value);
|
2004-08-03 01:24:00 +04:00
|
|
|
int param_value = default_value;
|
|
|
|
mca_base_param_lookup_int(id,¶m_value);
|
|
|
|
return param_value;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-08-16 23:39:54 +04:00
|
|
|
static inline char* mca_oob_tcp_param_register_str(
|
|
|
|
const char* param_name,
|
|
|
|
const char* default_value)
|
|
|
|
{
|
2004-09-02 03:07:40 +04:00
|
|
|
int id = mca_base_param_register_string("oob","tcp",param_name,NULL,default_value);
|
2004-08-16 23:39:54 +04:00
|
|
|
char* param_value = NULL;
|
|
|
|
mca_base_param_lookup_string(id,¶m_value);
|
|
|
|
return param_value;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-07-01 18:49:54 +04:00
|
|
|
/*
|
2004-07-13 02:46:57 +04:00
|
|
|
* Initialize global variables used w/in this module.
|
2004-07-01 18:49:54 +04:00
|
|
|
*/
|
2004-08-19 23:34:37 +04:00
|
|
|
int mca_oob_tcp_component_open(void)
|
2004-07-01 18:49:54 +04:00
|
|
|
{
|
2004-11-02 16:14:34 +03:00
|
|
|
#ifdef WIN32
|
|
|
|
WSADATA win_sock_data;
|
|
|
|
if (WSAStartup(MAKEWORD(2,2), &win_sock_data) != 0) {
|
2005-07-04 03:31:27 +04:00
|
|
|
opal_output (0, "mca_oob_tcp_component_init: failed to initialise windows sockets: error %d\n", WSAGetLastError());
|
2004-11-02 16:14:34 +03:00
|
|
|
return OMPI_ERROR;
|
|
|
|
}
|
|
|
|
#endif
|
2005-09-01 05:07:30 +04:00
|
|
|
|
2005-07-03 20:22:16 +04:00
|
|
|
OBJ_CONSTRUCT(&mca_oob_tcp_component.tcp_subscriptions, opal_list_t);
|
|
|
|
OBJ_CONSTRUCT(&mca_oob_tcp_component.tcp_peer_list, opal_list_t);
|
2005-10-25 17:48:08 +04:00
|
|
|
OBJ_CONSTRUCT(&mca_oob_tcp_component.tcp_peers, opal_hash_table_t);
|
2005-07-03 20:52:32 +04:00
|
|
|
OBJ_CONSTRUCT(&mca_oob_tcp_component.tcp_peer_names, opal_hash_table_t);
|
2005-07-02 20:46:27 +04:00
|
|
|
OBJ_CONSTRUCT(&mca_oob_tcp_component.tcp_peer_free, opal_free_list_t);
|
|
|
|
OBJ_CONSTRUCT(&mca_oob_tcp_component.tcp_msgs, opal_free_list_t);
|
2005-07-04 02:45:48 +04:00
|
|
|
OBJ_CONSTRUCT(&mca_oob_tcp_component.tcp_lock, opal_mutex_t);
|
2005-07-03 20:22:16 +04:00
|
|
|
OBJ_CONSTRUCT(&mca_oob_tcp_component.tcp_events, opal_list_t);
|
|
|
|
OBJ_CONSTRUCT(&mca_oob_tcp_component.tcp_msg_post, opal_list_t);
|
|
|
|
OBJ_CONSTRUCT(&mca_oob_tcp_component.tcp_msg_recv, opal_list_t);
|
2005-10-25 17:48:08 +04:00
|
|
|
OBJ_CONSTRUCT(&mca_oob_tcp_component.tcp_msg_completed, opal_list_t);
|
2005-07-04 02:45:48 +04:00
|
|
|
OBJ_CONSTRUCT(&mca_oob_tcp_component.tcp_match_lock, opal_mutex_t);
|
|
|
|
OBJ_CONSTRUCT(&mca_oob_tcp_component.tcp_match_cond, opal_condition_t);
|
2004-08-03 01:24:00 +04:00
|
|
|
|
|
|
|
/* register oob module parameters */
|
|
|
|
mca_oob_tcp_component.tcp_peer_limit =
|
|
|
|
mca_oob_tcp_param_register_int("peer_limit", -1);
|
|
|
|
mca_oob_tcp_component.tcp_peer_retries =
|
|
|
|
mca_oob_tcp_param_register_int("peer_retries", 60);
|
2004-09-02 03:07:40 +04:00
|
|
|
mca_oob_tcp_component.tcp_debug =
|
2005-03-19 02:40:08 +03:00
|
|
|
mca_oob_tcp_param_register_int("debug", 0);
|
|
|
|
mca_oob_tcp_component.tcp_include =
|
|
|
|
mca_oob_tcp_param_register_str("include", NULL);
|
|
|
|
mca_oob_tcp_component.tcp_exclude =
|
|
|
|
mca_oob_tcp_param_register_str("exclude", NULL);
|
|
|
|
|
2004-08-03 02:16:35 +04:00
|
|
|
/* initialize state */
|
|
|
|
mca_oob_tcp_component.tcp_listen_sd = -1;
|
2004-09-30 19:09:29 +04:00
|
|
|
mca_oob_tcp_component.tcp_match_count = 0;
|
2004-07-13 02:46:57 +04:00
|
|
|
return OMPI_SUCCESS;
|
2004-07-01 18:49:54 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-07-13 02:46:57 +04:00
|
|
|
/*
|
|
|
|
* Cleanup of global variables used by this module.
|
|
|
|
*/
|
|
|
|
|
2004-08-19 23:34:37 +04:00
|
|
|
int mca_oob_tcp_component_close(void)
|
2004-07-01 18:49:54 +04:00
|
|
|
{
|
2004-11-02 16:14:34 +03:00
|
|
|
#ifdef WIN32
|
|
|
|
WSACleanup();
|
|
|
|
#endif
|
2005-09-01 05:07:30 +04:00
|
|
|
|
2004-09-30 19:09:29 +04:00
|
|
|
/* cleanup resources */
|
2004-08-03 01:24:00 +04:00
|
|
|
OBJ_DESTRUCT(&mca_oob_tcp_component.tcp_peer_list);
|
2005-03-14 23:57:21 +03:00
|
|
|
OBJ_DESTRUCT(&mca_oob_tcp_component.tcp_peers);
|
2005-08-30 01:35:01 +04:00
|
|
|
OBJ_DESTRUCT(&mca_oob_tcp_component.tcp_peer_names);
|
2004-08-03 01:24:00 +04:00
|
|
|
OBJ_DESTRUCT(&mca_oob_tcp_component.tcp_peer_free);
|
2004-09-30 19:09:29 +04:00
|
|
|
OBJ_DESTRUCT(&mca_oob_tcp_component.tcp_events);
|
2004-09-02 03:07:40 +04:00
|
|
|
OBJ_DESTRUCT(&mca_oob_tcp_component.tcp_subscriptions);
|
2004-08-03 01:24:00 +04:00
|
|
|
OBJ_DESTRUCT(&mca_oob_tcp_component.tcp_msgs);
|
|
|
|
OBJ_DESTRUCT(&mca_oob_tcp_component.tcp_lock);
|
|
|
|
OBJ_DESTRUCT(&mca_oob_tcp_component.tcp_msg_post);
|
|
|
|
OBJ_DESTRUCT(&mca_oob_tcp_component.tcp_msg_recv);
|
2005-10-25 17:48:08 +04:00
|
|
|
OBJ_DESTRUCT(&mca_oob_tcp_component.tcp_msg_completed);
|
2004-08-03 01:24:00 +04:00
|
|
|
OBJ_DESTRUCT(&mca_oob_tcp_component.tcp_match_lock);
|
2004-09-30 19:09:29 +04:00
|
|
|
OBJ_DESTRUCT(&mca_oob_tcp_component.tcp_match_cond);
|
2004-07-13 02:46:57 +04:00
|
|
|
return OMPI_SUCCESS;
|
2004-07-01 18:49:54 +04:00
|
|
|
}
|
|
|
|
|
2004-07-13 02:46:57 +04:00
|
|
|
|
2004-08-03 01:24:00 +04:00
|
|
|
/*
|
|
|
|
* Called by mca_oob_tcp_recv_handler() when the TCP listen
|
|
|
|
* socket has pending connection requests. Accept incoming
|
|
|
|
* requests and queue for completion of the connection handshake.
|
2004-07-13 02:46:57 +04:00
|
|
|
*/
|
|
|
|
|
2004-08-03 01:24:00 +04:00
|
|
|
static void mca_oob_tcp_accept(void)
|
2004-07-13 02:46:57 +04:00
|
|
|
{
|
2004-08-03 01:24:00 +04:00
|
|
|
while(true) {
|
|
|
|
ompi_socklen_t addrlen = sizeof(struct sockaddr_in);
|
|
|
|
struct sockaddr_in addr;
|
2004-09-30 19:09:29 +04:00
|
|
|
mca_oob_tcp_event_t* event;
|
|
|
|
int sd;
|
2005-09-01 05:07:30 +04:00
|
|
|
|
2004-09-30 19:09:29 +04:00
|
|
|
sd = accept(mca_oob_tcp_component.tcp_listen_sd, (struct sockaddr*)&addr, &addrlen);
|
2004-08-03 01:24:00 +04:00
|
|
|
if(sd < 0) {
|
2005-01-20 07:44:07 +03:00
|
|
|
IMPORTANT_WINDOWS_COMMENT();
|
2005-01-20 03:03:23 +03:00
|
|
|
if(ompi_socket_errno == EINTR)
|
2004-08-03 01:24:00 +04:00
|
|
|
continue;
|
2005-01-20 03:03:23 +03:00
|
|
|
if(ompi_socket_errno != EAGAIN || ompi_socket_errno != EWOULDBLOCK)
|
2005-07-04 03:31:27 +04:00
|
|
|
opal_output(0, "mca_oob_tcp_accept: accept() failed with errno %d.", ompi_socket_errno);
|
2004-08-03 01:24:00 +04:00
|
|
|
return;
|
|
|
|
}
|
2005-03-19 02:40:08 +03:00
|
|
|
|
|
|
|
/* log the accept */
|
|
|
|
if(mca_oob_tcp_component.tcp_debug) {
|
2005-07-04 03:31:27 +04:00
|
|
|
opal_output(0, "[%lu,%lu,%lu] mca_oob_tcp_accept: %s:%d\n",
|
2005-03-19 02:40:08 +03:00
|
|
|
ORTE_NAME_ARGS(orte_process_info.my_name),
|
|
|
|
inet_ntoa(addr.sin_addr),
|
|
|
|
addr.sin_port);
|
|
|
|
}
|
2005-09-01 05:07:30 +04:00
|
|
|
|
2004-08-03 01:24:00 +04:00
|
|
|
/* wait for receipt of peers process identifier to complete this connection */
|
2004-09-30 19:09:29 +04:00
|
|
|
event = OBJ_NEW(mca_oob_tcp_event_t);
|
2005-07-04 03:09:55 +04:00
|
|
|
opal_event_set(&event->event, sd, OPAL_EV_READ, mca_oob_tcp_recv_handler, event);
|
|
|
|
opal_event_add(&event->event, 0);
|
2004-08-03 01:24:00 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Create a listen socket and bind to all interfaces
|
|
|
|
*/
|
2005-09-01 05:07:30 +04:00
|
|
|
|
2004-08-03 01:24:00 +04:00
|
|
|
static int mca_oob_tcp_create_listen(void)
|
|
|
|
{
|
|
|
|
int flags;
|
|
|
|
struct sockaddr_in inaddr;
|
|
|
|
ompi_socklen_t addrlen;
|
2004-08-12 17:29:37 +04:00
|
|
|
|
2004-08-03 01:24:00 +04:00
|
|
|
/* create a listen socket for incoming connections */
|
|
|
|
mca_oob_tcp_component.tcp_listen_sd = socket(AF_INET, SOCK_STREAM, 0);
|
|
|
|
if(mca_oob_tcp_component.tcp_listen_sd < 0) {
|
2005-07-04 03:31:27 +04:00
|
|
|
opal_output(0,"mca_oob_tcp_component_init: socket() failed with errno=%d", ompi_socket_errno);
|
2004-08-03 01:24:00 +04:00
|
|
|
return OMPI_ERROR;
|
|
|
|
}
|
|
|
|
memset(&inaddr, 0, sizeof(inaddr));
|
|
|
|
inaddr.sin_family = AF_INET;
|
|
|
|
inaddr.sin_addr.s_addr = INADDR_ANY;
|
2004-08-19 23:34:37 +04:00
|
|
|
inaddr.sin_port = 0;
|
2004-08-12 17:29:37 +04:00
|
|
|
|
2004-08-03 01:24:00 +04:00
|
|
|
if(bind(mca_oob_tcp_component.tcp_listen_sd, (struct sockaddr*)&inaddr, sizeof(inaddr)) < 0) {
|
2005-07-04 03:31:27 +04:00
|
|
|
opal_output(0,"mca_oob_tcp_create_listen: bind() failed with errno=%d", ompi_socket_errno);
|
2004-08-03 01:24:00 +04:00
|
|
|
return OMPI_ERROR;
|
|
|
|
}
|
2004-08-12 17:29:37 +04:00
|
|
|
|
2004-09-02 03:07:40 +04:00
|
|
|
/* resolve system assigned port */
|
2004-08-03 01:24:00 +04:00
|
|
|
addrlen = sizeof(struct sockaddr_in);
|
|
|
|
if(getsockname(mca_oob_tcp_component.tcp_listen_sd, (struct sockaddr*)&inaddr, &addrlen) < 0) {
|
2005-07-04 03:31:27 +04:00
|
|
|
opal_output(0, "mca_oob_tcp_create_listen: getsockname() failed with errno=%d", ompi_socket_errno);
|
2004-08-03 01:24:00 +04:00
|
|
|
return OMPI_ERROR;
|
|
|
|
}
|
|
|
|
mca_oob_tcp_component.tcp_listen_port = inaddr.sin_port;
|
2005-09-01 05:07:30 +04:00
|
|
|
|
2004-08-03 01:24:00 +04:00
|
|
|
/* setup listen backlog to maximum allowed by kernel */
|
|
|
|
if(listen(mca_oob_tcp_component.tcp_listen_sd, SOMAXCONN) < 0) {
|
2005-07-04 03:31:27 +04:00
|
|
|
opal_output(0, "mca_oob_tcp_component_init: listen() failed with errno=%d", ompi_socket_errno);
|
2004-08-03 01:24:00 +04:00
|
|
|
return OMPI_ERROR;
|
|
|
|
}
|
2005-09-01 05:07:30 +04:00
|
|
|
|
2004-08-03 01:24:00 +04:00
|
|
|
/* set socket up to be non-blocking, otherwise accept could block */
|
|
|
|
if((flags = fcntl(mca_oob_tcp_component.tcp_listen_sd, F_GETFL, 0)) < 0) {
|
2005-07-04 03:31:27 +04:00
|
|
|
opal_output(0, "mca_oob_tcp_component_init: fcntl(F_GETFL) failed with errno=%d", ompi_socket_errno);
|
2004-08-03 01:24:00 +04:00
|
|
|
return OMPI_ERROR;
|
|
|
|
} else {
|
|
|
|
flags |= O_NONBLOCK;
|
|
|
|
if(fcntl(mca_oob_tcp_component.tcp_listen_sd, F_SETFL, flags) < 0) {
|
2005-07-04 03:31:27 +04:00
|
|
|
opal_output(0, "mca_oob_tcp_component_init: fcntl(F_SETFL) failed with errno=%d", ompi_socket_errno);
|
2004-08-03 01:24:00 +04:00
|
|
|
return OMPI_ERROR;
|
|
|
|
}
|
|
|
|
}
|
2005-09-01 05:07:30 +04:00
|
|
|
|
2004-08-03 01:24:00 +04:00
|
|
|
/* register listen port */
|
2005-07-04 03:09:55 +04:00
|
|
|
opal_event_set(
|
2004-08-03 01:24:00 +04:00
|
|
|
&mca_oob_tcp_component.tcp_recv_event,
|
|
|
|
mca_oob_tcp_component.tcp_listen_sd,
|
2005-07-04 03:09:55 +04:00
|
|
|
OPAL_EV_READ|OPAL_EV_PERSIST,
|
2004-08-03 01:24:00 +04:00
|
|
|
mca_oob_tcp_recv_handler,
|
|
|
|
0);
|
2005-07-04 03:09:55 +04:00
|
|
|
opal_event_add(&mca_oob_tcp_component.tcp_recv_event, 0);
|
2004-08-03 01:24:00 +04:00
|
|
|
return OMPI_SUCCESS;
|
|
|
|
}
|
2004-07-13 02:46:57 +04:00
|
|
|
|
2004-07-10 05:27:07 +04:00
|
|
|
|
2004-07-01 18:49:54 +04:00
|
|
|
/*
|
2005-05-05 20:31:40 +04:00
|
|
|
* Handle probe
|
2004-07-01 18:49:54 +04:00
|
|
|
*/
|
2005-05-05 20:31:40 +04:00
|
|
|
static void mca_oob_tcp_recv_probe(int sd, mca_oob_tcp_hdr_t* hdr)
|
2004-08-03 01:24:00 +04:00
|
|
|
{
|
2005-05-19 20:16:19 +04:00
|
|
|
unsigned char* ptr = (unsigned char*)hdr;
|
2005-05-05 20:31:40 +04:00
|
|
|
size_t cnt = 0;
|
|
|
|
|
2005-05-19 20:16:19 +04:00
|
|
|
hdr->msg_type = MCA_OOB_TCP_PROBE;
|
2005-05-05 20:31:40 +04:00
|
|
|
hdr->msg_dst = hdr->msg_src;
|
|
|
|
hdr->msg_src = *orte_process_info.my_name;
|
2005-05-19 20:16:19 +04:00
|
|
|
MCA_OOB_TCP_HDR_HTON(hdr);
|
|
|
|
|
2005-05-05 20:31:40 +04:00
|
|
|
while(cnt < sizeof(mca_oob_tcp_hdr_t)) {
|
|
|
|
int retval = send(sd, (char *)ptr+cnt, sizeof(mca_oob_tcp_hdr_t)-cnt, 0);
|
|
|
|
if(retval < 0) {
|
|
|
|
IMPORTANT_WINDOWS_COMMENT();
|
|
|
|
if(ompi_socket_errno != EINTR && ompi_socket_errno != EAGAIN && ompi_socket_errno != EWOULDBLOCK) {
|
2005-07-04 03:31:27 +04:00
|
|
|
opal_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_recv_probe: send() failed with errno=%d\n",
|
2005-05-05 20:31:40 +04:00
|
|
|
ORTE_NAME_ARGS(orte_process_info.my_name),
|
|
|
|
ORTE_NAME_ARGS(&(hdr->msg_src)),
|
|
|
|
ompi_socket_errno);
|
|
|
|
close(sd);
|
|
|
|
return;
|
2004-09-09 23:21:34 +04:00
|
|
|
}
|
2005-05-05 20:31:40 +04:00
|
|
|
continue;
|
2004-09-02 03:07:40 +04:00
|
|
|
}
|
2005-05-05 20:31:40 +04:00
|
|
|
cnt += retval;
|
2004-08-03 01:24:00 +04:00
|
|
|
}
|
2005-05-05 20:31:40 +04:00
|
|
|
close(sd);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Handle connection request
|
|
|
|
*/
|
|
|
|
static void mca_oob_tcp_recv_connect(int sd, mca_oob_tcp_hdr_t* hdr)
|
|
|
|
{
|
|
|
|
mca_oob_tcp_peer_t* peer;
|
|
|
|
int flags;
|
|
|
|
int cmpval;
|
2004-08-03 01:24:00 +04:00
|
|
|
|
|
|
|
/* now set socket up to be non-blocking */
|
|
|
|
if((flags = fcntl(sd, F_GETFL, 0)) < 0) {
|
2005-09-01 05:07:30 +04:00
|
|
|
opal_output(0, "[%lu,%lu,%lu] mca_oob_tcp_recv_handler: fcntl(F_GETFL) failed with errno=%d",
|
2005-03-14 23:57:21 +03:00
|
|
|
ORTE_NAME_ARGS(orte_process_info.my_name), ompi_socket_errno);
|
2004-08-03 01:24:00 +04:00
|
|
|
} else {
|
|
|
|
flags |= O_NONBLOCK;
|
|
|
|
if(fcntl(sd, F_SETFL, flags) < 0) {
|
2005-09-01 05:07:30 +04:00
|
|
|
opal_output(0, "[%lu,%lu,%lu] mca_oob_tcp_recv_handler: fcntl(F_SETFL) failed with errno=%d",
|
2005-03-14 23:57:21 +03:00
|
|
|
ORTE_NAME_ARGS(orte_process_info.my_name), ompi_socket_errno);
|
2004-08-03 01:24:00 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-09-01 05:07:30 +04:00
|
|
|
/* check for wildcard name - if this is true - we allocate a name from the name server
|
|
|
|
* and return to the peer
|
2004-08-25 21:39:08 +04:00
|
|
|
*/
|
2005-05-05 20:31:40 +04:00
|
|
|
cmpval = orte_ns.compare(ORTE_NS_CMP_ALL, &hdr->msg_src, MCA_OOB_NAME_ANY);
|
2005-03-14 23:57:21 +03:00
|
|
|
if (cmpval == 0) {
|
2005-05-05 20:31:40 +04:00
|
|
|
if (ORTE_SUCCESS != orte_ns.create_jobid(&hdr->msg_src.jobid)) {
|
2005-03-14 23:57:21 +03:00
|
|
|
return;
|
|
|
|
}
|
2005-05-05 20:31:40 +04:00
|
|
|
if (ORTE_SUCCESS != orte_ns.reserve_range(hdr->msg_src.jobid, 1, &hdr->msg_src.vpid)) {
|
2005-03-14 23:57:21 +03:00
|
|
|
return;
|
|
|
|
}
|
2005-05-05 20:31:40 +04:00
|
|
|
if (ORTE_SUCCESS != orte_ns.assign_cellid_to_process(&hdr->msg_src)) {
|
2005-03-14 23:57:21 +03:00
|
|
|
return;
|
|
|
|
}
|
2004-08-25 21:39:08 +04:00
|
|
|
}
|
|
|
|
|
2004-08-03 01:24:00 +04:00
|
|
|
/* lookup the corresponding process */
|
2005-05-05 20:31:40 +04:00
|
|
|
peer = mca_oob_tcp_peer_lookup(&hdr->msg_src);
|
2004-08-03 01:24:00 +04:00
|
|
|
if(NULL == peer) {
|
2005-07-04 03:31:27 +04:00
|
|
|
opal_output(0, "[%lu,%lu,%lu] mca_oob_tcp_recv_handler: unable to locate peer",
|
2005-03-14 23:57:21 +03:00
|
|
|
ORTE_NAME_ARGS(orte_process_info.my_name));
|
2004-08-03 01:24:00 +04:00
|
|
|
close(sd);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
/* is the peer instance willing to accept this connection */
|
|
|
|
if(mca_oob_tcp_peer_accept(peer, sd) == false) {
|
2005-03-19 02:40:08 +03:00
|
|
|
if(mca_oob_tcp_component.tcp_debug > 0) {
|
2005-07-04 03:31:27 +04:00
|
|
|
opal_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_recv_handler: "
|
2005-05-08 17:22:55 +04:00
|
|
|
"rejected connection from [%lu,%lu,%lu] connection state %d",
|
2005-03-14 23:57:21 +03:00
|
|
|
ORTE_NAME_ARGS(orte_process_info.my_name),
|
|
|
|
ORTE_NAME_ARGS(&(peer->peer_name)),
|
2005-05-05 20:31:40 +04:00
|
|
|
ORTE_NAME_ARGS(&(hdr->msg_src)),
|
2004-09-10 01:57:45 +04:00
|
|
|
peer->peer_state);
|
|
|
|
}
|
2004-08-03 01:24:00 +04:00
|
|
|
close(sd);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-05-05 20:31:40 +04:00
|
|
|
/*
|
|
|
|
* Event callback when there is data available on the registered
|
|
|
|
* socket to recv.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void mca_oob_tcp_recv_handler(int sd, short flags, void* user)
|
|
|
|
{
|
|
|
|
mca_oob_tcp_hdr_t hdr;
|
|
|
|
mca_oob_tcp_event_t* event = (mca_oob_tcp_event_t *)user;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
/* accept new connections on the listen socket */
|
|
|
|
if(mca_oob_tcp_component.tcp_listen_sd == sd) {
|
|
|
|
mca_oob_tcp_accept();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
OBJ_RELEASE(event);
|
|
|
|
|
|
|
|
/* recv the process identifier */
|
|
|
|
while((rc = recv(sd, (char *)&hdr, sizeof(hdr), 0)) != sizeof(hdr)) {
|
|
|
|
if(rc >= 0) {
|
|
|
|
if(mca_oob_tcp_component.tcp_debug > 1) {
|
2005-07-04 03:31:27 +04:00
|
|
|
opal_output(0, "[%lu,%lu,%lu] mca_oob_tcp_recv_handler: peer closed connection",
|
2005-05-05 20:31:40 +04:00
|
|
|
ORTE_NAME_ARGS(orte_process_info.my_name));
|
|
|
|
}
|
|
|
|
close(sd);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if(ompi_socket_errno != EINTR) {
|
2005-09-01 05:07:30 +04:00
|
|
|
opal_output(0, "[%lu,%lu,%lu] mca_oob_tcp_recv_handler: recv() failed with errno=%d\n",
|
2005-05-05 20:31:40 +04:00
|
|
|
ORTE_NAME_ARGS(orte_process_info.my_name), ompi_socket_errno);
|
|
|
|
close(sd);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
MCA_OOB_TCP_HDR_NTOH(&hdr);
|
|
|
|
|
|
|
|
/* dispatch based on message type */
|
|
|
|
switch(hdr.msg_type) {
|
|
|
|
case MCA_OOB_TCP_PROBE:
|
|
|
|
mca_oob_tcp_recv_probe(sd, &hdr);
|
|
|
|
break;
|
|
|
|
case MCA_OOB_TCP_CONNECT:
|
|
|
|
mca_oob_tcp_recv_connect(sd, &hdr);
|
|
|
|
break;
|
|
|
|
default:
|
2005-09-01 05:07:30 +04:00
|
|
|
opal_output(0, "[%lu,%lu,%lu] mca_oob_tcp_recv_handler: invalid message type: %d\n",
|
2005-05-18 19:31:23 +04:00
|
|
|
ORTE_NAME_ARGS(orte_process_info.my_name), hdr.msg_type);
|
2005-05-05 20:31:40 +04:00
|
|
|
close(sd);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-08-03 01:24:00 +04:00
|
|
|
/*
|
2004-08-19 23:34:37 +04:00
|
|
|
* Component initialization - create a module.
|
2004-08-03 01:24:00 +04:00
|
|
|
* (1) initialize static resources
|
|
|
|
* (2) create listen socket
|
|
|
|
*/
|
2005-03-14 23:57:21 +03:00
|
|
|
mca_oob_t* mca_oob_tcp_component_init(int* priority)
|
2004-07-01 18:49:54 +04:00
|
|
|
{
|
2004-08-28 05:15:19 +04:00
|
|
|
*priority = 1;
|
2004-11-02 16:14:34 +03:00
|
|
|
|
2004-10-01 01:23:10 +04:00
|
|
|
/* are there any interfaces? */
|
2005-07-04 05:36:20 +04:00
|
|
|
if(opal_ifcount() == 0)
|
2004-10-01 01:23:10 +04:00
|
|
|
return NULL;
|
|
|
|
|
2004-07-13 02:46:57 +04:00
|
|
|
/* initialize data structures */
|
2005-07-03 20:52:32 +04:00
|
|
|
opal_hash_table_init(&mca_oob_tcp_component.tcp_peers, 128);
|
|
|
|
opal_hash_table_init(&mca_oob_tcp_component.tcp_peer_names, 128);
|
2004-08-03 01:24:00 +04:00
|
|
|
|
2005-07-02 20:46:27 +04:00
|
|
|
opal_free_list_init(&mca_oob_tcp_component.tcp_peer_free,
|
2004-08-03 01:24:00 +04:00
|
|
|
sizeof(mca_oob_tcp_peer_t),
|
|
|
|
OBJ_CLASS(mca_oob_tcp_peer_t),
|
|
|
|
8, /* initial number */
|
|
|
|
mca_oob_tcp_component.tcp_peer_limit, /* maximum number */
|
2005-07-02 20:46:27 +04:00
|
|
|
8); /* increment to grow by */
|
2004-08-03 01:24:00 +04:00
|
|
|
|
2005-07-02 20:46:27 +04:00
|
|
|
opal_free_list_init(&mca_oob_tcp_component.tcp_msgs,
|
2004-08-03 01:24:00 +04:00
|
|
|
sizeof(mca_oob_tcp_msg_t),
|
|
|
|
OBJ_CLASS(mca_oob_tcp_msg_t),
|
|
|
|
8, /* initial number */
|
2004-08-03 02:16:35 +04:00
|
|
|
-1, /* maximum number */
|
2005-07-02 20:46:27 +04:00
|
|
|
8); /* increment to grow by */
|
2004-08-03 01:24:00 +04:00
|
|
|
|
|
|
|
/* intialize event library */
|
2005-07-04 03:09:55 +04:00
|
|
|
memset(&mca_oob_tcp_component.tcp_recv_event, 0, sizeof(opal_event_t));
|
|
|
|
memset(&mca_oob_tcp_component.tcp_send_event, 0, sizeof(opal_event_t));
|
2004-08-03 01:24:00 +04:00
|
|
|
|
|
|
|
/* create a listen socket */
|
|
|
|
if(mca_oob_tcp_create_listen() != OMPI_SUCCESS) {
|
2005-07-04 03:31:27 +04:00
|
|
|
opal_output(0, "mca_oob_tcp_init: unable to create listen socket\n");
|
2004-08-03 01:24:00 +04:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return &mca_oob_tcp;
|
2004-07-01 18:49:54 +04:00
|
|
|
}
|
|
|
|
|
2004-09-02 03:07:40 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Callback from registry on change to subscribed segments.
|
|
|
|
*/
|
|
|
|
|
2004-11-20 22:12:43 +03:00
|
|
|
void mca_oob_tcp_registry_callback(
|
2005-03-14 23:57:21 +03:00
|
|
|
orte_gpr_notify_data_t* data,
|
2004-09-02 03:07:40 +04:00
|
|
|
void* cbdata)
|
|
|
|
{
|
2005-07-18 22:49:00 +04:00
|
|
|
size_t i, j, k;
|
|
|
|
orte_gpr_value_t **values, *value;
|
|
|
|
orte_gpr_keyval_t *keyval;
|
|
|
|
orte_buffer_t buffer;
|
|
|
|
mca_oob_tcp_addr_t* addr, *existing;
|
|
|
|
mca_oob_tcp_peer_t* peer;
|
|
|
|
|
2004-09-02 03:07:40 +04:00
|
|
|
if(mca_oob_tcp_component.tcp_debug > 1) {
|
2005-07-04 03:31:27 +04:00
|
|
|
opal_output(0, "[%lu,%lu,%lu] mca_oob_tcp_registry_callback\n",
|
2005-03-14 23:57:21 +03:00
|
|
|
ORTE_NAME_ARGS(orte_process_info.my_name));
|
2004-09-02 03:07:40 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* process the callback */
|
2005-07-04 02:45:48 +04:00
|
|
|
OPAL_THREAD_LOCK(&mca_oob_tcp_component.tcp_lock);
|
2005-07-18 22:49:00 +04:00
|
|
|
values = (orte_gpr_value_t**)(data->values)->addr;
|
|
|
|
for(i = 0, k=0; k < data->cnt &&
|
|
|
|
i < (data->values)->size; i++) {
|
|
|
|
if (NULL != values[i]) {
|
|
|
|
k++;
|
|
|
|
value = values[i];
|
|
|
|
for(j = 0; j < value->cnt; j++) {
|
2005-09-01 05:07:30 +04:00
|
|
|
|
2005-07-18 22:49:00 +04:00
|
|
|
/* check to make sure this is the requested key */
|
|
|
|
keyval = value->keyvals[j];
|
|
|
|
if(strcmp(keyval->key,"oob-tcp") != 0)
|
|
|
|
continue;
|
2005-09-01 05:07:30 +04:00
|
|
|
|
2005-07-18 22:49:00 +04:00
|
|
|
/* transfer ownership of registry object to buffer and unpack */
|
|
|
|
OBJ_CONSTRUCT(&buffer, orte_buffer_t);
|
2005-09-01 05:07:30 +04:00
|
|
|
if(orte_dps.load(&buffer,
|
|
|
|
keyval->value.byteobject.bytes,
|
2005-07-18 22:49:00 +04:00
|
|
|
keyval->value.byteobject.size) != ORTE_SUCCESS) {
|
|
|
|
/* TSW - throw ERROR */
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
keyval->type = ORTE_NULL;
|
|
|
|
keyval->value.byteobject.bytes = NULL;
|
|
|
|
keyval->value.byteobject.size = 0;
|
|
|
|
addr = mca_oob_tcp_addr_unpack(&buffer);
|
|
|
|
OBJ_DESTRUCT(&buffer);
|
|
|
|
if(NULL == addr) {
|
|
|
|
opal_output(0, "[%lu,%lu,%lu] mca_oob_tcp_registry_callback: unable to unpack peer address\n",
|
|
|
|
ORTE_NAME_ARGS(orte_process_info.my_name));
|
|
|
|
continue;
|
|
|
|
}
|
2005-09-01 05:07:30 +04:00
|
|
|
|
2005-07-18 22:49:00 +04:00
|
|
|
if(mca_oob_tcp_component.tcp_debug > 1) {
|
|
|
|
opal_output(0, "[%lu,%lu,%lu] mca_oob_tcp_registry_callback: received peer [%lu,%lu,%lu]\n",
|
|
|
|
ORTE_NAME_ARGS(orte_process_info.my_name),
|
|
|
|
ORTE_NAME_ARGS(&(addr->addr_name)));
|
|
|
|
}
|
2005-09-01 05:07:30 +04:00
|
|
|
|
2005-07-18 22:49:00 +04:00
|
|
|
/* check for existing cache entry */
|
2005-07-19 16:25:19 +04:00
|
|
|
existing = (mca_oob_tcp_addr_t *)orte_hash_table_get_proc(
|
2005-07-18 22:49:00 +04:00
|
|
|
&mca_oob_tcp_component.tcp_peer_names, &addr->addr_name);
|
|
|
|
if(NULL != existing) {
|
|
|
|
/* TSW - need to update existing entry */
|
|
|
|
OBJ_RELEASE(addr);
|
|
|
|
continue;
|
|
|
|
}
|
2005-09-01 05:07:30 +04:00
|
|
|
|
2005-07-18 22:49:00 +04:00
|
|
|
/* insert into cache and notify peer */
|
2005-07-19 16:25:19 +04:00
|
|
|
orte_hash_table_set_proc(&mca_oob_tcp_component.tcp_peer_names, &addr->addr_name, addr);
|
2005-07-19 17:33:04 +04:00
|
|
|
peer = (mca_oob_tcp_peer_t *)orte_hash_table_get_proc(
|
2005-07-18 22:49:00 +04:00
|
|
|
&mca_oob_tcp_component.tcp_peers, &addr->addr_name);
|
|
|
|
if(NULL != peer)
|
|
|
|
mca_oob_tcp_peer_resolved(peer, addr);
|
2005-03-14 23:57:21 +03:00
|
|
|
}
|
|
|
|
}
|
2004-09-02 03:07:40 +04:00
|
|
|
}
|
2005-07-04 02:45:48 +04:00
|
|
|
OPAL_THREAD_UNLOCK(&mca_oob_tcp_component.tcp_lock);
|
2004-09-02 03:07:40 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Attempt to resolve peer name.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int mca_oob_tcp_resolve(mca_oob_tcp_peer_t* peer)
|
|
|
|
{
|
2005-04-13 01:25:51 +04:00
|
|
|
mca_oob_tcp_addr_t* addr;
|
|
|
|
mca_oob_tcp_subscription_t* subscription;
|
2005-09-01 05:07:30 +04:00
|
|
|
char *segment, *sub_name, *trig_name;
|
|
|
|
char *key="oob-tcp";
|
|
|
|
orte_gpr_subscription_id_t sub_id;
|
2005-07-03 20:22:16 +04:00
|
|
|
opal_list_item_t* item;
|
2005-04-13 01:25:51 +04:00
|
|
|
int rc;
|
2005-09-01 05:07:30 +04:00
|
|
|
|
2005-04-13 01:25:51 +04:00
|
|
|
/* if the address is already cached - simply return it */
|
2005-07-04 02:45:48 +04:00
|
|
|
OPAL_THREAD_LOCK(&mca_oob_tcp_component.tcp_lock);
|
2005-09-01 05:07:30 +04:00
|
|
|
addr = (mca_oob_tcp_addr_t *)orte_hash_table_get_proc(&mca_oob_tcp_component.tcp_peer_names,
|
2005-03-14 23:57:21 +03:00
|
|
|
&peer->peer_name);
|
2005-04-13 01:25:51 +04:00
|
|
|
if(NULL != addr) {
|
2005-07-04 02:45:48 +04:00
|
|
|
OPAL_THREAD_UNLOCK(&mca_oob_tcp_component.tcp_lock);
|
2004-09-02 03:07:40 +04:00
|
|
|
mca_oob_tcp_peer_resolved(peer, addr);
|
|
|
|
return OMPI_SUCCESS;
|
2005-04-13 01:25:51 +04:00
|
|
|
}
|
2004-09-02 03:07:40 +04:00
|
|
|
|
2005-04-13 01:25:51 +04:00
|
|
|
/* check to see if we have subscribed to this registry segment */
|
2005-07-03 20:22:16 +04:00
|
|
|
for( item = opal_list_get_first(&mca_oob_tcp_component.tcp_subscriptions);
|
|
|
|
item != opal_list_get_end(&mca_oob_tcp_component.tcp_subscriptions);
|
|
|
|
item = opal_list_get_next(item)) {
|
2005-04-13 01:25:51 +04:00
|
|
|
subscription = (mca_oob_tcp_subscription_t*)item;
|
|
|
|
if(subscription->jobid == peer->peer_name.jobid) {
|
2005-07-04 02:45:48 +04:00
|
|
|
OPAL_THREAD_UNLOCK(&mca_oob_tcp_component.tcp_lock);
|
2005-04-13 01:25:51 +04:00
|
|
|
return OMPI_SUCCESS;
|
|
|
|
}
|
|
|
|
}
|
2005-09-01 05:07:30 +04:00
|
|
|
|
|
|
|
if (ORTE_SUCCESS != (rc = orte_schema.get_std_subscription_name(&sub_name,
|
2005-06-24 20:59:37 +04:00
|
|
|
OMPI_OOB_SUBSCRIPTION, peer->peer_name.jobid))) {
|
2005-04-13 01:25:51 +04:00
|
|
|
ORTE_ERROR_LOG(rc);
|
2005-03-14 23:57:21 +03:00
|
|
|
return rc;
|
2005-04-13 01:25:51 +04:00
|
|
|
}
|
2005-09-01 05:07:30 +04:00
|
|
|
|
|
|
|
/* attach to the stage-1 standard trigger */
|
|
|
|
if (ORTE_SUCCESS != (rc = orte_schema.get_std_trigger_name(&trig_name,
|
|
|
|
ORTE_STG1_TRIGGER, peer->peer_name.jobid))) {
|
|
|
|
ORTE_ERROR_LOG(rc);
|
|
|
|
free(sub_name);
|
|
|
|
return rc;
|
2005-04-13 01:25:51 +04:00
|
|
|
}
|
2005-09-01 05:07:30 +04:00
|
|
|
|
2005-06-24 20:59:37 +04:00
|
|
|
/* define the segment */
|
2005-09-01 05:07:30 +04:00
|
|
|
if (ORTE_SUCCESS != (rc = orte_schema.get_job_segment_name(&segment,
|
2005-06-24 20:59:37 +04:00
|
|
|
peer->peer_name.jobid))) {
|
2005-04-13 01:25:51 +04:00
|
|
|
ORTE_ERROR_LOG(rc);
|
2005-09-01 05:07:30 +04:00
|
|
|
free(sub_name);
|
|
|
|
free(trig_name);
|
2005-04-13 01:25:51 +04:00
|
|
|
return rc;
|
|
|
|
}
|
2005-06-24 20:59:37 +04:00
|
|
|
|
2005-09-19 19:59:46 +04:00
|
|
|
/* If we do not release the mutex before the subscrition we will deadlock
|
|
|
|
* as the suscription involve oob_tcp_send who involve again a lookup
|
|
|
|
* call. Before unlocking the mutex (just to be protected by it) we can
|
|
|
|
* create the subscription and add it to the list.
|
|
|
|
*/
|
|
|
|
subscription = OBJ_NEW(mca_oob_tcp_subscription_t);
|
|
|
|
subscription->jobid = peer->peer_name.jobid;
|
|
|
|
opal_list_append(&mca_oob_tcp_component.tcp_subscriptions, &subscription->item);
|
|
|
|
|
|
|
|
OPAL_THREAD_UNLOCK(&mca_oob_tcp_component.tcp_lock);
|
2005-09-13 07:52:39 +04:00
|
|
|
if (ORTE_SUCCESS != (rc = orte_gpr.subscribe_1(&sub_id, NULL, NULL,
|
2005-09-01 05:07:30 +04:00
|
|
|
ORTE_GPR_NOTIFY_ADD_ENTRY |
|
|
|
|
ORTE_GPR_NOTIFY_VALUE_CHG |
|
2005-09-13 07:52:39 +04:00
|
|
|
ORTE_GPR_NOTIFY_PRE_EXISTING,
|
2005-09-01 05:07:30 +04:00
|
|
|
ORTE_GPR_KEYS_OR | ORTE_GPR_TOKENS_OR,
|
|
|
|
segment,
|
|
|
|
NULL, /* look at all containers on this segment */
|
|
|
|
key,
|
|
|
|
mca_oob_tcp_registry_callback, NULL))) {
|
2005-06-24 20:59:37 +04:00
|
|
|
ORTE_ERROR_LOG(rc);
|
2005-09-01 05:07:30 +04:00
|
|
|
free(sub_name);
|
|
|
|
free(trig_name);
|
|
|
|
free(segment);
|
2005-09-19 19:59:46 +04:00
|
|
|
/* Subscription registration failed, we should activate the cleaning logic:
|
|
|
|
* remove the subscription from the list (protected by the mutex).
|
|
|
|
*/
|
|
|
|
OPAL_THREAD_LOCK(&mca_oob_tcp_component.tcp_lock);
|
|
|
|
opal_list_remove_item( &mca_oob_tcp_component.tcp_subscriptions,
|
|
|
|
&subscription->item );
|
|
|
|
OPAL_THREAD_UNLOCK(&mca_oob_tcp_component.tcp_lock);
|
2005-06-24 20:59:37 +04:00
|
|
|
return rc;
|
2005-04-13 01:25:51 +04:00
|
|
|
}
|
2005-06-24 20:59:37 +04:00
|
|
|
|
2005-09-01 05:07:30 +04:00
|
|
|
/* the id of each subscription is recorded
|
2005-06-24 20:59:37 +04:00
|
|
|
* here so we can (if desired) cancel that subscription later
|
|
|
|
*/
|
2005-09-01 05:07:30 +04:00
|
|
|
subscription->subid = sub_id;
|
2005-06-24 20:59:37 +04:00
|
|
|
/* done with these, so release any memory */
|
2005-09-01 05:07:30 +04:00
|
|
|
free(trig_name);
|
|
|
|
free(sub_name);
|
|
|
|
free(segment);
|
2005-04-13 01:25:51 +04:00
|
|
|
|
|
|
|
return rc;
|
2004-09-02 03:07:40 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-08-19 23:34:37 +04:00
|
|
|
/*
|
|
|
|
* Setup contact information in the registry.
|
|
|
|
*/
|
|
|
|
int mca_oob_tcp_init(void)
|
|
|
|
{
|
2005-03-14 23:57:21 +03:00
|
|
|
orte_jobid_t jobid;
|
|
|
|
orte_buffer_t *buffer;
|
2005-09-01 05:07:30 +04:00
|
|
|
orte_gpr_subscription_id_t sub_id;
|
|
|
|
char *sub_name, *segment, *trig_name, **tokens;
|
|
|
|
char *keys[] = {"oob-tcp", ORTE_PROC_RML_IP_ADDRESS_KEY};
|
|
|
|
orte_data_type_t types[2];
|
|
|
|
orte_gpr_value_union_t values[2];
|
2005-03-14 23:57:21 +03:00
|
|
|
mca_oob_tcp_subscription_t *subscription;
|
2004-08-19 23:34:37 +04:00
|
|
|
int rc;
|
2005-07-03 20:22:16 +04:00
|
|
|
opal_list_item_t* item;
|
2005-07-18 22:49:00 +04:00
|
|
|
char *tmp, *tmp2, *tmp3;
|
2005-09-01 21:38:04 +04:00
|
|
|
size_t i, num_tokens;
|
2005-03-14 23:57:21 +03:00
|
|
|
|
2005-03-19 02:40:08 +03:00
|
|
|
/* random delay to stagger connections back to seed */
|
2005-04-19 08:38:48 +04:00
|
|
|
#if defined(WIN32)
|
|
|
|
sleep((orte_process_info.my_name->vpid % orte_process_info.num_procs % 1000) * 1000);
|
|
|
|
#else
|
2005-03-19 02:58:36 +03:00
|
|
|
usleep((orte_process_info.my_name->vpid % orte_process_info.num_procs % 1000) * 1000);
|
2005-04-19 08:38:48 +04:00
|
|
|
#endif
|
2005-03-14 23:57:21 +03:00
|
|
|
|
2005-03-19 02:40:08 +03:00
|
|
|
/* get my jobid */
|
2005-09-01 05:07:30 +04:00
|
|
|
if (ORTE_SUCCESS != (rc = orte_ns.get_jobid(&jobid,
|
2005-03-14 23:57:21 +03:00
|
|
|
orte_process_info.my_name))) {
|
|
|
|
ORTE_ERROR_LOG(rc);
|
|
|
|
return rc;
|
|
|
|
}
|
2004-09-02 03:07:40 +04:00
|
|
|
|
|
|
|
/* iterate through the open connections and send an ident message to all peers -
|
|
|
|
* note that we initially come up w/out knowing our process name - and are assigned
|
|
|
|
* a temporary name by our peer. once we have determined our real name - we send it
|
|
|
|
* to the peer.
|
|
|
|
*/
|
2005-07-04 02:45:48 +04:00
|
|
|
OPAL_THREAD_LOCK(&mca_oob_tcp_component.tcp_lock);
|
2005-07-03 20:22:16 +04:00
|
|
|
for(item = opal_list_get_first(&mca_oob_tcp_component.tcp_peer_list);
|
|
|
|
item != opal_list_get_end(&mca_oob_tcp_component.tcp_peer_list);
|
|
|
|
item = opal_list_get_next(item)) {
|
2004-09-02 03:07:40 +04:00
|
|
|
mca_oob_tcp_peer_t* peer = (mca_oob_tcp_peer_t*)item;
|
|
|
|
mca_oob_tcp_peer_send_ident(peer);
|
|
|
|
}
|
|
|
|
|
2004-11-20 22:12:43 +03:00
|
|
|
/* register subscribe callback to receive notification when all processes have registered */
|
2004-09-02 03:07:40 +04:00
|
|
|
subscription = OBJ_NEW(mca_oob_tcp_subscription_t);
|
2005-03-14 23:57:21 +03:00
|
|
|
subscription->jobid = jobid;
|
2005-07-03 20:22:16 +04:00
|
|
|
opal_list_append(&mca_oob_tcp_component.tcp_subscriptions, &subscription->item);
|
2005-07-04 02:45:48 +04:00
|
|
|
OPAL_THREAD_UNLOCK(&mca_oob_tcp_component.tcp_lock);
|
2004-09-02 03:07:40 +04:00
|
|
|
|
2005-03-19 02:40:08 +03:00
|
|
|
if(mca_oob_tcp_component.tcp_debug > 2) {
|
2005-09-01 05:07:30 +04:00
|
|
|
opal_output(0, "[%lu,%lu,%lu] mca_oob_tcp_init: calling orte_gpr.subscribe\n",
|
2005-03-14 23:57:21 +03:00
|
|
|
ORTE_NAME_ARGS(orte_process_info.my_name));
|
2004-09-02 03:07:40 +04:00
|
|
|
}
|
|
|
|
|
2005-09-01 05:07:30 +04:00
|
|
|
if (ORTE_SUCCESS != (rc = orte_schema.get_std_subscription_name(&sub_name,
|
2005-06-24 20:59:37 +04:00
|
|
|
OMPI_OOB_SUBSCRIPTION, jobid))) {
|
2005-03-14 23:57:21 +03:00
|
|
|
ORTE_ERROR_LOG(rc);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2005-09-01 05:07:30 +04:00
|
|
|
/* attach to the stage-1 standard trigger */
|
|
|
|
if (ORTE_SUCCESS != (rc = orte_schema.get_std_trigger_name(&trig_name,
|
|
|
|
ORTE_STG1_TRIGGER, jobid))) {
|
2005-03-14 23:57:21 +03:00
|
|
|
ORTE_ERROR_LOG(rc);
|
2005-09-01 05:07:30 +04:00
|
|
|
free(sub_name);
|
2005-03-14 23:57:21 +03:00
|
|
|
return rc;
|
|
|
|
}
|
2005-06-24 20:59:37 +04:00
|
|
|
|
2005-09-01 05:07:30 +04:00
|
|
|
/* define the segment */
|
|
|
|
if (ORTE_SUCCESS != (rc = orte_schema.get_job_segment_name(&segment, jobid))) {
|
2005-06-24 20:59:37 +04:00
|
|
|
ORTE_ERROR_LOG(rc);
|
2005-09-01 05:07:30 +04:00
|
|
|
free(sub_name);
|
|
|
|
free(trig_name);
|
2005-06-24 20:59:37 +04:00
|
|
|
return rc;
|
2005-03-14 23:57:21 +03:00
|
|
|
}
|
2005-06-24 20:59:37 +04:00
|
|
|
|
2005-09-01 05:07:30 +04:00
|
|
|
if (ORTE_SUCCESS != (rc = orte_gpr.subscribe_1(&sub_id, trig_name, sub_name,
|
|
|
|
ORTE_GPR_NOTIFY_ADD_ENTRY |
|
|
|
|
ORTE_GPR_NOTIFY_VALUE_CHG |
|
|
|
|
ORTE_GPR_NOTIFY_STARTS_AFTER_TRIG,
|
|
|
|
ORTE_GPR_KEYS_OR | ORTE_GPR_TOKENS_OR,
|
|
|
|
segment,
|
|
|
|
NULL, /* look at all containers on this segment */
|
|
|
|
keys[0],
|
|
|
|
mca_oob_tcp_registry_callback, NULL))) {
|
2005-03-14 23:57:21 +03:00
|
|
|
ORTE_ERROR_LOG(rc);
|
2005-09-01 05:07:30 +04:00
|
|
|
free(sub_name);
|
|
|
|
free(trig_name);
|
|
|
|
free(segment);
|
2005-03-14 23:57:21 +03:00
|
|
|
return rc;
|
|
|
|
}
|
2005-09-01 05:07:30 +04:00
|
|
|
/* the id of each subscription is recorded
|
2005-06-24 20:59:37 +04:00
|
|
|
* here so we can (if desired) cancel that subscription later
|
|
|
|
*/
|
2005-09-01 05:07:30 +04:00
|
|
|
subscription->subid = sub_id;
|
2005-06-24 20:59:37 +04:00
|
|
|
/* done with these, so release any memory */
|
2005-09-01 05:07:30 +04:00
|
|
|
free(trig_name);
|
|
|
|
free(sub_name);
|
|
|
|
|
2005-03-14 23:57:21 +03:00
|
|
|
|
2005-09-01 05:07:30 +04:00
|
|
|
/* now setup to put our contact info on registry */
|
2005-03-14 23:57:21 +03:00
|
|
|
buffer = OBJ_NEW(orte_buffer_t);
|
|
|
|
if(buffer == NULL) {
|
2005-07-18 22:49:00 +04:00
|
|
|
ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
|
|
|
|
return ORTE_ERR_OUT_OF_RESOURCE;
|
|
|
|
}
|
2005-09-01 05:07:30 +04:00
|
|
|
if (ORTE_SUCCESS != (rc = mca_oob_tcp_addr_pack(buffer))) {
|
2005-03-14 23:57:21 +03:00
|
|
|
ORTE_ERROR_LOG(rc);
|
2005-09-01 05:07:30 +04:00
|
|
|
OBJ_RELEASE(buffer);
|
2005-03-14 23:57:21 +03:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2005-09-01 05:07:30 +04:00
|
|
|
/* extract payload for storage */
|
|
|
|
types[0] = ORTE_BYTE_OBJECT;
|
|
|
|
if (ORTE_SUCCESS != (rc = orte_dps.unload(buffer, (void**)&(values[0].byteobject.bytes),
|
|
|
|
&(values[0].byteobject.size)))) {
|
2005-03-14 23:57:21 +03:00
|
|
|
ORTE_ERROR_LOG(rc);
|
2005-09-01 05:07:30 +04:00
|
|
|
free(segment);
|
2005-03-14 23:57:21 +03:00
|
|
|
OBJ_RELEASE(buffer);
|
|
|
|
return rc;
|
|
|
|
}
|
2005-09-01 05:07:30 +04:00
|
|
|
OBJ_RELEASE(buffer);
|
2004-08-19 23:34:37 +04:00
|
|
|
|
2005-09-01 05:07:30 +04:00
|
|
|
/* setup the IP address for storage */
|
2005-07-18 22:49:00 +04:00
|
|
|
tmp = mca_oob.oob_get_addr();
|
Add a job_info segment to the system that holds a container for each job. Within each container is a keyval indicating the job state (i.e., all procs at stage1, finalized, etc.). This provides a rough state-of-health for the job.
This required a little fiddling with a number of areas. Biggest problem was that it uncovered a potential for an infinite loop to be created in the registry. If a callback function modified the registry, the registry checked the triggers to see if anything had fired. Well, if the original callback was due to a trigger firing, that condition hadn't changed - so the trigger fired again....which caused the callback to be called, which modified the registry, which checked the triggers, etc. etc.
Triggers are now checked and then "flagged" as being "in process" so that the registry will NOT recheck that trigger until all callbacks have been processed. Tried doing this with subscriptions as well, but that caused a problem - when we release processes from a stagegate, they (at the moment) immediately place data on the registry that should cause a subscription to fire. Unfortunately, the system will just hang if that subscription doesn't get processed. So, I have left the subscription system alone - any callback function that modifies the registry in a fashion that will fire a subscription will indeed fire that subscription. We'll have to see if this causes problems - it shouldn't, but a careless user could lock things up if the callback generates a callback to itself.
Also fixed the code that placed a process' RML contact info on the registry to eliminate the leading '/' from the string.
This commit was SVN r6684.
2005-07-29 18:11:19 +04:00
|
|
|
tmp2 = strrchr(tmp, '/') + 1;
|
2005-07-18 22:49:00 +04:00
|
|
|
tmp3 = strrchr(tmp, ':');
|
2005-07-20 00:12:51 +04:00
|
|
|
if(NULL == tmp2 || NULL == tmp3) {
|
|
|
|
opal_output(0, "[%lu,%lu,%lu] mca_oob_tcp_init: invalid address \'%s\' "
|
2005-09-01 05:07:30 +04:00
|
|
|
"returned for selected oob interfaces.\n",
|
2005-07-20 00:12:51 +04:00
|
|
|
ORTE_NAME_ARGS(orte_process_info.my_name), tmp);
|
|
|
|
ORTE_ERROR_LOG(ORTE_ERROR);
|
2005-09-01 05:07:30 +04:00
|
|
|
free(segment);
|
|
|
|
free(tmp);
|
|
|
|
free(values[0].byteobject.bytes);
|
2005-07-20 00:12:51 +04:00
|
|
|
return ORTE_ERROR;
|
|
|
|
}
|
2005-07-18 22:49:00 +04:00
|
|
|
*tmp3 = '\0';
|
2005-09-01 05:07:30 +04:00
|
|
|
types[1] = ORTE_STRING;
|
|
|
|
values[1].strptr = strdup(tmp2);
|
2005-07-18 22:49:00 +04:00
|
|
|
free(tmp);
|
2004-09-02 03:07:40 +04:00
|
|
|
|
2005-09-01 05:07:30 +04:00
|
|
|
/* get the process tokens */
|
|
|
|
if (ORTE_SUCCESS != (rc = orte_schema.get_proc_tokens(&tokens, &num_tokens,
|
|
|
|
orte_process_info.my_name))) {
|
2005-03-14 23:57:21 +03:00
|
|
|
ORTE_ERROR_LOG(rc);
|
2005-09-01 05:07:30 +04:00
|
|
|
free(segment);
|
|
|
|
free(values[0].byteobject.bytes);
|
|
|
|
free(values[1].strptr);
|
2005-03-14 23:57:21 +03:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2005-09-01 05:07:30 +04:00
|
|
|
/* put our contact info in registry */
|
|
|
|
if (ORTE_SUCCESS != (rc = orte_gpr.put_N(ORTE_GPR_OVERWRITE | ORTE_GPR_TOKENS_XAND,
|
|
|
|
segment, tokens, 2, keys, types, values))) {
|
2005-03-14 23:57:21 +03:00
|
|
|
ORTE_ERROR_LOG(rc);
|
2004-08-19 23:34:37 +04:00
|
|
|
}
|
2005-09-01 05:07:30 +04:00
|
|
|
|
|
|
|
free(segment);
|
2005-09-01 21:38:04 +04:00
|
|
|
for(i=0; i < num_tokens; i++) {
|
|
|
|
free(tokens[i]);
|
|
|
|
tokens[i] = NULL;
|
|
|
|
}
|
|
|
|
if (NULL != tokens) free(tokens);
|
2005-09-01 05:07:30 +04:00
|
|
|
free(values[0].byteobject.bytes);
|
|
|
|
free(values[1].strptr);
|
|
|
|
|
|
|
|
return rc;
|
2004-08-19 23:34:37 +04:00
|
|
|
}
|
2004-07-01 18:49:54 +04:00
|
|
|
|
2004-08-03 01:24:00 +04:00
|
|
|
/*
|
|
|
|
* Module cleanup.
|
|
|
|
*/
|
2004-08-19 23:34:37 +04:00
|
|
|
int mca_oob_tcp_fini(void)
|
2004-07-01 18:49:54 +04:00
|
|
|
{
|
2005-07-03 20:22:16 +04:00
|
|
|
opal_list_item_t *item;
|
2005-07-04 02:45:48 +04:00
|
|
|
OPAL_THREAD_LOCK(&mca_oob_tcp_component.tcp_lock);
|
2005-07-04 03:09:55 +04:00
|
|
|
opal_event_disable(); /* disable event processing */
|
2004-09-30 19:09:29 +04:00
|
|
|
|
2004-08-12 17:29:37 +04:00
|
|
|
/* close listen socket */
|
2004-08-05 23:37:48 +04:00
|
|
|
if (mca_oob_tcp_component.tcp_listen_sd >= 0) {
|
2005-09-01 05:07:30 +04:00
|
|
|
opal_event_del(&mca_oob_tcp_component.tcp_recv_event);
|
2004-09-30 19:09:29 +04:00
|
|
|
close(mca_oob_tcp_component.tcp_listen_sd);
|
|
|
|
mca_oob_tcp_component.tcp_listen_sd = -1;
|
2004-08-05 23:37:48 +04:00
|
|
|
}
|
2004-08-12 17:29:37 +04:00
|
|
|
|
|
|
|
/* cleanup all peers */
|
2005-07-03 20:22:16 +04:00
|
|
|
for(item = opal_list_remove_first(&mca_oob_tcp_component.tcp_peer_list);
|
2004-09-30 19:09:29 +04:00
|
|
|
item != NULL;
|
2005-07-03 20:22:16 +04:00
|
|
|
item = opal_list_remove_first(&mca_oob_tcp_component.tcp_peer_list)) {
|
2004-09-30 19:09:29 +04:00
|
|
|
mca_oob_tcp_peer_t* peer = (mca_oob_tcp_peer_t*)item;
|
|
|
|
MCA_OOB_TCP_PEER_RETURN(peer);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* delete any pending events */
|
2005-07-03 20:22:16 +04:00
|
|
|
for(item = opal_list_remove_first(&mca_oob_tcp_component.tcp_events);
|
2004-09-30 19:09:29 +04:00
|
|
|
item != NULL;
|
2005-07-03 20:22:16 +04:00
|
|
|
item = opal_list_remove_first(&mca_oob_tcp_component.tcp_events)) {
|
2004-09-30 19:09:29 +04:00
|
|
|
mca_oob_tcp_event_t* event = (mca_oob_tcp_event_t*)item;
|
2005-07-04 03:09:55 +04:00
|
|
|
opal_event_del(&event->event);
|
2004-09-30 19:09:29 +04:00
|
|
|
OBJ_RELEASE(event);
|
2004-08-06 21:23:37 +04:00
|
|
|
}
|
2004-09-30 19:09:29 +04:00
|
|
|
|
2005-07-04 03:09:55 +04:00
|
|
|
opal_event_enable();
|
2005-07-04 02:45:48 +04:00
|
|
|
OPAL_THREAD_UNLOCK(&mca_oob_tcp_component.tcp_lock);
|
2004-07-01 18:49:54 +04:00
|
|
|
return OMPI_SUCCESS;
|
|
|
|
}
|
2004-07-13 02:46:57 +04:00
|
|
|
|
2004-09-30 19:09:29 +04:00
|
|
|
|
2004-08-10 03:07:53 +04:00
|
|
|
/*
|
2004-08-05 19:30:36 +04:00
|
|
|
* Compare two process names for equality.
|
|
|
|
*
|
|
|
|
* @param n1 Process name 1.
|
|
|
|
* @param n2 Process name 2.
|
|
|
|
* @return (-1 for n1<n2 0 for equality, 1 for n1>n2)
|
|
|
|
*
|
|
|
|
* Note that the definition of < or > is somewhat arbitrary -
|
|
|
|
* just needs to be consistently applied to maintain an ordering
|
|
|
|
* when process names are used as indices.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
2005-03-14 23:57:21 +03:00
|
|
|
int mca_oob_tcp_process_name_compare(const orte_process_name_t* n1, const orte_process_name_t* n2)
|
2004-08-05 19:30:36 +04:00
|
|
|
{
|
2005-03-14 23:57:21 +03:00
|
|
|
return orte_ns.compare(ORTE_NS_CMP_ALL, n1, n2);
|
2004-08-05 19:30:36 +04:00
|
|
|
}
|
|
|
|
|
2004-08-16 23:39:54 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Return local process address as a URI string.
|
|
|
|
*/
|
|
|
|
|
|
|
|
char* mca_oob_tcp_get_addr(void)
|
|
|
|
{
|
|
|
|
int i;
|
2005-07-04 05:36:20 +04:00
|
|
|
char *contact_info = (char *)malloc((opal_ifcount()+1) * 32);
|
2004-08-16 23:39:54 +04:00
|
|
|
char *ptr = contact_info;
|
|
|
|
*ptr = 0;
|
|
|
|
|
2005-07-04 05:36:20 +04:00
|
|
|
for(i=opal_ifbegin(); i>0; i=opal_ifnext(i)) {
|
2004-08-16 23:39:54 +04:00
|
|
|
struct sockaddr_in addr;
|
2005-01-14 00:44:58 +03:00
|
|
|
char name[32];
|
2005-07-04 05:36:20 +04:00
|
|
|
opal_ifindextoname(i, name, sizeof(name));
|
2005-01-14 00:44:58 +03:00
|
|
|
if (mca_oob_tcp_component.tcp_include != NULL &&
|
|
|
|
strstr(mca_oob_tcp_component.tcp_include,name) == NULL)
|
|
|
|
continue;
|
|
|
|
if (mca_oob_tcp_component.tcp_exclude != NULL &&
|
|
|
|
strstr(mca_oob_tcp_component.tcp_exclude,name) != NULL)
|
|
|
|
continue;
|
2005-07-04 05:36:20 +04:00
|
|
|
opal_ifindextoaddr(i, (struct sockaddr*)&addr, sizeof(addr));
|
|
|
|
if(opal_ifcount() > 1 && addr.sin_addr.s_addr == inet_addr("127.0.0.1"))
|
2004-09-02 03:07:40 +04:00
|
|
|
continue;
|
2004-08-16 23:39:54 +04:00
|
|
|
if(ptr != contact_info) {
|
|
|
|
ptr += sprintf(ptr, ";");
|
|
|
|
}
|
2005-09-01 21:38:04 +04:00
|
|
|
ptr += sprintf(ptr, "tcp://%s:%d", inet_ntoa(addr.sin_addr),
|
|
|
|
ntohs(mca_oob_tcp_component.tcp_listen_port));
|
2004-08-16 23:39:54 +04:00
|
|
|
}
|
|
|
|
return contact_info;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Parse a URI string into an IP address and port number.
|
|
|
|
*/
|
|
|
|
|
2004-08-19 23:34:37 +04:00
|
|
|
int mca_oob_tcp_parse_uri(const char* uri, struct sockaddr_in* inaddr)
|
2004-08-16 23:39:54 +04:00
|
|
|
{
|
|
|
|
char* tmp = strdup(uri);
|
|
|
|
char* ptr = tmp + 6;
|
|
|
|
char* addr = ptr;
|
|
|
|
char* port;
|
|
|
|
if(strncmp(tmp, "tcp://", 6) != 0) {
|
|
|
|
free(tmp);
|
|
|
|
return OMPI_ERR_BAD_PARAM;
|
|
|
|
}
|
|
|
|
|
|
|
|
ptr = strchr(addr, ':');
|
|
|
|
if(NULL == ptr) {
|
|
|
|
free(tmp);
|
|
|
|
return OMPI_ERR_BAD_PARAM;
|
|
|
|
}
|
|
|
|
|
|
|
|
*ptr = '\0';
|
|
|
|
ptr++;
|
|
|
|
port = ptr;
|
|
|
|
|
|
|
|
memset(inaddr, 0, sizeof(inaddr));
|
|
|
|
inaddr->sin_family = AF_INET;
|
|
|
|
inaddr->sin_addr.s_addr = inet_addr(addr);
|
|
|
|
if(inaddr->sin_addr.s_addr == INADDR_ANY) {
|
|
|
|
free(tmp);
|
|
|
|
return OMPI_ERR_BAD_PARAM;
|
|
|
|
}
|
|
|
|
inaddr->sin_port = htons(atoi(port));
|
|
|
|
free(tmp);
|
|
|
|
return OMPI_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
Not as bad as this all may look. Tim and I made a significant change to the way we handle the startup of the oob, the seed, etc. We have made it backwards-compatible so that mpirun2 and singleton operations remain working. We had to adjust the name server and gpr as well, plus the process_info structure.
This also includes a checkpoint update to openmpi.c and ompid.c. I have re-enabled the ompid compile.
This latter raises an important point. The trunk compiles the programs like ompid just fine under Linux. It also does just fine for OSX under the dynamic libraries. However, we are seeing errors when compiling under OSX for the static case - the linker seems to have trouble resolving some variable names, even though linker diagnostics show the variables as being defined. Thus, a warning to Mac users that you may have to locally turn things off if you are trying to do static compiles. We ask, however, that you don't commit those changes that turn things off for everyone else - instead, let's try to figure out why the static compile is having a problem, and let everyone else continue to work.
Thanks
Ralph
This commit was SVN r2534.
2004-09-08 07:59:06 +04:00
|
|
|
* Setup address in the cache. Note that this could be called multiple
|
|
|
|
* times if a given destination exports multiple addresses.
|
2004-08-16 23:39:54 +04:00
|
|
|
*/
|
|
|
|
|
2005-03-14 23:57:21 +03:00
|
|
|
int mca_oob_tcp_set_addr(const orte_process_name_t* name, const char* uri)
|
2004-08-16 23:39:54 +04:00
|
|
|
{
|
|
|
|
struct sockaddr_in inaddr;
|
2004-09-02 03:07:40 +04:00
|
|
|
mca_oob_tcp_addr_t* addr;
|
2005-03-14 23:57:21 +03:00
|
|
|
mca_oob_tcp_peer_t* peer;
|
2004-08-16 23:39:54 +04:00
|
|
|
int rc;
|
|
|
|
if((rc = mca_oob_tcp_parse_uri(uri,&inaddr)) != OMPI_SUCCESS)
|
|
|
|
return rc;
|
|
|
|
|
2005-07-04 02:45:48 +04:00
|
|
|
OPAL_THREAD_LOCK(&mca_oob_tcp_component.tcp_lock);
|
2005-07-19 17:33:04 +04:00
|
|
|
addr = (mca_oob_tcp_addr_t*)orte_hash_table_get_proc(&mca_oob_tcp_component.tcp_peer_names, name);
|
2004-09-02 03:07:40 +04:00
|
|
|
if(NULL == addr) {
|
|
|
|
addr = OBJ_NEW(mca_oob_tcp_addr_t);
|
Not as bad as this all may look. Tim and I made a significant change to the way we handle the startup of the oob, the seed, etc. We have made it backwards-compatible so that mpirun2 and singleton operations remain working. We had to adjust the name server and gpr as well, plus the process_info structure.
This also includes a checkpoint update to openmpi.c and ompid.c. I have re-enabled the ompid compile.
This latter raises an important point. The trunk compiles the programs like ompid just fine under Linux. It also does just fine for OSX under the dynamic libraries. However, we are seeing errors when compiling under OSX for the static case - the linker seems to have trouble resolving some variable names, even though linker diagnostics show the variables as being defined. Thus, a warning to Mac users that you may have to locally turn things off if you are trying to do static compiles. We ask, however, that you don't commit those changes that turn things off for everyone else - instead, let's try to figure out why the static compile is having a problem, and let everyone else continue to work.
Thanks
Ralph
This commit was SVN r2534.
2004-09-08 07:59:06 +04:00
|
|
|
addr->addr_name = *name;
|
2005-07-19 17:33:04 +04:00
|
|
|
orte_hash_table_set_proc(&mca_oob_tcp_component.tcp_peer_names, &addr->addr_name, addr);
|
2004-08-16 23:39:54 +04:00
|
|
|
}
|
2004-09-02 03:07:40 +04:00
|
|
|
rc = mca_oob_tcp_addr_insert(addr, &inaddr);
|
2005-07-19 17:33:04 +04:00
|
|
|
peer = (mca_oob_tcp_peer_t *)orte_hash_table_get_proc(
|
2005-03-14 23:57:21 +03:00
|
|
|
&mca_oob_tcp_component.tcp_peers, &addr->addr_name);
|
|
|
|
if(NULL != peer) {
|
|
|
|
mca_oob_tcp_peer_resolved(peer, addr);
|
|
|
|
}
|
2005-07-04 02:45:48 +04:00
|
|
|
OPAL_THREAD_UNLOCK(&mca_oob_tcp_component.tcp_lock);
|
2004-09-02 03:07:40 +04:00
|
|
|
return rc;
|
2004-08-16 23:39:54 +04:00
|
|
|
}
|
|
|
|
|