sizes are unsigned long int

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1401 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/amok/bandwidth.h b/include/amok/bandwidth.h
index 2ed056b..9b2fcc0 100644 (file)
--- a/include/amok/bandwidth.h
+++ b/include/amok/bandwidth.h
@@ -35,7 +35,7 @@ void amok_bw_exit(void);
  * This call is blocking until the end of the experiment.
  */
 xbt_error_t amok_bw_test(gras_socket_t peer,
-                         unsigned int buf_size,unsigned int exp_size,unsigned int msg_size,
+                         unsigned long int buf_size,unsigned long int exp_size,unsigned long int msg_size,
                          /*OUT*/ double *sec, double *bw);
 
 #if 0   

diff --git a/src/amok/Bandwidth/bandwidth_private.h b/src/amok/Bandwidth/bandwidth_private.h
index a263c80..96507a2 100644 (file)
--- a/src/amok/Bandwidth/bandwidth_private.h
+++ b/src/amok/Bandwidth/bandwidth_private.h
@@ -25,9 +25,9 @@
  */
 typedef struct {
   xbt_host_t host; /* host+raw socket to use */
-  unsigned int buf_size;
-  unsigned int exp_size;
-  unsigned int msg_size;
+  unsigned long int buf_size;
+  unsigned long int exp_size;
+  unsigned long int msg_size;
 } s_bw_request_t,*bw_request_t;
 
 /**

diff --git a/src/gras/Transport/transport_interface.h b/src/gras/Transport/transport_interface.h
index cf1f5a0..595deab 100644 (file)
--- a/src/gras/Transport/transport_interface.h
+++ b/src/gras/Transport/transport_interface.h
@@ -57,11 +57,11 @@ struct gras_trp_plugin_ {
   void         (*socket_close)(gras_socket_t sd);
     
   xbt_error_t (*chunk_send)(gras_socket_t sd,
-                            const char *data,
-                            long int size);
+                            const char *data,
+                           unsigned long int size);
   xbt_error_t (*chunk_recv)(gras_socket_t sd,
-                            char *data,
-                            long int size);
+                           char *data,
+                           unsigned long int size);
 
   /* flush has to make sure that the pending communications are achieved */
   xbt_error_t (*flush)(gras_socket_t sd);

diff --git a/src/gras/Transport/transport_plugin_buf.c b/src/gras/Transport/transport_plugin_buf.c
index d640ab7..767c246 100644 (file)
--- a/src/gras/Transport/transport_plugin_buf.c
+++ b/src/gras/Transport/transport_plugin_buf.c
@@ -33,12 +33,12 @@ xbt_error_t gras_trp_buf_socket_accept(gras_socket_t sock,
 void         gras_trp_buf_socket_close(gras_socket_t sd);
   
 xbt_error_t gras_trp_buf_chunk_send(gras_socket_t sd,
-                                    const char *data,
-                                    long int size);
+                                   const char *data,
+                                   unsigned long int size);
 
 xbt_error_t gras_trp_buf_chunk_recv(gras_socket_t sd,
-                                    char *data,
-                                    long int size);
+                                   char *data,
+                                   unsigned long int size);
 xbt_error_t gras_trp_buf_flush(gras_socket_t sock);
 
 
@@ -187,12 +187,12 @@ void gras_trp_buf_socket_close(gras_socket_t sock){
 /**
  * gras_trp_buf_chunk_send:
  *
- * Send data on a TCP socket
+ * Send data on a buffered socket
  */
 xbt_error_t 
 gras_trp_buf_chunk_send(gras_socket_t sock,
                        const char *chunk,
-                       long int size) {
+                       unsigned long int size) {
 
   xbt_error_t errcode;
   gras_trp_bufdata_t *data=(gras_trp_bufdata_t*)sock->bufdata;
@@ -228,12 +228,12 @@ gras_trp_buf_chunk_send(gras_socket_t sock,
 /**
  * gras_trp_buf_chunk_recv:
  *
- * Receive data on a TCP socket.
+ * Receive data on a buffered socket.
  */
 xbt_error_t 
 gras_trp_buf_chunk_recv(gras_socket_t sock,
                        char *chunk,
-                       long int size) {
+                       unsigned long int size) {
 
   xbt_error_t errcode;
   gras_trp_plugin_t *super=((gras_trp_buf_plug_data_t*)sock->plugin->data)->super;

diff --git a/src/gras/Transport/transport_plugin_file.c b/src/gras/Transport/transport_plugin_file.c
index 466a67f..2e54bf1 100644 (file)
--- a/src/gras/Transport/transport_plugin_file.c
+++ b/src/gras/Transport/transport_plugin_file.c
@@ -23,12 +23,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(trp_file,transport,
 void         gras_trp_file_close(gras_socket_t sd);
   
 xbt_error_t gras_trp_file_chunk_send(gras_socket_t sd,
-                                     const char *data,
-                                     long int size);
+                                    const char *data,
+                                    unsigned long int size);
 
 xbt_error_t gras_trp_file_chunk_recv(gras_socket_t sd,
-                                     char *data,
-                                     long int size);
+                                    char *data,
+                                    unsigned long int size);
 
 
 /***
@@ -181,7 +181,7 @@ void gras_trp_file_close(gras_socket_t sock){
 xbt_error_t 
 gras_trp_file_chunk_send(gras_socket_t sock,
                         const char *data,
-                        long int size) {
+                        unsigned long int size) {
   
   xbt_assert0(sock->outgoing, "Cannot write on client file socket");
   xbt_assert0(size >= 0, "Cannot send a negative amount of data");
@@ -216,7 +216,7 @@ gras_trp_file_chunk_send(gras_socket_t sock,
 xbt_error_t 
 gras_trp_file_chunk_recv(gras_socket_t sock,
                        char *data,
-                       long int size) {
+                       unsigned long int size) {
 
   xbt_assert0(sock, "Cannot recv on an NULL socket");
   xbt_assert0(sock->incoming, "Cannot recv on client file socket");

diff --git a/src/gras/Transport/transport_plugin_sg.c b/src/gras/Transport/transport_plugin_sg.c
index cf6f53a..c12cb01 100644 (file)
--- a/src/gras/Transport/transport_plugin_sg.c
+++ b/src/gras/Transport/transport_plugin_sg.c
@@ -36,12 +36,12 @@ xbt_error_t gras_trp_sg_socket_server(gras_trp_plugin_t *self,
 void         gras_trp_sg_socket_close(gras_socket_t sd);
 
 xbt_error_t gras_trp_sg_chunk_send(gras_socket_t sd,
-                                   const char *data,
-                                   long int size);
+                                   const char *data,
+                                  unsigned long int size);
 
 xbt_error_t gras_trp_sg_chunk_recv(gras_socket_t sd,
-                                   char *data,
-                                   long int size);
+                                   char *data,
+                                  unsigned long int size);
 
 /***
  *** Specific plugin part
@@ -236,8 +236,8 @@ typedef struct {
 } sg_task_data_t;
 
 xbt_error_t gras_trp_sg_chunk_send(gras_socket_t sock,
-                                   const char *data,
-                                   long int size) {
+                                   const char *data,
+                                  unsigned long int size) {
   m_task_t task=NULL;
   static unsigned int count=0;
   char name[256];
@@ -264,8 +264,8 @@ xbt_error_t gras_trp_sg_chunk_send(gras_socket_t sock,
 }
 
 xbt_error_t gras_trp_sg_chunk_recv(gras_socket_t sock,
-                                   char *data,
-                                   long int size){
+                                   char *data,
+                                  unsigned long int size){
   gras_trp_procdata_t pd=(gras_trp_procdata_t)gras_libdata_get("gras_trp");
 
   m_task_t task=NULL;

diff --git a/src/gras/Transport/transport_plugin_tcp.c b/src/gras/Transport/transport_plugin_tcp.c
index 2683d7a..ee776c8 100644 (file)
--- a/src/gras/Transport/transport_plugin_tcp.c
+++ b/src/gras/Transport/transport_plugin_tcp.c
@@ -32,12 +32,12 @@ xbt_error_t gras_trp_tcp_socket_accept(gras_socket_t  sock,
 void         gras_trp_tcp_socket_close(gras_socket_t sd);
   
 xbt_error_t gras_trp_tcp_chunk_send(gras_socket_t sd,
-                                    const char *data,
-                                    long int size);
+                                   const char *data,
+                                   unsigned long int size);
 
 xbt_error_t gras_trp_tcp_chunk_recv(gras_socket_t sd,
-                                    char *data,
-                                    long int size);
+                                   char *data,
+                                   unsigned long int size);
 
 void gras_trp_tcp_exit(gras_trp_plugin_t *plug);
 
@@ -317,7 +317,7 @@ void gras_trp_tcp_socket_close(gras_socket_t sock){
 xbt_error_t 
 gras_trp_tcp_chunk_send(gras_socket_t sock,
                        const char *data,
-                       long int size) {
+                       unsigned long int size) {
   
   /* TCP sockets are in duplex mode, don't check direction */
   xbt_assert0(size >= 0, "Cannot send a negative amount of data");
@@ -353,7 +353,7 @@ gras_trp_tcp_chunk_send(gras_socket_t sock,
 xbt_error_t 
 gras_trp_tcp_chunk_recv(gras_socket_t sock,
                        char *data,
-                       long int size) {
+                       unsigned long int size) {
 
   /* TCP sockets are in duplex mode, don't check direction */
   xbt_assert0(sock, "Cannot recv on an NULL socket");
@@ -362,8 +362,8 @@ gras_trp_tcp_chunk_recv(gras_socket_t sock,
   while (size) {
     int status = 0;
     
-    status = tcp_read(sock->sd, data, (size_t)size);
     DEBUG3("read(%d, %p, %ld);", sock->sd, data, size);
+    status = tcp_read(sock->sd, data, (size_t)size);
     
     if (status < 0) {
       RAISE4(system_error,"read(%d,%p,%d) failed: %s",