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

[CVS commit program]

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

Modified Files:
      Tag: slang-sio-branch
	bmi-tcp.c sockio.c 
Log Message:
small I/O changes in sio branch for now


Index: bmi-tcp.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi_tcp/bmi-tcp.c,v
diff -p -u -r1.96 -r1.96.2.1
--- bmi-tcp.c	25 Oct 2005 18:00:58 -0000	1.96
+++ bmi-tcp.c	4 Nov 2005 07:14:18 -0000	1.96.2.1
@@ -156,6 +156,7 @@ int BMI_tcp_post_sendunexpected_list(bmi
 int BMI_tcp_open_context(bmi_context_id context_id);
 void BMI_tcp_close_context(bmi_context_id context_id);
 int BMI_tcp_cancel(bmi_op_id_t id, bmi_context_id context_id);
+int BMI_tcp_get_unexp_maxsize(void);
 
 char BMI_tcp_method_name[] = "bmi_tcp";
 
@@ -304,7 +305,7 @@ struct bmi_method_ops bmi_tcp_ops = {
     BMI_tcp_open_context,
     BMI_tcp_close_context,
     BMI_tcp_cancel,
-    BMI_tcp_addr_rev_lookup_unexpected,
+    BMI_tcp_addr_rev_lookup_unexpected
 };
 
 /* module parameters */
@@ -806,6 +807,11 @@ int BMI_tcp_get_info(int option,
 	}
         ret = 0;
 	break;
+    case BMI_GET_UNEXP_SIZE:
+        *((int *) inout_parameter) = TCP_MODE_EAGER_LIMIT;
+        ret = 0;
+        break;
+
     default:
 	gossip_ldebug(GOSSIP_BMI_DEBUG_TCP,
                       "TCP hint %d not implemented.\n", option);

Index: sockio.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi_tcp/sockio.c,v
diff -p -u -r1.20 -r1.20.2.1
--- sockio.c	25 Oct 2005 18:00:58 -0000	1.20
+++ sockio.c	4 Nov 2005 07:14:18 -0000	1.20.2.1
@@ -190,6 +190,7 @@ int BMI_sockio_brecv(int s,
 	    return (-1);
 	}
 	comp -= ret;
+	buf = ((char *)buf) + ret;
 	buf = (char *) buf + ret;
     }
     fcntl(s, F_SETFL, oldfl|O_NONBLOCK);
@@ -225,7 +226,7 @@ int BMI_sockio_nbrecv(int s,
 	    return (-1);
 	}
 	comp -= ret;
-	buf = (char *) buf + ret;
+	buf = ((char *)buf) + ret;
     }
     return (len - comp);
 }
@@ -293,7 +294,7 @@ int BMI_sockio_bsend(int s,
 	    return (-1);
 	}
 	comp -= ret;
-	buf = (char *) buf + ret;
+	buf = ((char *)buf) + ret;
     }
     fcntl(s, F_SETFL, oldfl | O_NONBLOCK);
     return (len - comp);
@@ -321,7 +322,7 @@ int BMI_sockio_nbsend(int s,
 	else if (ret == -1)
 	    return (-1);
 	comp -= ret;
-	buf = (char *) buf + ret;
+	buf = ((char *)buf) + ret;
     }
     return (len - comp);
 }