[PVFS2-CVS] commit by pw in pvfs2/src/io/bmi/bmi_tcp: bmi-tcp.c

CVS commit program cvs at parl.clemson.edu
Mon Mar 28 13:33:43 EST 2005


Update of /projects/cvsroot/pvfs2/src/io/bmi/bmi_tcp
In directory parlweb:/tmp/cvs-serv22418/src/io/bmi/bmi_tcp

Modified Files:
	bmi-tcp.c 
Log Message:
report restartable transfers as debug messages, not errors; make up an errno when one is not reported (other side closed)


Index: bmi-tcp.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi_tcp/bmi-tcp.c,v
diff -u -p -u -r1.89 -r1.90
--- bmi-tcp.c	29 Sep 2004 19:16:06 -0000	1.89
+++ bmi-tcp.c	28 Mar 2005 18:33:43 -0000	1.90
@@ -1586,7 +1586,8 @@ static int tcp_sock_init(method_addr_p m
 	/* TODO: make this a debug rather than error message once we have
 	 * tested this out enough
 	 */
-	gossip_err("Warning: BMI attempting reconnect.\n");
+        gossip_debug(GOSSIP_BMI_DEBUG_TCP, "%s: attempting reconnect.\n",
+          __func__);
 	tcp_addr_data->addr_error = 0;
 	assert(tcp_addr_data->socket < 0);
 	tcp_addr_data->not_connected = 1;
@@ -2817,9 +2818,13 @@ static int tcp_do_work_error(method_addr
 
     /* perform a read on the socket so that we can get a real errno */
     ret = read(tcp_addr_data->socket, &buf, sizeof(int));
-    tmp_errno = errno;
+    if (ret == 0)
+        tmp_errno = EPIPE;  /* report other side closed socket with this */
+    else
+        tmp_errno = errno;
 
-    gossip_err("Error: bmi_tcp: %s\n", strerror(tmp_errno));
+    gossip_debug(GOSSIP_BMI_DEBUG_TCP, "Error: bmi_tcp: %s\n",
+      strerror(tmp_errno));
 
     if (tcp_addr_data->server_port)
     {



More information about the PVFS2-CVS mailing list