From a7145b1ea1cf450620f6ab4b95268bc9ebc35208 Mon Sep 17 00:00:00 2001 From: eeb Date: Thu, 3 Jun 2004 17:02:11 +0000 Subject: [PATCH] * Landing b1_4_eeb_bugfixes - 3162 support for sparse NAL IDs (cray) - 1548 lib_parse error codes - 2667 NAL restructuring to avoid do_forward and fixe locking issues - 2790 allocate optimised REPLY message in thread context - 2287 zero copy elan PUT --- lnet/ulnds/address.c | 13 ++++++------- lnet/ulnds/socklnd/address.c | 13 ++++++------- lustre/portals/unals/address.c | 13 ++++++------- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/lnet/ulnds/address.c b/lnet/ulnds/address.c index 6507924..f329e2a 100644 --- a/lnet/ulnds/address.c +++ b/lnet/ulnds/address.c @@ -91,8 +91,8 @@ void set_address(bridge t,ptl_pid_t pidrequest) int port; if (pidrequest==(unsigned short)PTL_PID_ANY) port = 0; else port=pidrequest; - t->nal_cb->ni.nid=get_node_id(); - t->nal_cb->ni.pid=port; + t->lib_nal->libnal_ni.ni_pid.nid=get_node_id(); + t->lib_nal->libnal_ni.ni_pid.pid=port; } #else @@ -120,10 +120,9 @@ void set_address(bridge t,ptl_pid_t pidrequest) in_addr = get_node_id(); t->iptop8 = in_addr >> PNAL_HOSTID_SHIFT;/* for making new connections */ - t->nal_cb->ni.nid = ((in_addr & PNAL_HOSTID_MASK) - << PNAL_VNODE_SHIFT) - + virtnode; - + t->lib_nal->libnal_ni.ni_pid.nid = ((in_addr & PNAL_HOSTID_MASK) + << PNAL_VNODE_SHIFT) + + virtnode; pid=pidrequest; /* TODO: Support of pid PTL_ID_ANY with virtual nodes needs more work. */ #ifdef notyet @@ -141,6 +140,6 @@ void set_address(bridge t,ptl_pid_t pidrequest) return; } else port = ((virtnode << PNAL_VNODE_SHIFT) + pid) + PNAL_BASE_PORT; - t->nal_cb->ni.pid=pid; + t->lib_nal->libnal_ni.ni_pid.pid=pid; } #endif diff --git a/lnet/ulnds/socklnd/address.c b/lnet/ulnds/socklnd/address.c index 6507924..f329e2a 100644 --- a/lnet/ulnds/socklnd/address.c +++ b/lnet/ulnds/socklnd/address.c @@ -91,8 +91,8 @@ void set_address(bridge t,ptl_pid_t pidrequest) int port; if (pidrequest==(unsigned short)PTL_PID_ANY) port = 0; else port=pidrequest; - t->nal_cb->ni.nid=get_node_id(); - t->nal_cb->ni.pid=port; + t->lib_nal->libnal_ni.ni_pid.nid=get_node_id(); + t->lib_nal->libnal_ni.ni_pid.pid=port; } #else @@ -120,10 +120,9 @@ void set_address(bridge t,ptl_pid_t pidrequest) in_addr = get_node_id(); t->iptop8 = in_addr >> PNAL_HOSTID_SHIFT;/* for making new connections */ - t->nal_cb->ni.nid = ((in_addr & PNAL_HOSTID_MASK) - << PNAL_VNODE_SHIFT) - + virtnode; - + t->lib_nal->libnal_ni.ni_pid.nid = ((in_addr & PNAL_HOSTID_MASK) + << PNAL_VNODE_SHIFT) + + virtnode; pid=pidrequest; /* TODO: Support of pid PTL_ID_ANY with virtual nodes needs more work. */ #ifdef notyet @@ -141,6 +140,6 @@ void set_address(bridge t,ptl_pid_t pidrequest) return; } else port = ((virtnode << PNAL_VNODE_SHIFT) + pid) + PNAL_BASE_PORT; - t->nal_cb->ni.pid=pid; + t->lib_nal->libnal_ni.ni_pid.pid=pid; } #endif diff --git a/lustre/portals/unals/address.c b/lustre/portals/unals/address.c index 6507924..f329e2a 100644 --- a/lustre/portals/unals/address.c +++ b/lustre/portals/unals/address.c @@ -91,8 +91,8 @@ void set_address(bridge t,ptl_pid_t pidrequest) int port; if (pidrequest==(unsigned short)PTL_PID_ANY) port = 0; else port=pidrequest; - t->nal_cb->ni.nid=get_node_id(); - t->nal_cb->ni.pid=port; + t->lib_nal->libnal_ni.ni_pid.nid=get_node_id(); + t->lib_nal->libnal_ni.ni_pid.pid=port; } #else @@ -120,10 +120,9 @@ void set_address(bridge t,ptl_pid_t pidrequest) in_addr = get_node_id(); t->iptop8 = in_addr >> PNAL_HOSTID_SHIFT;/* for making new connections */ - t->nal_cb->ni.nid = ((in_addr & PNAL_HOSTID_MASK) - << PNAL_VNODE_SHIFT) - + virtnode; - + t->lib_nal->libnal_ni.ni_pid.nid = ((in_addr & PNAL_HOSTID_MASK) + << PNAL_VNODE_SHIFT) + + virtnode; pid=pidrequest; /* TODO: Support of pid PTL_ID_ANY with virtual nodes needs more work. */ #ifdef notyet @@ -141,6 +140,6 @@ void set_address(bridge t,ptl_pid_t pidrequest) return; } else port = ((virtnode << PNAL_VNODE_SHIFT) + pid) + PNAL_BASE_PORT; - t->nal_cb->ni.pid=pid; + t->lib_nal->libnal_ni.ni_pid.pid=pid; } #endif -- 1.8.3.1