From 6d869bd9c6239cea030491469c283dc45ca077b4 Mon Sep 17 00:00:00 2001 From: green Date: Mon, 16 Feb 2004 10:19:31 +0000 Subject: [PATCH] Update to HEAD. Should now contain fix for 2710/2743 --- lnet/ulnds/connection.c | 7 ++++++- lnet/ulnds/socklnd/connection.c | 7 ++++++- lustre/portals/unals/connection.c | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/lnet/ulnds/connection.c b/lnet/ulnds/connection.c index 29e75be..ca6999a 100644 --- a/lnet/ulnds/connection.c +++ b/lnet/ulnds/connection.c @@ -309,7 +309,8 @@ tcpnal_hello (int sockfd, ptl_nid_t *nid, int type, __u64 incarnation) */ connection force_tcp_connection(manager m, unsigned int ip, - unsigned short port) + unsigned short port, + procbridge pb) { connection conn; struct sockaddr_in addr; @@ -357,6 +358,10 @@ connection force_tcp_connection(manager m, exit(-1); conn = allocate_connection(m, ip, port, fd); + + /* let nal thread know this event right away */ + if (conn) + procbridge_wakeup_nal(pb); } pthread_mutex_unlock(&m->conn_lock); diff --git a/lnet/ulnds/socklnd/connection.c b/lnet/ulnds/socklnd/connection.c index 29e75be..ca6999a 100644 --- a/lnet/ulnds/socklnd/connection.c +++ b/lnet/ulnds/socklnd/connection.c @@ -309,7 +309,8 @@ tcpnal_hello (int sockfd, ptl_nid_t *nid, int type, __u64 incarnation) */ connection force_tcp_connection(manager m, unsigned int ip, - unsigned short port) + unsigned short port, + procbridge pb) { connection conn; struct sockaddr_in addr; @@ -357,6 +358,10 @@ connection force_tcp_connection(manager m, exit(-1); conn = allocate_connection(m, ip, port, fd); + + /* let nal thread know this event right away */ + if (conn) + procbridge_wakeup_nal(pb); } pthread_mutex_unlock(&m->conn_lock); diff --git a/lustre/portals/unals/connection.c b/lustre/portals/unals/connection.c index 29e75be..ca6999a 100644 --- a/lustre/portals/unals/connection.c +++ b/lustre/portals/unals/connection.c @@ -309,7 +309,8 @@ tcpnal_hello (int sockfd, ptl_nid_t *nid, int type, __u64 incarnation) */ connection force_tcp_connection(manager m, unsigned int ip, - unsigned short port) + unsigned short port, + procbridge pb) { connection conn; struct sockaddr_in addr; @@ -357,6 +358,10 @@ connection force_tcp_connection(manager m, exit(-1); conn = allocate_connection(m, ip, port, fd); + + /* let nal thread know this event right away */ + if (conn) + procbridge_wakeup_nal(pb); } pthread_mutex_unlock(&m->conn_lock); -- 1.8.3.1