more verbose debuging infos

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

diff --git a/src/gras/Msg/gras_msg_listener.c b/src/gras/Msg/gras_msg_listener.c
index 284bf48..9b0f67d 100644 (file)
--- a/src/gras/Msg/gras_msg_listener.c
+++ b/src/gras/Msg/gras_msg_listener.c
@@ -51,8 +51,8 @@ static void listener_function(void *p)
     if (msg->type != msg_wakeup_listener_t) {
                /* Cannot display who sent this since in SG, gras_socket_peer_* wont work:
                   I'm not the user process but I'm just the listener. Too bad */
     if (msg->type != msg_wakeup_listener_t) {
                /* Cannot display who sent this since in SG, gras_socket_peer_* wont work:
                   I'm not the user process but I'm just the listener. Too bad */

-      VERB1("Got a '%s' message. Queue it for handling by main thread",
-            gras_msgtype_get_name(msg->type));
+      VERB3("Got a '%s' message (%s) from sock %p. Queue it for handling by main thread",
+            gras_msgtype_get_name(msg->type),e_gras_msg_kind_names[msg->kind],msg->expe);

       xbt_queue_push(me->incomming_messages, msg);
     } else {
       char got = *(char *) msg->payl;
       xbt_queue_push(me->incomming_messages, msg);
     } else {
       char got = *(char *) msg->payl;

diff --git a/src/gras/Msg/sg_msg.c b/src/gras/Msg/sg_msg.c
index 7f87f66..59f8089 100644 (file)
--- a/src/gras/Msg/sg_msg.c
+++ b/src/gras/Msg/sg_msg.c
@@ -79,7 +79,7 @@ gras_msg_t gras_msg_recv_any(void)
                 sock);
     /* End of paranoia */
 
                 sock);
     /* End of paranoia */
 

-    VERB3("Copy comm_recv %p rdv:%p (other rdv:%p)",
+    VERB3("Consider receiving messages from on comm_recv %p rdv:%p (other rdv:%p)",

           sock_data->comm_recv,
           (sock_data->server ==
            SIMIX_process_self())? sock_data->
           sock_data->comm_recv,
           (sock_data->server ==
            SIMIX_process_self())? sock_data->


@@ -96,23 +96,21 @@ gras_msg_t gras_msg_recv_any(void)
   /* retrieve the message sent in that communication */
   xbt_dynar_get_cpy(comms, got, &(comm));
   msg = SIMIX_communication_get_data(comm);
   /* retrieve the message sent in that communication */
   xbt_dynar_get_cpy(comms, got, &(comm));
   msg = SIMIX_communication_get_data(comm);

-  VERB1("Got something. Communication %p's over", comm);
+  sock = xbt_dynar_get_as(trp_proc->sockets, got, gras_socket_t);
+  sock_data = (gras_trp_sg_sock_data_t) sock->data;
+  VERB3("Got something. Communication %p's over rdv_server=%p, rdv_client=%p",
+      comm,sock_data->rdv_server,sock_data->rdv_client);

   SIMIX_communication_destroy(comm);
 
   /* Reinstall a waiting communication on that rdv */
   SIMIX_communication_destroy(comm);
 
   /* Reinstall a waiting communication on that rdv */

-  /* Get the sock again
-   * For that, we use the fact that */
-  sock = xbt_dynar_get_as(trp_proc->sockets, got, gras_socket_t);

 /*  xbt_dynar_foreach(trp_proc->sockets,cursor,sock) {
     sock_data = (gras_trp_sg_sock_data_t) sock->data;
     if (sock_data->comm_recv && sock_data->comm_recv == comm)
       break;
   }
   */
 /*  xbt_dynar_foreach(trp_proc->sockets,cursor,sock) {
     sock_data = (gras_trp_sg_sock_data_t) sock->data;
     if (sock_data->comm_recv && sock_data->comm_recv == comm)
       break;
   }
   */

-  sock_data = (gras_trp_sg_sock_data_t) sock->data;

   sock_data->comm_recv =
       SIMIX_network_irecv(sock_data->rdv_server != NULL ?
   sock_data->comm_recv =
       SIMIX_network_irecv(sock_data->rdv_server != NULL ?

-                          //(sock_data->server==SIMIX_process_self())?

                           sock_data->rdv_server
                           : sock_data->rdv_client, NULL, 0);
 
                           sock_data->rdv_server
                           : sock_data->rdv_client, NULL, 0);
 


@@ -144,7 +142,8 @@ void gras_msg_send_ext(gras_socket_t sock,
   msg->type = msgtype;
   msg->ID = ID;
 
   msg->type = msgtype;
   msg->ID = ID;
 

-  VERB2("Send msg %s to rdv %p", msgtype->name, target_rdv);
+  VERB4("Send msg %s (%s) to rdv %p sock %p",
+      msgtype->name,  e_gras_msg_kind_names[kind], target_rdv, sock);

 
   if (kind == e_gras_msg_kind_rpcerror) {
     /* error on remote host, careful, payload is an exception */
 
   if (kind == e_gras_msg_kind_rpcerror) {
     /* error on remote host, careful, payload is an exception */