From 7cd6e7593d5b5f35a6397ba7af917ac5628434b5 Mon Sep 17 00:00:00 2001 From: liangzhen Date: Wed, 17 Aug 2005 14:16:06 +0000 Subject: [PATCH] Portals -> LNet: rename Ptl_* APIs to LNet_* --- lnet/include/lnet/api.h | 61 +++++++++++++++------------------ lnet/include/lnet/lib-types.h | 10 +++--- lnet/include/lnet/types.h | 2 +- lnet/lnet/api-ni.c | 28 +++++++-------- lnet/lnet/lib-eq.c | 14 ++++---- lnet/lnet/lib-md.c | 80 +++---------------------------------------- lnet/lnet/lib-me.c | 6 ++-- lnet/lnet/lib-move.c | 8 ++--- lnet/lnet/module.c | 54 ++++++++++++++--------------- lnet/tests/ping_cli.c | 46 ++++++++++++------------- lnet/tests/ping_srv.c | 46 ++++++++++++------------- lnet/tests/sping_cli.c | 42 +++++++++++------------ lnet/tests/sping_srv.c | 46 ++++++++++++------------- 13 files changed, 183 insertions(+), 260 deletions(-) diff --git a/lnet/include/lnet/api.h b/lnet/include/lnet/api.h index 5de6d2a..6a455fe 100644 --- a/lnet/include/lnet/api.h +++ b/lnet/include/lnet/api.h @@ -5,60 +5,60 @@ #include -ptl_err_t PtlInit(int *); +ptl_err_t LNetInit(int *); -void PtlFini(void); +void LNetFini(void); -ptl_err_t PtlNIInit(ptl_interface_t interface, +ptl_err_t LNetNIInit(ptl_interface_t interface, ptl_pid_t requested_pid, ptl_ni_limits_t *desired_limits, ptl_ni_limits_t *actual_limits, ptl_handle_ni_t *interface_out); -ptl_err_t PtlNIInitialized(ptl_interface_t); +ptl_err_t LNetNIInitialized(ptl_interface_t); -ptl_err_t PtlNIFini(ptl_handle_ni_t interface_in); +ptl_err_t LNetNIFini(ptl_handle_ni_t interface_in); -ptl_err_t PtlGetId(ptl_handle_ni_t ni_handle, +ptl_err_t LNetGetId(ptl_handle_ni_t ni_handle, ptl_process_id_t *id); -ptl_err_t PtlGetUid(ptl_handle_ni_t ni_handle, +ptl_err_t LNetGetUid(ptl_handle_ni_t ni_handle, ptl_uid_t *uid); /* * Network interfaces */ -ptl_err_t PtlNIStatus(ptl_handle_ni_t interface_in, +ptl_err_t LNetNIStatus(ptl_handle_ni_t interface_in, ptl_sr_index_t register_in, ptl_sr_value_t *status_out); -ptl_err_t PtlNIDist(ptl_handle_ni_t interface_in, +ptl_err_t LNetNIDist(ptl_handle_ni_t interface_in, ptl_process_id_t process_in, unsigned long *distance_out); -ptl_err_t PtlNIHandle(ptl_handle_any_t handle_in, +ptl_err_t LNetNIHandle(ptl_handle_any_t handle_in, ptl_handle_ni_t *interface_out); /* - * PtlFailNid + * LNetFailNid * * Not an official Portals 3 API call. It provides a way of calling * network-specific functions */ -int PtlNICtl(ptl_handle_ni_t interface, unsigned int cmd, void *arg); +int LNetNICtl(ptl_handle_ni_t interface, unsigned int cmd, void *arg); /* - * PtlSnprintHandle: + * LNetSnprintHandle: * * This is not an official Portals 3 API call. It is provided * so that an application can print an opaque handle. */ -void PtlSnprintHandle (char *str, int str_len, ptl_handle_any_t handle); +void LNetSnprintHandle (char *str, int str_len, ptl_handle_any_t handle); /* * Match entries */ -ptl_err_t PtlMEAttach(ptl_handle_ni_t interface_in, +ptl_err_t LNetMEAttach(ptl_handle_ni_t interface_in, ptl_pt_index_t index_in, ptl_process_id_t match_id_in, ptl_match_bits_t match_bits_in, @@ -67,7 +67,7 @@ ptl_err_t PtlMEAttach(ptl_handle_ni_t interface_in, ptl_ins_pos_t pos_in, ptl_handle_me_t *handle_out); -ptl_err_t PtlMEInsert(ptl_handle_me_t current_in, +ptl_err_t LNetMEInsert(ptl_handle_me_t current_in, ptl_process_id_t match_id_in, ptl_match_bits_t match_bits_in, ptl_match_bits_t ignore_bits_in, @@ -75,46 +75,41 @@ ptl_err_t PtlMEInsert(ptl_handle_me_t current_in, ptl_ins_pos_t position_in, ptl_handle_me_t *handle_out); -ptl_err_t PtlMEUnlink(ptl_handle_me_t current_in); +ptl_err_t LNetMEUnlink(ptl_handle_me_t current_in); /* * Memory descriptors */ -ptl_err_t PtlMDAttach(ptl_handle_me_t current_in, +ptl_err_t LNetMDAttach(ptl_handle_me_t current_in, ptl_md_t md_in, ptl_unlink_t unlink_in, ptl_handle_md_t *handle_out); -ptl_err_t PtlMDBind(ptl_handle_ni_t ni_in, +ptl_err_t LNetMDBind(ptl_handle_ni_t ni_in, ptl_md_t md_in, ptl_unlink_t unlink_in, ptl_handle_md_t *handle_out); -ptl_err_t PtlMDUnlink(ptl_handle_md_t md_in); - -ptl_err_t PtlMDUpdate(ptl_handle_md_t md_in, - ptl_md_t *old_inout, - ptl_md_t *new_inout, - ptl_handle_eq_t testq_in); +ptl_err_t LNetMDUnlink(ptl_handle_md_t md_in); /* * Event queues */ -ptl_err_t PtlEQAlloc(ptl_handle_ni_t ni_in, +ptl_err_t LNetEQAlloc(ptl_handle_ni_t ni_in, ptl_size_t count_in, ptl_eq_handler_t handler, ptl_handle_eq_t *handle_out); -ptl_err_t PtlEQFree(ptl_handle_eq_t eventq_in); +ptl_err_t LNetEQFree(ptl_handle_eq_t eventq_in); -ptl_err_t PtlEQGet(ptl_handle_eq_t eventq_in, +ptl_err_t LNetEQGet(ptl_handle_eq_t eventq_in, ptl_event_t *event_out); -ptl_err_t PtlEQWait(ptl_handle_eq_t eventq_in, +ptl_err_t LNetEQWait(ptl_handle_eq_t eventq_in, ptl_event_t *event_out); -ptl_err_t PtlEQPoll(ptl_handle_eq_t *eventqs_in, +ptl_err_t LNetEQPoll(ptl_handle_eq_t *eventqs_in, int neq_in, int timeout_ms, ptl_event_t *event_out, @@ -123,7 +118,7 @@ ptl_err_t PtlEQPoll(ptl_handle_eq_t *eventqs_in, /* * Access Control Table */ -ptl_err_t PtlACEntry(ptl_handle_ni_t ni_in, +ptl_err_t LNetACEntry(ptl_handle_ni_t ni_in, ptl_ac_index_t index_in, ptl_process_id_t match_id_in, ptl_pt_index_t portal_in); @@ -132,7 +127,7 @@ ptl_err_t PtlACEntry(ptl_handle_ni_t ni_in, /* * Data movement */ -ptl_err_t PtlPut(ptl_handle_md_t md_in, +ptl_err_t LNetPut(ptl_handle_md_t md_in, ptl_ack_req_t ack_req_in, ptl_process_id_t target_in, ptl_pt_index_t portal_in, @@ -141,7 +136,7 @@ ptl_err_t PtlPut(ptl_handle_md_t md_in, ptl_size_t offset_in, ptl_hdr_data_t hdr_data_in); -ptl_err_t PtlGet(ptl_handle_md_t md_in, +ptl_err_t LNetGet(ptl_handle_md_t md_in, ptl_process_id_t target_in, ptl_pt_index_t portal_in, ptl_ac_index_t cookie_in, diff --git a/lnet/include/lnet/lib-types.h b/lnet/include/lnet/lib-types.h index 710fcb6..b745c24 100644 --- a/lnet/include/lnet/lib-types.h +++ b/lnet/include/lnet/lib-types.h @@ -362,10 +362,10 @@ typedef struct /* loopback descriptor */ typedef struct { - /* Stuff initialised at PtlInit() */ - int apini_init; /* PtlInit() called? */ - int apini_refcount; /* PtlNIInit/PtlNIFini counter */ - int apini_niinit_self; /* Have I called PtlNIInit myself? */ + /* Stuff initialised at LNetInit() */ + int apini_init; /* LNetInit() called? */ + int apini_refcount; /* LNetNIInit/LNetNIFini counter */ + int apini_niinit_self; /* Have I called LNetNIInit myself? */ struct list_head apini_nals; /* registered NALs */ @@ -381,7 +381,7 @@ typedef struct pthread_mutex_t apini_nal_mutex; #endif - /* Stuff initialised at PtlNIInit() */ + /* Stuff initialised at LNetNIInit() */ int apini_nportals; /* # portals */ struct list_head *apini_portals; /* the vector of portals */ diff --git a/lnet/include/lnet/types.h b/lnet/include/lnet/types.h index f1284c7..6059ca3 100644 --- a/lnet/include/lnet/types.h +++ b/lnet/include/lnet/types.h @@ -37,7 +37,7 @@ typedef ptl_handle_any_t ptl_handle_me_t; ((const ptl_handle_any_t){.cookie = -1}) #define PTL_EQ_NONE PTL_INVALID_HANDLE -static inline int PtlHandleIsEqual (ptl_handle_any_t h1, ptl_handle_any_t h2) +static inline int LNetHandleIsEqual (ptl_handle_any_t h1, ptl_handle_any_t h2) { return (h1.cookie == h2.cookie); } diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c index 5fc44e5..b7ad1cc 100644 --- a/lnet/lnet/api-ni.c +++ b/lnet/lnet/api-ni.c @@ -454,7 +454,7 @@ ptl_apini_init(ptl_pid_t requested_pid, ptl_apini.apini_actual_limits.max_md_iovecs = PTL_MD_MAX_IOV; ptl_apini.apini_actual_limits.max_me_list = INT_MAX; - /* We don't support PtlGetPut! */ + /* We don't support LNetGetPut! */ ptl_apini.apini_actual_limits.max_getput_md = 0; if (actual_limits != NULL) @@ -798,7 +798,7 @@ extern ptl_nal_t tcpnal_nal; #endif ptl_err_t -PtlInit(int *max_interfaces) +LNetInit(int *max_interfaces) { LASSERT(!strcmp(ptl_err_str[PTL_MAX_ERRNO], "PTL_MAX_ERRNO")); ptl_assert_wire_constants (); @@ -838,7 +838,7 @@ PtlInit(int *max_interfaces) } void -PtlFini(void) +LNetFini(void) { LASSERT (ptl_apini.apini_init); LASSERT (ptl_apini.apini_refcount == 0); @@ -855,7 +855,7 @@ PtlFini(void) } ptl_err_t -PtlNIInit(ptl_interface_t interface, ptl_pid_t requested_pid, +LNetNIInit(ptl_interface_t interface, ptl_pid_t requested_pid, ptl_ni_limits_t *requested_limits, ptl_ni_limits_t *actual_limits, ptl_handle_ni_t *handle) { @@ -900,7 +900,7 @@ PtlNIInit(ptl_interface_t interface, ptl_pid_t requested_pid, ptl_apini.apini_refcount = 1; memset (handle, 0, sizeof(*handle)); - LASSERT (!PtlHandleIsEqual(*handle, PTL_INVALID_HANDLE)); + LASSERT (!LNetHandleIsEqual(*handle, PTL_INVALID_HANDLE)); /* Handle can be anything; PTL_INVALID_HANDLE isn't wise though :) */ out: @@ -909,7 +909,7 @@ PtlNIInit(ptl_interface_t interface, ptl_pid_t requested_pid, } ptl_err_t -PtlNIFini(ptl_handle_ni_t ni) +LNetNIFini(ptl_handle_ni_t ni) { PTL_MUTEX_DOWN(&ptl_apini.apini_api_mutex); @@ -929,7 +929,7 @@ PtlNIFini(ptl_handle_ni_t ni) } int -PtlNICtl(ptl_handle_ni_t nih, unsigned int cmd, void *arg) +LNetNICtl(ptl_handle_ni_t nih, unsigned int cmd, void *arg) { struct portal_ioctl_data *data = arg; struct list_head *tmp; @@ -986,7 +986,7 @@ PtlNICtl(ptl_handle_ni_t nih, unsigned int cmd, void *arg) } ptl_err_t -PtlGetId(ptl_handle_ni_t ni_handle, ptl_process_id_t *id) +LNetGetId(ptl_handle_ni_t ni_handle, ptl_process_id_t *id) { ptl_ni_t *ni; unsigned long flags; @@ -1018,7 +1018,7 @@ PtlGetId(ptl_handle_ni_t ni_handle, ptl_process_id_t *id) } ptl_err_t -PtlNIHandle(ptl_handle_any_t handle_in, ptl_handle_ni_t *ni_out) +LNetNIHandle(ptl_handle_any_t handle_in, ptl_handle_ni_t *ni_out) { LASSERT (ptl_apini.apini_init); LASSERT (ptl_apini.apini_refcount > 0); @@ -1028,13 +1028,13 @@ PtlNIHandle(ptl_handle_any_t handle_in, ptl_handle_ni_t *ni_out) } void -PtlSnprintHandle(char *str, int len, ptl_handle_any_t h) +LNetSnprintHandle(char *str, int len, ptl_handle_any_t h) { snprintf(str, len, LPX64, h.cookie); } ptl_err_t -PtlGetUid(ptl_handle_ni_t ni_handle, ptl_uid_t *uid) +LNetGetUid(ptl_handle_ni_t ni_handle, ptl_uid_t *uid) { LASSERT (ptl_apini.apini_init); LASSERT (ptl_apini.apini_refcount > 0); @@ -1044,7 +1044,7 @@ PtlGetUid(ptl_handle_ni_t ni_handle, ptl_uid_t *uid) } ptl_err_t -PtlNIDist(ptl_handle_ni_t interface_in, ptl_process_id_t process_in, +LNetNIDist(ptl_handle_ni_t interface_in, ptl_process_id_t process_in, unsigned long *distance_out) { LASSERT (ptl_apini.apini_init); @@ -1054,7 +1054,7 @@ PtlNIDist(ptl_handle_ni_t interface_in, ptl_process_id_t process_in, } ptl_err_t -PtlNIStatus(ptl_handle_ni_t interface_in, ptl_sr_index_t register_in, +LNetNIStatus(ptl_handle_ni_t interface_in, ptl_sr_index_t register_in, ptl_sr_value_t *status_out) { LASSERT (ptl_apini.apini_init); @@ -1064,7 +1064,7 @@ PtlNIStatus(ptl_handle_ni_t interface_in, ptl_sr_index_t register_in, } ptl_err_t -PtlACEntry(ptl_handle_ni_t ni_in, ptl_ac_index_t index_in, +LNetACEntry(ptl_handle_ni_t ni_in, ptl_ac_index_t index_in, ptl_process_id_t match_id_in, ptl_pt_index_t portal_in) { LASSERT (ptl_apini.apini_init); diff --git a/lnet/lnet/lib-eq.c b/lnet/lnet/lib-eq.c index d89dcdb..54733a3 100644 --- a/lnet/lnet/lib-eq.c +++ b/lnet/lnet/lib-eq.c @@ -26,7 +26,7 @@ #include ptl_err_t -PtlEQAlloc(ptl_handle_ni_t interface, ptl_size_t count, +LNetEQAlloc(ptl_handle_ni_t interface, ptl_size_t count, ptl_eq_handler_t callback, ptl_handle_eq_t *handle) { ptl_eq_t *eq; @@ -83,7 +83,7 @@ PtlEQAlloc(ptl_handle_ni_t interface, ptl_size_t count, } ptl_err_t -PtlEQFree(ptl_handle_eq_t eqh) +LNetEQFree(ptl_handle_eq_t eqh) { ptl_eq_t *eq; int size; @@ -154,25 +154,25 @@ lib_get_event (ptl_eq_t *eq, ptl_event_t *ev) ptl_err_t -PtlEQGet (ptl_handle_eq_t eventq, ptl_event_t *event) +LNetEQGet (ptl_handle_eq_t eventq, ptl_event_t *event) { int which; - return PtlEQPoll(&eventq, 1, 0, + return LNetEQPoll(&eventq, 1, 0, event, &which); } ptl_err_t -PtlEQWait (ptl_handle_eq_t eventq, ptl_event_t *event) +LNetEQWait (ptl_handle_eq_t eventq, ptl_event_t *event) { int which; - return PtlEQPoll(&eventq, 1, PTL_TIME_FOREVER, + return LNetEQPoll(&eventq, 1, PTL_TIME_FOREVER, event, &which); } ptl_err_t -PtlEQPoll (ptl_handle_eq_t *eventqs, int neq, int timeout_ms, +LNetEQPoll (ptl_handle_eq_t *eventqs, int neq, int timeout_ms, ptl_event_t *event, int *which) { unsigned long flags; diff --git a/lnet/lnet/lib-md.c b/lnet/lnet/lib-md.c index ac3c05e..065ed4b 100644 --- a/lnet/lnet/lib-md.c +++ b/lnet/lnet/lib-md.c @@ -78,7 +78,7 @@ lib_md_build(ptl_libmd_t *lmd, ptl_md_t *umd, int unlink) * otherwise caller may only ptl_md_free() it. */ - if (!PtlHandleIsEqual (umd->eq_handle, PTL_EQ_NONE)) { + if (!LNetHandleIsEqual (umd->eq_handle, PTL_EQ_NONE)) { eq = ptl_handle2eq(&umd->eq_handle); if (eq == NULL) return PTL_EQ_INVALID; @@ -192,7 +192,7 @@ ptl_md_deconstruct(ptl_libmd_t *lmd, ptl_md_t *umd) } ptl_err_t -PtlMDAttach(ptl_handle_me_t meh, ptl_md_t umd, +LNetMDAttach(ptl_handle_me_t meh, ptl_md_t umd, ptl_unlink_t unlink, ptl_handle_md_t *handle) { ptl_me_t *me; @@ -238,7 +238,7 @@ PtlMDAttach(ptl_handle_me_t meh, ptl_md_t umd, } ptl_err_t -PtlMDBind(ptl_handle_ni_t nih, ptl_md_t umd, +LNetMDBind(ptl_handle_ni_t nih, ptl_md_t umd, ptl_unlink_t unlink, ptl_handle_md_t *handle) { ptl_libmd_t *md; @@ -274,7 +274,7 @@ PtlMDBind(ptl_handle_ni_t nih, ptl_md_t umd, } ptl_err_t -PtlMDUnlink (ptl_handle_md_t mdh) +LNetMDUnlink (ptl_handle_md_t mdh) { ptl_event_t ev; ptl_libmd_t *md; @@ -314,75 +314,3 @@ PtlMDUnlink (ptl_handle_md_t mdh) return PTL_OK; } -ptl_err_t -PtlMDUpdate(ptl_handle_md_t mdh, - ptl_md_t *oldumd, ptl_md_t *newumd, - ptl_handle_eq_t testqh) -{ - ptl_libmd_t *md; - ptl_eq_t *test_eq = NULL; - unsigned long flags; - int rc; - - LASSERT (ptl_apini.apini_init); - LASSERT (ptl_apini.apini_refcount > 0); - - PTL_LOCK(flags); - - md = ptl_handle2md(&mdh); - if (md == NULL) { - rc = PTL_MD_INVALID; - goto out; - } - - if (oldumd != NULL) - ptl_md_deconstruct(md, oldumd); - - if (newumd == NULL) { - rc = PTL_OK; - goto out; - } - - /* XXX fttb, the new MD must be the same "shape" wrt fragmentation, - * since we simply overwrite the old lib-md */ - if ((((newumd->options ^ md->md_options) & - (PTL_MD_IOVEC | PTL_MD_KIOV)) != 0) || - ((newumd->options & (PTL_MD_IOVEC | PTL_MD_KIOV)) != 0 && - newumd->length != md->md_niov)) { - rc = PTL_IOV_INVALID; - goto out; - } - - if (!PtlHandleIsEqual (testqh, PTL_EQ_NONE)) { - test_eq = ptl_handle2eq(&testqh); - if (test_eq == NULL) { - rc = PTL_EQ_INVALID; - goto out; - } - } - - if (md->md_pending != 0) { - rc = PTL_MD_NO_UPDATE; - goto out; - } - - if (test_eq == NULL || - test_eq->eq_deq_seq == test_eq->eq_enq_seq) { - ptl_me_t *me = md->md_me; - int unlink = (md->md_flags & PTL_MD_FLAG_AUTO_UNLINK) ? - PTL_UNLINK : PTL_RETAIN; - - // #warning this does not track eq refcounts properly - LBUG(); - rc = lib_md_build(md, newumd, unlink); - - md->md_me = me; - } else { - rc = PTL_MD_NO_UPDATE; - } - - out: - PTL_UNLOCK(flags); - - return rc; -} diff --git a/lnet/lnet/lib-me.c b/lnet/lnet/lib-me.c index d10af61..21a6dfa 100644 --- a/lnet/lnet/lib-me.c +++ b/lnet/lnet/lib-me.c @@ -27,7 +27,7 @@ #include ptl_err_t -PtlMEAttach(ptl_handle_ni_t interface, +LNetMEAttach(ptl_handle_ni_t interface, ptl_pt_index_t portal, ptl_process_id_t match_id, ptl_match_bits_t match_bits, @@ -71,7 +71,7 @@ PtlMEAttach(ptl_handle_ni_t interface, } ptl_err_t -PtlMEInsert(ptl_handle_me_t current_meh, +LNetMEInsert(ptl_handle_me_t current_meh, ptl_process_id_t match_id, ptl_match_bits_t match_bits, ptl_match_bits_t ignore_bits, @@ -120,7 +120,7 @@ PtlMEInsert(ptl_handle_me_t current_meh, } ptl_err_t -PtlMEUnlink(ptl_handle_me_t meh) +LNetMEUnlink(ptl_handle_me_t meh) { unsigned long flags; ptl_me_t *me; diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c index 50012b2..346a2a3 100644 --- a/lnet/lnet/lib-move.c +++ b/lnet/lnet/lib-move.c @@ -1130,7 +1130,7 @@ ptl_parse(ptl_ni_t *ni, ptl_hdr_t *hdr, void *private) } ptl_err_t -PtlPut(ptl_handle_md_t mdh, ptl_ack_req_t ack, +LNetPut(ptl_handle_md_t mdh, ptl_ack_req_t ack, ptl_process_id_t target, ptl_pt_index_t portal, ptl_ac_index_t ac, ptl_match_bits_t match_bits, ptl_size_t offset, ptl_hdr_data_t hdr_data) @@ -1171,7 +1171,7 @@ PtlPut(ptl_handle_md_t mdh, ptl_ack_req_t ack, return PTL_MD_INVALID; } - CDEBUG(D_NET, "PtlPut -> %s\n", libcfs_id2str(target)); + CDEBUG(D_NET, "LNetPut -> %s\n", libcfs_id2str(target)); memset (&hdr, 0, sizeof (hdr)); @@ -1287,7 +1287,7 @@ ptl_create_reply_msg (ptl_ni_t *ni, ptl_nid_t peer_nid, ptl_msg_t *getmsg) } ptl_err_t -PtlGet(ptl_handle_md_t mdh, ptl_process_id_t target, +LNetGet(ptl_handle_md_t mdh, ptl_process_id_t target, ptl_pt_index_t portal, ptl_ac_index_t ac, ptl_match_bits_t match_bits, ptl_size_t offset) { @@ -1327,7 +1327,7 @@ PtlGet(ptl_handle_md_t mdh, ptl_process_id_t target, return PTL_MD_INVALID; } - CDEBUG(D_NET, "PtlGet -> %s\n", libcfs_id2str(target)); + CDEBUG(D_NET, "LNetGet -> %s\n", libcfs_id2str(target)); memset (&hdr, 0, sizeof (hdr)); diff --git a/lnet/lnet/module.c b/lnet/lnet/module.c index a8310d6..4f06019 100644 --- a/lnet/lnet/module.c +++ b/lnet/lnet/module.c @@ -45,18 +45,18 @@ static int kportal_ioctl(unsigned int cmd, struct portal_ioctl_data *data) if (initrc) { rc--; - PtlNIFini((ptl_handle_ni_t){0}); + LNetNIFini((ptl_handle_ni_t){0}); } return rc == 0 ? 0 : -EBUSY; } - initrc = PtlNIInit(PTL_IFACE_DEFAULT, LUSTRE_SRV_PTL_PID, + initrc = LNetNIInit(PTL_IFACE_DEFAULT, LUSTRE_SRV_PTL_PID, NULL, NULL, &nih); if (!(initrc == PTL_OK || initrc == PTL_IFACE_DUP)) RETURN (-ENETDOWN); - rc = PtlNICtl(nih, cmd, data); + rc = LNetNICtl(nih, cmd, data); if (initrc == PTL_OK) { PTL_MUTEX_DOWN(&ptl_apini.apini_api_mutex); @@ -64,7 +64,7 @@ static int kportal_ioctl(unsigned int cmd, struct portal_ioctl_data *data) ptl_apini.apini_niinit_self = 1; PTL_MUTEX_UP(&ptl_apini.apini_api_mutex); } else { - PtlNIFini(nih); + LNetNIFini(nih); } return rc; @@ -77,9 +77,9 @@ static int init_kportals_module(void) int rc; ENTRY; - rc = PtlInit(NULL); + rc = LNetInit(NULL); if (rc != PTL_OK) { - CERROR("PtlInit: error %d\n", rc); + CERROR("LNetInit: error %d\n", rc); RETURN(rc); } @@ -90,10 +90,10 @@ static int init_kportals_module(void) ptl_apini.apini_niinit_self = 1; PTL_MUTEX_UP(&ptl_apini.apini_api_mutex); - rc = PtlNIInit(PTL_IFACE_DEFAULT, LUSTRE_SRV_PTL_PID, + rc = LNetNIInit(PTL_IFACE_DEFAULT, LUSTRE_SRV_PTL_PID, NULL, NULL, &nih); if (rc != PTL_OK) { - /* Can't PtlFini or fail now if I loaded NALs */ + /* Can't LNetFini or fail now if I loaded NALs */ PTL_MUTEX_DOWN(&ptl_apini.apini_api_mutex); ptl_apini.apini_niinit_self = 0; PTL_MUTEX_UP(&ptl_apini.apini_api_mutex); @@ -113,31 +113,31 @@ static void exit_kportals_module(void) rc = libcfs_deregister_ioctl(&kportal_ioctl_handler); LASSERT (rc == 0); - PtlFini(); + LNetFini(); } EXPORT_SYMBOL(ptl_register_nal); EXPORT_SYMBOL(ptl_unregister_nal); EXPORT_SYMBOL(ptl_err_str); -EXPORT_SYMBOL(PtlMEAttach); -EXPORT_SYMBOL(PtlMEInsert); -EXPORT_SYMBOL(PtlMEUnlink); -EXPORT_SYMBOL(PtlEQAlloc); -EXPORT_SYMBOL(PtlMDAttach); -EXPORT_SYMBOL(PtlMDUnlink); -EXPORT_SYMBOL(PtlNIInit); -EXPORT_SYMBOL(PtlNIFini); -EXPORT_SYMBOL(PtlInit); -EXPORT_SYMBOL(PtlFini); -EXPORT_SYMBOL(PtlSnprintHandle); -EXPORT_SYMBOL(PtlPut); -EXPORT_SYMBOL(PtlGet); -EXPORT_SYMBOL(PtlEQWait); -EXPORT_SYMBOL(PtlEQFree); -EXPORT_SYMBOL(PtlEQGet); -EXPORT_SYMBOL(PtlGetId); -EXPORT_SYMBOL(PtlMDBind); +EXPORT_SYMBOL(LNetMEAttach); +EXPORT_SYMBOL(LNetMEInsert); +EXPORT_SYMBOL(LNetMEUnlink); +EXPORT_SYMBOL(LNetEQAlloc); +EXPORT_SYMBOL(LNetMDAttach); +EXPORT_SYMBOL(LNetMDUnlink); +EXPORT_SYMBOL(LNetNIInit); +EXPORT_SYMBOL(LNetNIFini); +EXPORT_SYMBOL(LNetInit); +EXPORT_SYMBOL(LNetFini); +EXPORT_SYMBOL(LNetSnprintHandle); +EXPORT_SYMBOL(LNetPut); +EXPORT_SYMBOL(LNetGet); +EXPORT_SYMBOL(LNetEQWait); +EXPORT_SYMBOL(LNetEQFree); +EXPORT_SYMBOL(LNetEQGet); +EXPORT_SYMBOL(LNetGetId); +EXPORT_SYMBOL(LNetMDBind); EXPORT_SYMBOL(ptl_apini); EXPORT_SYMBOL(ptl_iov_nob); EXPORT_SYMBOL(ptl_copy_iov2buf); diff --git a/lnet/tests/ping_cli.c b/lnet/tests/ping_cli.c index 398e069..f637990 100644 --- a/lnet/tests/ping_cli.c +++ b/lnet/tests/ping_cli.c @@ -53,20 +53,20 @@ pingcli_shutdown(ptl_handle_ni_t nih, int err) switch (err) { case 1: /* Unlink any memory descriptors we may have used */ - if ((rc = PtlMDUnlink (client->md_out_head_h))) - PDEBUG ("PtlMDUnlink", rc); + if ((rc = LNetMDUnlink (client->md_out_head_h))) + PDEBUG ("LNetMDUnlink", rc); case 2: - if ((rc = PtlMDUnlink (client->md_in_head_h))) - PDEBUG ("PtlMDUnlink", rc); + if ((rc = LNetMDUnlink (client->md_in_head_h))) + PDEBUG ("LNetMDUnlink", rc); /* Free the event queue */ - if ((rc = PtlEQFree (client->eq))) - PDEBUG ("PtlEQFree", rc); + if ((rc = LNetEQFree (client->eq))) + PDEBUG ("LNetEQFree", rc); - if ((rc = PtlMEUnlink (client->me))) - PDEBUG ("PtlMEUnlink", rc); + if ((rc = LNetMEUnlink (client->me))) + PDEBUG ("LNetMEUnlink", rc); case 3: - PtlNIFini(nih); + LNetNIFini(nih); case 4: /* Free our buffers */ @@ -142,18 +142,18 @@ pingcli_start(struct portal_ioctl_data *args) return; } - rc = PtlNIInit(PTL_IFACE_DEFAULT, 0, NULL, NULL, &nih); + rc = LNetNIInit(PTL_IFACE_DEFAULT, 0, NULL, NULL, &nih); if (rc != PTL_OK && rc != PTL_IFACE_DUP) { - CERROR ("PtlNIInit: error %d\n", rc); + CERROR ("LNetNIInit: error %d\n", rc); pingcli_shutdown (nih, 4); return; } /* Based on the initialization aquire our unique portal ID. */ - if ((rc = PtlGetId (nih, &client->myid))) + if ((rc = LNetGetId (nih, &client->myid))) { - CERROR ("PtlGetId error %d\n", rc); + CERROR ("LNetGetId error %d\n", rc); pingcli_shutdown (nih, 2); return; } @@ -166,19 +166,19 @@ pingcli_start(struct portal_ioctl_data *args) client->id_remote.nid = client->nid; client->id_remote.pid = 0; - if ((rc = PtlMEAttach (nih, PTL_PING_CLIENT, + if ((rc = LNetMEAttach (nih, PTL_PING_CLIENT, client->id_local, 0, ~0, PTL_RETAIN, PTL_INS_AFTER, &client->me))) { - CERROR ("PtlMEAttach error %d\n", rc); + CERROR ("LNetMEAttach error %d\n", rc); pingcli_shutdown (nih, 2); return; } /* Allocate the event queue for this network interface */ - if ((rc = PtlEQAlloc (nih, 64, pingcli_callback, &client->eq))) + if ((rc = LNetEQAlloc (nih, 64, pingcli_callback, &client->eq))) { - CERROR ("PtlEQAlloc error %d\n", rc); + CERROR ("LNetEQAlloc error %d\n", rc); pingcli_shutdown (nih, 2); return; } @@ -194,9 +194,9 @@ pingcli_start(struct portal_ioctl_data *args) memset (client->inbuf, 0, (client->size + STDSIZE) * count); /* Attach the incoming buffer */ - if ((rc = PtlMDAttach (client->me, client->md_in_head, + if ((rc = LNetMDAttach (client->me, client->md_in_head, PTL_UNLINK, &client->md_in_head_h))) { - CERROR ("PtlMDAttach error %d\n", rc); + CERROR ("LNetMDAttach error %d\n", rc); pingcli_shutdown (nih, 1); return; } @@ -213,9 +213,9 @@ pingcli_start(struct portal_ioctl_data *args) count = 0; /* Bind the outgoing ping header */ - if ((rc=PtlMDBind (nih, client->md_out_head, + if ((rc=LNetMDBind (nih, client->md_out_head, PTL_UNLINK, &client->md_out_head_h))) { - CERROR ("PtlMDBind error %d\n", rc); + CERROR ("LNetMDBind error %d\n", rc); pingcli_shutdown (nih, 1); return; } @@ -231,9 +231,9 @@ pingcli_start(struct portal_ioctl_data *args) memcpy(client->outbuf+sizeof(unsigned)+sizeof(unsigned),&tv1, sizeof(struct timeval)); - if((rc = PtlPut (client->md_out_head_h, PTL_NOACK_REQ, + if((rc = LNetPut (client->md_out_head_h, PTL_NOACK_REQ, client->id_remote, PTL_PING_SERVER, 0, 0, 0, 0))) { - PDEBUG ("PtlPut (header)", rc); + PDEBUG ("LNetPut (header)", rc); pingcli_shutdown (nih, 1); return; } diff --git a/lnet/tests/ping_srv.c b/lnet/tests/ping_srv.c index c444514..f2a9608 100644 --- a/lnet/tests/ping_srv.c +++ b/lnet/tests/ping_srv.c @@ -51,19 +51,19 @@ static void *pingsrv_shutdown(int err) switch (err) { case 1: /* Unlink any memory descriptors we may have used */ - if ((rc = PtlMDUnlink (server->mdin_h))) - PDEBUG ("PtlMDUnlink (out head buffer)", rc); + if ((rc = LNetMDUnlink (server->mdin_h))) + PDEBUG ("LNetMDUnlink (out head buffer)", rc); case 2: /* Free the event queue */ - if ((rc = PtlEQFree (server->eq))) - PDEBUG ("PtlEQFree", rc); + if ((rc = LNetEQFree (server->eq))) + PDEBUG ("LNetEQFree", rc); /* Unlink the client portal from the ME list */ - if ((rc = PtlMEUnlink (server->me))) - PDEBUG ("PtlMEUnlink", rc); + if ((rc = LNetMEUnlink (server->me))) + PDEBUG ("LNetMEUnlink", rc); case 3: - PtlNIFini (server->ni); + LNetNIFini (server->ni); case 4: @@ -116,9 +116,9 @@ int pingsrv_thread(void *arg) server->mdout.eq_handle = PTL_EQ_NONE; /* Bind the outgoing buffer */ - if ((rc = PtlMDBind (server->ni, server->mdout, + if ((rc = LNetMDBind (server->ni, server->mdout, PTL_UNLINK, &server->mdout_h))) { - PDEBUG ("PtlMDBind", rc); + PDEBUG ("LNetMDBind", rc); pingsrv_shutdown (1); return 1; } @@ -131,15 +131,15 @@ int pingsrv_thread(void *arg) server->mdin.user_ptr = NULL; server->mdin.eq_handle = server->eq; - if ((rc = PtlMDAttach (server->me, server->mdin, + if ((rc = LNetMDAttach (server->me, server->mdin, PTL_UNLINK, &server->mdin_h))) { - PDEBUG ("PtlMDAttach (bulk)", rc); + PDEBUG ("LNetMDAttach (bulk)", rc); CDEBUG (D_OTHER, "ping server resources allocated\n"); } - if ((rc = PtlPut (server->mdout_h, PTL_NOACK_REQ, + if ((rc = LNetPut (server->mdout_h, PTL_NOACK_REQ, server->evnt.initiator, PTL_PING_CLIENT, 0, 0, 0, 0))) - PDEBUG ("PtlPut", rc); + PDEBUG ("LNetPut", rc); atomic_dec (&pkt); @@ -186,16 +186,16 @@ static struct pingsrv_data *pingsrv_setup(void) server->ni = PTL_INVALID_HANDLE; /* Aquire and initialize the proper nal for portals. */ - rc = PtlNIInit(PTL_IFACE_DEFAULT, 0, NULL, NULL, &server->ni); + rc = LNetNIInit(PTL_IFACE_DEFAULT, 0, NULL, NULL, &server->ni); if (!(rc == PTL_OK || rc == PTL_IFACE_DUP)) { - CDEBUG (D_OTHER, "PtlNIInit: error %d\n", rc); + CDEBUG (D_OTHER, "LNetNIInit: error %d\n", rc); return pingsrv_shutdown (4); } /* Based on the initialization aquire our unique portal ID. */ - if ((rc = PtlGetId (server->ni, &server->my_id))) { - PDEBUG ("PtlGetId", rc); + if ((rc = LNetGetId (server->ni, &server->my_id))) { + PDEBUG ("LNetGetId", rc); return pingsrv_shutdown (2); } @@ -203,17 +203,17 @@ static struct pingsrv_data *pingsrv_setup(void) server->id_local.pid = PTL_PID_ANY; /* Attach a match entries for header packets */ - if ((rc = PtlMEAttach (server->ni, PTL_PING_SERVER, + if ((rc = LNetMEAttach (server->ni, PTL_PING_SERVER, server->id_local,0, ~0, PTL_RETAIN, PTL_INS_AFTER, &server->me))) { - PDEBUG ("PtlMEAttach", rc); + PDEBUG ("LNetMEAttach", rc); return pingsrv_shutdown (2); } - if ((rc = PtlEQAlloc (server->ni, 1024, &pingsrv_callback, + if ((rc = LNetEQAlloc (server->ni, 1024, &pingsrv_callback, &server->eq))) { - PDEBUG ("PtlEQAlloc (callback)", rc); + PDEBUG ("LNetEQAlloc (callback)", rc); return pingsrv_shutdown (2); } @@ -232,9 +232,9 @@ static struct pingsrv_data *pingsrv_setup(void) server->mdin.eq_handle = server->eq; memset (server->in_buf, 0, STDSIZE); - if ((rc = PtlMDAttach (server->me, server->mdin, + if ((rc = LNetMDAttach (server->me, server->mdin, PTL_UNLINK, &server->mdin_h))) { - PDEBUG ("PtlMDAttach (bulk)", rc); + PDEBUG ("LNetMDAttach (bulk)", rc); CDEBUG (D_OTHER, "ping server resources allocated\n"); } diff --git a/lnet/tests/sping_cli.c b/lnet/tests/sping_cli.c index 43b6b65..fb677ee 100644 --- a/lnet/tests/sping_cli.c +++ b/lnet/tests/sping_cli.c @@ -62,17 +62,17 @@ pingcli_shutdown(ptl_handle_ni_t nih, int err) switch (err) { case 1: /* Unlink any memory descriptors we may have used */ - if ((rc = PtlMDUnlink (client->md_out_head_h))) - PDEBUG ("PtlMDUnlink", rc); + if ((rc = LNetMDUnlink (client->md_out_head_h))) + PDEBUG ("LNetMDUnlink", rc); case 2: /* Free the event queue */ - if ((rc = PtlEQFree (client->eq))) - PDEBUG ("PtlEQFree", rc); + if ((rc = LNetEQFree (client->eq))) + PDEBUG ("LNetEQFree", rc); - if ((rc = PtlMEUnlink (client->me))) - PDEBUG ("PtlMEUnlink", rc); + if ((rc = LNetMEUnlink (client->me))) + PDEBUG ("LNetMEUnlink", rc); case 3: - PtlNIFini (nih); + LNetNIFini (nih); case 4: /* Free our buffers */ @@ -136,18 +136,18 @@ pingcli_start(struct portal_ioctl_data *args) } /* Aquire and initialize the proper nal for portals. */ - rc = PtlNIInit(PTL_IFACE_DEFAULT, 0, NULL, NULL, &nih); + rc = LNetNIInit(PTL_IFACE_DEFAULT, 0, NULL, NULL, &nih); if (rc != PTL_OK && rc != PTL_IFACE_DUP) { - CERROR ("PtlNIInit: error %d\n", rc); + CERROR ("LNetNIInit: error %d\n", rc); pingcli_shutdown (nih, 4); return; } /* Based on the initialization aquire our unique portal ID. */ - if ((rc = PtlGetId (nih, &client->myid))) + if ((rc = LNetGetId (nih, &client->myid))) { - CERROR ("PtlGetId error %d\n", rc); + CERROR ("LNetGetId error %d\n", rc); pingcli_shutdown (nih, 2); return; } @@ -160,19 +160,19 @@ pingcli_start(struct portal_ioctl_data *args) client->id_remote.nid = client->nid; client->id_remote.pid = 0; - if ((rc = PtlMEAttach (nih, PTL_PING_CLIENT, + if ((rc = LNetMEAttach (nih, PTL_PING_CLIENT, client->id_local, 0, ~0, PTL_RETAIN, PTL_INS_AFTER, &client->me))) { - CERROR ("PtlMEAttach error %d\n", rc); + CERROR ("LNetMEAttach error %d\n", rc); pingcli_shutdown (nih, 2); return; } /* Allocate the event queue for this network interface */ - if ((rc = PtlEQAlloc (nih, 64, pingcli_callback, &client->eq))) + if ((rc = LNetEQAlloc (nih, 64, pingcli_callback, &client->eq))) { - CERROR ("PtlEQAlloc error %d\n", rc); + CERROR ("LNetEQAlloc error %d\n", rc); pingcli_shutdown (nih, 2); return; } @@ -187,9 +187,9 @@ pingcli_start(struct portal_ioctl_data *args) memset (client->inbuf, 0, STDSIZE); /* Attach the incoming buffer */ - if ((rc = PtlMDAttach (client->me, client->md_in_head, + if ((rc = LNetMDAttach (client->me, client->md_in_head, PTL_UNLINK, &client->md_in_head_h))) { - CERROR ("PtlMDAttach error %d\n", rc); + CERROR ("LNetMDAttach error %d\n", rc); pingcli_shutdown (nih, 1); return; } @@ -205,16 +205,16 @@ pingcli_start(struct portal_ioctl_data *args) memcpy (client->outbuf, &ping_head_magic, sizeof(ping_head_magic)); /* Bind the outgoing ping header */ - if ((rc=PtlMDBind (nih, client->md_out_head, + if ((rc=LNetMDBind (nih, client->md_out_head, PTL_UNLINK, &client->md_out_head_h))) { - CERROR ("PtlMDBind error %d\n", rc); + CERROR ("LNetMDBind error %d\n", rc); pingcli_shutdown (nih, 1); return; } /* Put the ping packet */ - if((rc = PtlPut (client->md_out_head_h, PTL_NOACK_REQ, + if((rc = LNetPut (client->md_out_head_h, PTL_NOACK_REQ, client->id_remote, PTL_PING_SERVER, 0, 0, 0, 0))) { - PDEBUG ("PtlPut (header)", rc); + PDEBUG ("LNetPut (header)", rc); pingcli_shutdown (nih, 1); return; } diff --git a/lnet/tests/sping_srv.c b/lnet/tests/sping_srv.c index fafb0db..631a4cf 100644 --- a/lnet/tests/sping_srv.c +++ b/lnet/tests/sping_srv.c @@ -73,19 +73,19 @@ static void *pingsrv_shutdown(int err) switch (err) { case 1: /* Unlink any memory descriptors we may have used */ - if ((rc = PtlMDUnlink (server->mdin_h))) - PDEBUG ("PtlMDUnlink (out head buffer)", rc); + if ((rc = LNetMDUnlink (server->mdin_h))) + PDEBUG ("LNetMDUnlink (out head buffer)", rc); case 2: /* Free the event queue */ - if ((rc = PtlEQFree (server->eq))) - PDEBUG ("PtlEQFree", rc); + if ((rc = LNetEQFree (server->eq))) + PDEBUG ("LNetEQFree", rc); /* Unlink the client portal from the ME list */ - if ((rc = PtlMEUnlink (server->me))) - PDEBUG ("PtlMEUnlink", rc); + if ((rc = LNetMEUnlink (server->me))) + PDEBUG ("LNetMEUnlink", rc); case 3: - PtlNIFini(server->ni); + LNetNIFini(server->ni); case 4: @@ -125,9 +125,9 @@ int pingsrv_thread(void *arg) server->mdout.eq_handle = PTL_EQ_NONE; /* Bind the outgoing buffer */ - if ((rc = PtlMDBind (server->ni, server->mdout, + if ((rc = LNetMDBind (server->ni, server->mdout, PTL_UNLINK, &server->mdout_h))) { - PDEBUG ("PtlMDBind", rc); + PDEBUG ("LNetMDBind", rc); pingsrv_shutdown (1); return 1; } @@ -140,15 +140,15 @@ int pingsrv_thread(void *arg) server->mdin.user_ptr = NULL; server->mdin.eq_handle = server->eq; - if ((rc = PtlMDAttach (server->me, server->mdin, + if ((rc = LNetMDAttach (server->me, server->mdin, PTL_UNLINK, &server->mdin_h))) { - PDEBUG ("PtlMDAttach (bulk)", rc); + PDEBUG ("LNetMDAttach (bulk)", rc); CDEBUG (D_OTHER, "ping server resources allocated\n"); } - if ((rc = PtlPut (server->mdout_h, PTL_NOACK_REQ, + if ((rc = LNetPut (server->mdout_h, PTL_NOACK_REQ, server->evnt.initiator, PTL_PING_CLIENT, 0, 0, 0, 0))) - PDEBUG ("PtlPut", rc); + PDEBUG ("LNetPut", rc); atomic_dec (&pkt); @@ -191,15 +191,15 @@ static struct pingsrv_data *pingsrv_setup(void) server->ni = PTL_INVALID_HANDLE; - rc = PtlNIInit(PTL_IFACE_DEFAULT, 0, NULL, NULL, &server->ni); + rc = LNetNIInit(PTL_IFACE_DEFAULT, 0, NULL, NULL, &server->ni); if (rc != PTL_OK && rc != PTL_IFACE_DUP) { - CDEBUG (D_OTHER, "PtlNIInit: error %d\n", rc); + CDEBUG (D_OTHER, "LNetNIInit: error %d\n", rc); return pingsrv_shutdown (4); } /* Based on the initialization aquire our unique portal ID. */ - if ((rc = PtlGetId (server->ni, &server->my_id))) { - PDEBUG ("PtlGetId", rc); + if ((rc = LNetGetId (server->ni, &server->my_id))) { + PDEBUG ("LNetGetId", rc); return pingsrv_shutdown (2); } @@ -207,17 +207,17 @@ static struct pingsrv_data *pingsrv_setup(void) server->id_local.pid = PTL_PID_ANY; /* Attach a match entries for header packets */ - if ((rc = PtlMEAttach (server->ni, PTL_PING_SERVER, + if ((rc = LNetMEAttach (server->ni, PTL_PING_SERVER, server->id_local,0, ~0, PTL_RETAIN, PTL_INS_AFTER, &server->me))) { - PDEBUG ("PtlMEAttach", rc); + PDEBUG ("LNetMEAttach", rc); return pingsrv_shutdown (2); } - if ((rc = PtlEQAlloc (server->ni, 64, pingsrv_callback, + if ((rc = LNetEQAlloc (server->ni, 64, pingsrv_callback, &server->eq))) { - PDEBUG ("PtlEQAlloc (callback)", rc); + PDEBUG ("LNetEQAlloc (callback)", rc); return pingsrv_shutdown (2); } @@ -236,9 +236,9 @@ static struct pingsrv_data *pingsrv_setup(void) server->mdin.eq_handle = server->eq; memset (server->in_buf, 0, STDSIZE); - if ((rc = PtlMDAttach (server->me, server->mdin, + if ((rc = LNetMDAttach (server->me, server->mdin, PTL_UNLINK, &server->mdin_h))) { - PDEBUG ("PtlMDAttach (bulk)", rc); + PDEBUG ("LNetMDAttach (bulk)", rc); CDEBUG (D_OTHER, "ping server resources allocated\n"); } -- 1.8.3.1