X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Finclude%2Flnet%2Fapi.h;h=ca04543a1cb8b60da31f24c26d6f0df352d2d254;hb=3b8f253c10759027d37d45cf6e961f77fc9c0f81;hp=77afdd3fa9d9627fc9bc929f9c5ced2b19ce9d10;hpb=70616605dd44be37068f4e1a4745a2f8b90eb1f5;p=fs%2Flustre-release.git diff --git a/lnet/include/lnet/api.h b/lnet/include/lnet/api.h index 77afdd3..ca04543 100644 --- a/lnet/include/lnet/api.h +++ b/lnet/include/lnet/api.h @@ -27,7 +27,6 @@ */ /* * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. */ #ifndef __LNET_API_H__ @@ -75,10 +74,10 @@ int LNetNIFini(void); * * \see LNetMEAttach * @{ */ -int LNetGetId(unsigned int index, struct lnet_process_id *id); -int LNetDist(lnet_nid_t nid, lnet_nid_t *srcnid, __u32 *order); -lnet_nid_t LNetPrimaryNID(lnet_nid_t nid); -bool LNetIsPeerLocal(lnet_nid_t nid); +int LNetGetId(unsigned int index, struct lnet_processid *id); +int LNetDist(struct lnet_nid *nid, struct lnet_nid *srcnid, __u32 *order); +void LNetPrimaryNID(struct lnet_nid *nid); +bool LNetIsPeerLocal(struct lnet_nid *nid); /** @} lnet_addr */ @@ -92,26 +91,16 @@ bool LNetIsPeerLocal(lnet_nid_t nid); * list is a chain of MEs. Each ME includes a pointer to a memory descriptor * and a set of match criteria. The match criteria can be used to reject * incoming requests based on process ID or the match bits provided in the - * request. MEs can be dynamically inserted into a match list by LNetMEAttach() - * and LNetMEInsert(), and removed from its list by LNetMEUnlink(). + * request. MEs can be dynamically inserted into a match list by LNetMEAttach(), + * and must then be attached to an MD with LNetMDAttach(). * @{ */ -int LNetMEAttach(unsigned int portal, - struct lnet_process_id match_id_in, - __u64 match_bits_in, - __u64 ignore_bits_in, - enum lnet_unlink unlink_in, - enum lnet_ins_pos pos_in, - struct lnet_handle_me *handle_out); - -int LNetMEInsert(struct lnet_handle_me current_in, - struct lnet_process_id match_id_in, - __u64 match_bits_in, - __u64 ignore_bits_in, - enum lnet_unlink unlink_in, - enum lnet_ins_pos position_in, - struct lnet_handle_me *handle_out); - -int LNetMEUnlink(struct lnet_handle_me current_in); +struct lnet_me * +LNetMEAttach(unsigned int portal, + struct lnet_processid *match_id_in, + __u64 match_bits_in, + __u64 ignore_bits_in, + enum lnet_unlink unlink_in, + enum lnet_ins_pos pos_in); /** @} lnet_me */ /** \defgroup lnet_md Memory descriptors @@ -126,80 +115,42 @@ int LNetMEUnlink(struct lnet_handle_me current_in); * and LNetMDBind(); one operation to unlink and release the resources * associated with a MD: LNetMDUnlink(). * @{ */ -int LNetMDAttach(struct lnet_handle_me current_in, - struct lnet_md md_in, - enum lnet_unlink unlink_in, +int LNetMDAttach(struct lnet_me *current_in, + const struct lnet_md *md_in, + enum lnet_unlink unlink_in, struct lnet_handle_md *md_handle_out); -int LNetMDBind(struct lnet_md md_in, +int LNetMDBind(const struct lnet_md *md_in, enum lnet_unlink unlink_in, struct lnet_handle_md *md_handle_out); -int LNetMDUnlink(struct lnet_handle_md md_in); -/** @} lnet_md */ - -/** \defgroup lnet_eq Events and event queues - * - * Event queues (abbreviated as EQ) are used to log operations performed on - * local MDs. In particular, they signal the completion of a data transmission - * into or out of a MD. They can also be used to hold acknowledgments for - * completed PUT operations and indicate when a MD has been unlinked. Multiple - * MDs can share a single EQ. An EQ may have an optional event handler - * associated with it. If an event handler exists, it will be run for each - * event that is deposited into the EQ. - * - * In addition to the struct lnet_handle_eq, the LNet API defines two types - * associated with events: The ::lnet_event_kind defines the kinds of events - * that can be stored in an EQ. The struct lnet_event defines a structure that - * holds the information about with an event. - * - * There are five functions for dealing with EQs: LNetEQAlloc() is used to - * create an EQ and allocate the resources needed, while LNetEQFree() - * releases these resources and free the EQ. LNetEQGet() retrieves the next - * event from an EQ, and LNetEQWait() can be used to block a process until - * an EQ has at least one event. LNetEQPoll() can be used to test or wait - * on multiple EQs. - * @{ */ -int LNetEQAlloc(unsigned int count_in, - lnet_eq_handler_t handler, - struct lnet_handle_eq *handle_out); - -int LNetEQFree(struct lnet_handle_eq eventq_in); +int __LNetMDUnlink(struct lnet_handle_md md_in, bool discard); +#define LNetMDUnlink(handle) __LNetMDUnlink(handle, false) -int LNetEQGet(struct lnet_handle_eq eventq_in, - struct lnet_event *event_out); - -int LNetEQWait(struct lnet_handle_eq eventq_in, - struct lnet_event *event_out); - -int LNetEQPoll(struct lnet_handle_eq *eventqs_in, - int neq_in, - signed long timeout, - struct lnet_event *event_out, - int *which_eq_out); -/** @} lnet_eq */ +void lnet_assert_handler_unused(lnet_handler_t handler); +/** @} lnet_md */ /** \defgroup lnet_data Data movement operations * * The LNet API provides two data movement operations: LNetPut() * and LNetGet(). * @{ */ -int LNetPut(lnet_nid_t self, - struct lnet_handle_md md_in, - enum lnet_ack_req ack_req_in, - struct lnet_process_id target_in, - unsigned int portal_in, - __u64 match_bits_in, - unsigned int offset_in, - __u64 hdr_data_in); - -int LNetGet(lnet_nid_t self, - struct lnet_handle_md md_in, - struct lnet_process_id target_in, - unsigned int portal_in, - __u64 match_bits_in, - unsigned int offset_in, - bool recovery); +int LNetPut(struct lnet_nid *self, + struct lnet_handle_md md_in, + enum lnet_ack_req ack_req_in, + struct lnet_processid *target_in, + unsigned int portal_in, + __u64 match_bits_in, + unsigned int offset_in, + __u64 hdr_data_in); + +int LNetGet(struct lnet_nid *self, + struct lnet_handle_md md_in, + struct lnet_processid *target_in, + unsigned int portal_in, + __u64 match_bits_in, + unsigned int offset_in, + bool recovery); /** @} lnet_data */ @@ -210,7 +161,9 @@ int LNetGet(lnet_nid_t self, int LNetSetLazyPortal(int portal); int LNetClearLazyPortal(int portal); int LNetCtl(unsigned int cmd, void *arg); -void LNetDebugPeer(struct lnet_process_id id); +void LNetDebugPeer(struct lnet_processid *id); +int LNetGetPeerDiscoveryStatus(void); +int LNetAddPeer(lnet_nid_t *nids, __u32 num_nids); /** @} lnet_misc */