fceabb2498
This is a fairly intrusive change, but outside of the moving of opal/event to opal/mca/event, the only changes involved (a) changing all calls to opal_event functions to reflect the new framework instead, and (b) ensuring that all opal_event_t objects are properly constructed since they are now true opal_objects. Note: Shiqing has just returned from vacation and has not yet had a chance to complete the Windows integration. Thus, this commit almost certainly breaks Windows support on the trunk. However, I want this to have a chance to soak for as long as possible before I become less available a week from today (going to be at a class for 5 days, and thus will only be sparingly available) so we can find and fix any problems. Biggest change is moving the libevent code from opal/event to a new opal/mca/event framework. This was done to make it much easier to update libevent in the future. New versions can be inserted as a new component and tested in parallel with the current version until validated, then we can remove the earlier version if we so choose. This is a statically built framework ala installdirs, so only one component will build at a time. There is no selection logic - the sole compiled component simply loads its function pointers into the opal_event struct. I have gone thru the code base and converted all the libevent calls I could find. However, I cannot compile nor test every environment. It is therefore quite likely that errors remain in the system. Please keep an eye open for two things: 1. compile-time errors: these will be obvious as calls to the old functions (e.g., opal_evtimer_new) must be replaced by the new framework APIs (e.g., opal_event.evtimer_new) 2. run-time errors: these will likely show up as segfaults due to missing constructors on opal_event_t objects. It appears that it became a typical practice for people to "init" an opal_event_t by simply using memset to zero it out. This will no longer work - you must either OBJ_NEW or OBJ_CONSTRUCT an opal_event_t. I tried to catch these cases, but may have missed some. Believe me, you'll know when you hit it. There is also the issue of the new libevent "no recursion" behavior. As I described on a recent email, we will have to discuss this and figure out what, if anything, we need to do. This commit was SVN r23925.
166 строки
5.2 KiB
C
166 строки
5.2 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$
|
|
*/
|
|
/** @file:
|
|
*
|
|
* Contains the data structure which describes each connection
|
|
*/
|
|
|
|
#ifndef _MCA_OOB_TCP_PEER_H_
|
|
#define _MCA_OOB_TCP_PEER_H_
|
|
|
|
#include "orte_config.h"
|
|
#include "orte/types.h"
|
|
|
|
#ifdef HAVE_NETINET_IN_H
|
|
#include <netinet/in.h>
|
|
#endif
|
|
#include <string.h>
|
|
|
|
#include "opal/class/opal_list.h"
|
|
#include "opal/threads/mutex.h"
|
|
#include "opal/mca/event/event.h"
|
|
|
|
#include "oob_tcp_msg.h"
|
|
#include "oob_tcp_addr.h"
|
|
|
|
BEGIN_C_DECLS
|
|
|
|
/**
|
|
* the state of the connection
|
|
*/
|
|
typedef enum {
|
|
MCA_OOB_TCP_CLOSED,
|
|
MCA_OOB_TCP_RESOLVE,
|
|
MCA_OOB_TCP_CONNECTING,
|
|
MCA_OOB_TCP_CONNECT_ACK,
|
|
MCA_OOB_TCP_CONNECTED,
|
|
MCA_OOB_TCP_FAILED
|
|
} mca_oob_tcp_state_t;
|
|
|
|
|
|
/**
|
|
* This structure describes a peer
|
|
*/
|
|
struct mca_oob_tcp_peer_t {
|
|
opal_free_list_item_t super; /**< allow this to be on a list */
|
|
orte_process_name_t peer_name; /**< the name of the peer */
|
|
mca_oob_tcp_state_t peer_state; /**< the state of the connection */
|
|
int peer_retries; /**< number of times connection attempt has failed */
|
|
mca_oob_tcp_addr_t* peer_addr; /**< the addresses of the peer process */
|
|
int peer_sd; /**< socket descriptor of the connection */
|
|
uint16_t peer_current_af; /**< currently connecting af */
|
|
opal_event_t peer_send_event; /**< registration with event thread for send events */
|
|
opal_event_t peer_recv_event; /**< registration with event thread for recv events */
|
|
opal_event_t peer_timer_event; /**< timer for retrying connection failures */
|
|
opal_mutex_t peer_lock; /**< protect critical data structures */
|
|
opal_list_t peer_send_queue; /**< list of messages to send */
|
|
mca_oob_tcp_msg_t *peer_send_msg; /**< current send in progress */
|
|
mca_oob_tcp_msg_t *peer_recv_msg; /**< current recv in progress */
|
|
};
|
|
/**
|
|
* Convenience Typedef
|
|
*/
|
|
typedef struct mca_oob_tcp_peer_t mca_oob_tcp_peer_t;
|
|
|
|
/**
|
|
* Get a new peer data structure
|
|
*/
|
|
#define MCA_OOB_TCP_PEER_ALLOC(peer, rc) \
|
|
{ \
|
|
opal_free_list_item_t* item; \
|
|
OPAL_FREE_LIST_GET(&mca_oob_tcp_component.tcp_peer_free, item, rc); \
|
|
peer = (mca_oob_tcp_peer_t*)item; \
|
|
}
|
|
|
|
/**
|
|
* Return a peer data structure
|
|
*/
|
|
#define MCA_OOB_TCP_PEER_RETURN(peer) \
|
|
{ \
|
|
mca_oob_tcp_peer_shutdown(peer); \
|
|
opal_hash_table_remove_value_uint64(&mca_oob_tcp_component.tcp_peers, orte_util_hash_name(&peer->peer_name)); \
|
|
OPAL_FREE_LIST_RETURN(&mca_oob_tcp_component.tcp_peer_free, \
|
|
&peer->super); \
|
|
}
|
|
|
|
/*
|
|
* Class declaration.
|
|
*/
|
|
|
|
OBJ_CLASS_DECLARATION(mca_oob_tcp_peer_t);
|
|
|
|
/**
|
|
* Lookup a peer in the cache - if it doesn't exists
|
|
* create one and cache it.
|
|
*
|
|
* @param peer_name the name of the peer
|
|
* @retval pointer to the peer's (possibly newly created) struture
|
|
* @retval NULL if there was a problem
|
|
*/
|
|
mca_oob_tcp_peer_t *mca_oob_tcp_peer_lookup(const orte_process_name_t* peer_name);
|
|
|
|
/**
|
|
* Start sending a message to the specified peer. The routine
|
|
* can return before the send completes.
|
|
*
|
|
* @param peer The peer process.
|
|
* @param msg The message to send.
|
|
* @retval ORTE_SUCCESS or error code on failure.
|
|
*/
|
|
int mca_oob_tcp_peer_send(mca_oob_tcp_peer_t* peer, mca_oob_tcp_msg_t* msg);
|
|
|
|
/**
|
|
* Connection request for this peer. Check the status of our connection
|
|
* before accepting the peers.
|
|
*
|
|
* @param peer The peer process.
|
|
* @param sd Incoming connection request.
|
|
*/
|
|
bool mca_oob_tcp_peer_accept(mca_oob_tcp_peer_t* peer, int sd);
|
|
|
|
/**
|
|
* Cleanup/close the connection to the peer.
|
|
*
|
|
* @param peer The peer process.
|
|
*/
|
|
void mca_oob_tcp_peer_close(mca_oob_tcp_peer_t* peer);
|
|
void mca_oob_tcp_peer_shutdown(mca_oob_tcp_peer_t* peer);
|
|
|
|
/**
|
|
* The peers address has been resolved.
|
|
*/
|
|
void mca_oob_tcp_peer_resolved(mca_oob_tcp_peer_t* peer, mca_oob_tcp_addr_t* addr);
|
|
|
|
/*
|
|
* Send the process identifier to the peer - so that
|
|
* temporary names can be updated to actuals.
|
|
*/
|
|
int mca_oob_tcp_peer_send_ident(mca_oob_tcp_peer_t* peer);
|
|
|
|
/*
|
|
* Remove any references to the message from the peers send/recv queue.
|
|
*/
|
|
void mca_oob_tcp_peer_dequeue_msg(mca_oob_tcp_peer_t* peer, mca_oob_tcp_msg_t* msg);
|
|
|
|
void mca_oob_tcp_peer_dump(mca_oob_tcp_peer_t* peer, const char* msg);
|
|
|
|
END_C_DECLS
|
|
|
|
#endif /* _MCA_OOB_TCP_PEER_H */
|
|
|