[Pvfs2-cvs] commit by walt in pvfs2-1/src/io/bmi/bmi_tcp: bmi-tcp.c socket-collection-epoll.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2-1/src/io/bmi/bmi_tcp
In directory parlweb1:/tmp/cvs-serv7536/src/io/bmi/bmi_tcp

Modified Files:
      Tag: Orange-Merge1
	bmi-tcp.c socket-collection-epoll.c 
Log Message:
Merged changes in Blue branch into Orange branch


Index: bmi-tcp.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/io/bmi/bmi_tcp/bmi-tcp.c,v
diff -p -u -r1.142 -r1.142.20.1
--- bmi-tcp.c	22 Feb 2009 18:51:15 -0000	1.142
+++ bmi-tcp.c	9 Jul 2009 16:40:47 -0000	1.142.20.1
@@ -3648,9 +3648,17 @@ static int tcp_accept_init(int *socket, 
 	    (errno == EHOSTDOWN) ||
 	    (errno == ENONET) ||
             (errno == EHOSTUNREACH) ||
-	    (errno == EOPNOTSUPP) || (errno == ENETUNREACH))
+	    (errno == EOPNOTSUPP) ||
+            (errno == ENETUNREACH) ||
+            (errno == ENFILE) ||
+            (errno == EMFILE))
 	{
 	    /* try again later */
+            if ((errno == ENFILE) || (errno == EMFILE))
+            {
+	        gossip_err("Error: accept: %s (continuing)\n",strerror(errno));
+                bmi_method_addr_drop_callback(BMI_tcp_method_name);
+            }
 	    return (0);
 	}
 	else

Index: socket-collection-epoll.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/io/bmi/bmi_tcp/socket-collection-epoll.c,v
diff -p -u -r1.10 -r1.10.20.1
--- socket-collection-epoll.c	20 Feb 2009 16:25:39 -0000	1.10
+++ socket-collection-epoll.c	9 Jul 2009 16:40:47 -0000	1.10.20.1
@@ -128,6 +128,11 @@ int BMI_socket_collection_testglobal(soc
     memset(maps, 0, (sizeof(bmi_method_addr_p) * incount));
     memset(status, 0, (sizeof(int) * incount));
 
+    if(incount == 0)
+    {
+        return(0);
+    }
+
     /* actually do the epoll_wait() here */
     do
     {