Change all size_t into long int; Fix miscasted arguments of logging functions

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

diff --git a/src/gras/Transport/sg_transport.c b/src/gras/Transport/sg_transport.c
index 80bf996..2b23182 100644 (file)
--- a/src/gras/Transport/sg_transport.c
+++ b/src/gras/Transport/sg_transport.c
@@ -44,7 +44,7 @@ gras_trp_select(double timeout,
   int r_pid;
   gras_hostdata_t *remote_hd;
 
-  DEBUG3("select on %s@%s with timeout=%d",
+  DEBUG3("select on %s@%s with timeout=%f",
         MSG_process_get_name(MSG_process_self()),
         MSG_host_get_name(MSG_host_self()),
         timeout);

diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c
index bfa5a93..13b466e 100644 (file)
--- a/src/gras/Transport/transport.c
+++ b/src/gras/Transport/transport.c
@@ -250,7 +250,7 @@ void gras_socket_close(gras_socket_t *sock) {
 gras_error_t
 gras_trp_chunk_send(gras_socket_t *sd,
                    char *data,
-                   size_t size) {
+                   long int size) {
   gras_assert1(sd->outgoing,
               "Socket not suited for data send (outgoing=%c)",
               sd->outgoing?'y':'n');
@@ -267,7 +267,7 @@ gras_trp_chunk_send(gras_socket_t *sd,
 gras_error_t 
 gras_trp_chunk_recv(gras_socket_t *sd,
                    char *data,
-                   size_t size) {
+                   long int size) {
   gras_assert0(sd->incoming,
               "Socket not suited for data receive");
   gras_assert1(sd->plugin->chunk_recv,

diff --git a/src/gras/Transport/transport_interface.h b/src/gras/Transport/transport_interface.h
index f4395e7..4540a5e 100644 (file)
--- a/src/gras/Transport/transport_interface.h
+++ b/src/gras/Transport/transport_interface.h
@@ -18,10 +18,10 @@
  ***/
 gras_error_t gras_trp_chunk_send(gras_socket_t *sd,
                                 char *data,
-                                size_t size);
+                                long int size);
 gras_error_t gras_trp_chunk_recv(gras_socket_t *sd,
                                 char *data,
-                                size_t size);
+                                long int size);
 
 /* Find which socket needs to be read next */
 gras_error_t 
@@ -66,10 +66,10 @@ struct gras_trp_plugin_ {
     
   gras_error_t (*chunk_send)(gras_socket_t *sd,
                             char *data,
-                            size_t size);
+                            long int size);
   gras_error_t (*chunk_recv)(gras_socket_t *sd,
                             char *Data,
-                            size_t size);
+                            long int size);
 
   void          *data;
  

diff --git a/src/gras/Transport/transport_plugin_file.c b/src/gras/Transport/transport_plugin_file.c
index 6a52c08..fd17106 100644 (file)
--- a/src/gras/Transport/transport_plugin_file.c
+++ b/src/gras/Transport/transport_plugin_file.c
@@ -25,11 +25,11 @@ void         gras_trp_file_close(gras_socket_t *sd);
   
 gras_error_t gras_trp_file_chunk_send(gras_socket_t *sd,
                                      char *data,
-                                     size_t size);
+                                     long int size);
 
 gras_error_t gras_trp_file_chunk_recv(gras_socket_t *sd,
                                      char *data,
-                                     size_t size);
+                                     long int size);
 
 
 /***
@@ -186,7 +186,7 @@ void gras_trp_file_close(gras_socket_t *sock){
 gras_error_t 
 gras_trp_file_chunk_send(gras_socket_t *sock,
                         char *data,
-                        size_t size) {
+                        long int size) {
   
   gras_assert0(sock->outgoing, "Cannot write on client file socket");
   gras_assert0(size >= 0, "Cannot send a negative amount of data");
@@ -194,8 +194,8 @@ gras_trp_file_chunk_send(gras_socket_t *sock,
   while (size) {
     int status = 0;
     
-    DEBUG3("write(%d, %p, %ld);", sock->sd, data, (size_t)size);
-    status = write(sock->sd, data, (size_t)size);
+    DEBUG3("write(%d, %p, %ld);", sock->sd, data, (long int)size);
+    status = write(sock->sd, data, (long int)size);
     
     if (status == -1) {
       RAISE4(system_error,"write(%d,%p,%d) failed: %s",
@@ -221,7 +221,7 @@ gras_trp_file_chunk_send(gras_socket_t *sock,
 gras_error_t 
 gras_trp_file_chunk_recv(gras_socket_t *sock,
                        char *data,
-                       size_t size) {
+                       long int size) {
 
   gras_assert0(sock, "Cannot recv on an NULL socket");
   gras_assert0(sock->incoming, "Cannot recv on client file socket");
@@ -230,7 +230,7 @@ gras_trp_file_chunk_recv(gras_socket_t *sock,
   while (size) {
     int status = 0;
     
-    status = read(sock->sd, data, (size_t)size);
+    status = read(sock->sd, data, (long int)size);
     DEBUG3("read(%d, %p, %ld);", sock->sd, data, size);
     
     if (status == -1) {

diff --git a/src/gras/Transport/transport_plugin_sg.c b/src/gras/Transport/transport_plugin_sg.c
index 6cd4396..435174e 100644 (file)
--- a/src/gras/Transport/transport_plugin_sg.c
+++ b/src/gras/Transport/transport_plugin_sg.c
@@ -40,11 +40,11 @@ void         gras_trp_sg_socket_close(gras_socket_t *sd);
 
 gras_error_t gras_trp_sg_chunk_send(gras_socket_t *sd,
                                    char *data,
-                                   size_t size);
+                                   long int size);
 
 gras_error_t gras_trp_sg_chunk_recv(gras_socket_t *sd,
                                    char *data,
-                                   size_t size);
+                                   long int size);
 
 /* FIXME
   gras_error_t gras_trp_sg_flush(gras_socket_t *sd);
@@ -208,7 +208,7 @@ gras_error_t gras_trp_sg_socket_server(gras_trp_plugin_t *self,
 
   INFO6("'%s' (%d) ears on %s:%d%s (%p)",
     MSG_process_get_name(MSG_process_self()), MSG_process_self_PID(),
-    host,port,sock->raw? " (mode RAW)":"",*sock);
+    host,port,sock->raw? " (mode RAW)":"",sock);
 
   return no_error;
 }
@@ -245,7 +245,7 @@ typedef struct {
 
 gras_error_t gras_trp_sg_chunk_send(gras_socket_t *sock,
                                    char *data,
-                                   size_t size) {
+                                   long int size) {
   m_task_t task=NULL;
   static unsigned int count=0;
   char name[256];
@@ -277,7 +277,7 @@ gras_error_t gras_trp_sg_chunk_send(gras_socket_t *sock,
 
 gras_error_t gras_trp_sg_chunk_recv(gras_socket_t *sock,
                                    char *data,
-                                   size_t size){
+                                   long int size){
   gras_procdata_t *pd=gras_procdata_get();
 
   m_task_t task=NULL;
@@ -292,7 +292,7 @@ gras_error_t gras_trp_sg_chunk_recv(gras_socket_t *sock,
 
   task_data = MSG_task_get_data(task);
   gras_assert2(task_data->size == size,
-              "Got %d bytes when %d where expected",
+              "Got %d bytes when %ld where expected",
               task_data->size, size);
   memcpy(data,task_data->data,size);
   free(task_data->data);

diff --git a/src/gras/Transport/transport_plugin_tcp.c b/src/gras/Transport/transport_plugin_tcp.c
index 5692504..b4a0512 100644 (file)
--- a/src/gras/Transport/transport_plugin_tcp.c
+++ b/src/gras/Transport/transport_plugin_tcp.c
@@ -43,11 +43,11 @@ void         gras_trp_tcp_socket_close(gras_socket_t *sd);
   
 gras_error_t gras_trp_tcp_chunk_send(gras_socket_t *sd,
                                     char *data,
-                                    size_t size);
+                                    long int size);
 
 gras_error_t gras_trp_tcp_chunk_recv(gras_socket_t *sd,
                                     char *data,
-                                    size_t size);
+                                    long int size);
 
 void gras_trp_tcp_exit(gras_trp_plugin_t *plug);
 
@@ -308,8 +308,8 @@ void gras_trp_tcp_socket_close(gras_socket_t *sock){
  */
 gras_error_t 
 gras_trp_tcp_chunk_send(gras_socket_t *sock,
-                   char *data,
-                   size_t size) {
+                       char *data,
+                       long int size) {
   
   /* TCP sockets are in duplex mode, don't check direction */
   gras_assert0(size >= 0, "Cannot send a negative amount of data");
@@ -321,8 +321,8 @@ gras_trp_tcp_chunk_send(gras_socket_t *sock,
     DEBUG3("write(%d, %p, %ld);", sock->sd, data, size);
     
     if (status == -1) {
-      RAISE4(system_error,"write(%d,%p,%d) failed: %s",
-            sock->sd, data, (int)size,
+      RAISE4(system_error,"write(%d,%p,%ld) failed: %s",
+            sock->sd, data, size,
             strerror(errno));
     }
     
@@ -344,7 +344,7 @@ gras_trp_tcp_chunk_send(gras_socket_t *sock,
 gras_error_t 
 gras_trp_tcp_chunk_recv(gras_socket_t *sock,
                        char *data,
-                       size_t size) {
+                       long int size) {
 
   /* TCP sockets are in duplex mode, don't check direction */
   gras_assert0(sock, "Cannot recv on an NULL socket");