[mpich2-commits] r5476 - mpich2/trunk/src/pm/smpd

[jayesh at mcs.anl.gov]

Author: jayesh
Date: 2009-10-16 11:31:58 -0500 (Fri, 16 Oct 2009)
New Revision: 5476

Modified:
   mpich2/trunk/src/pm/smpd/smpd_state_machine.c
Log:
Printing out the context name and event retval instead of a context id/number for sock events

Modified: mpich2/trunk/src/pm/smpd/smpd_state_machine.c
===================================================================
--- mpich2/trunk/src/pm/smpd/smpd_state_machine.c	2009-10-16 16:00:51 UTC (rev 5475)
+++ mpich2/trunk/src/pm/smpd/smpd_state_machine.c	2009-10-16 16:31:58 UTC (rev 5476)
@@ -7157,7 +7157,7 @@
 	switch (event.op_type)
 	{
 	case SMPDU_SOCK_OP_READ:
-	    smpd_dbg_printf("SOCK_OP_READ event.error = %d, result = %d, context->type=%d\n", event.error, result, context->type);
+	    smpd_dbg_printf("SOCK_OP_READ event.error = %d, result = %d, context=%s\n", event.error, result, smpd_get_context_str(context));
 	    if (event.error != SMPD_SUCCESS)
         {
 		    /* don't print EOF errors because they usually aren't errors */
@@ -7263,7 +7263,7 @@
 	    }
 	    break;
 	case SMPDU_SOCK_OP_WRITE:
-	    smpd_dbg_printf("SOCK_OP_WRITE\n");
+	    smpd_dbg_printf("SOCK_OP_WRITE event.error = %d, result = %d, context=%s\n", event.error, result, smpd_get_context_str(context));
 	    if (event.error != SMPD_SUCCESS)
 	    {
 		smpd_err_printf("op_write error on %s context: %s\n", smpd_get_context_str(context), get_sock_error_string(event.error));
@@ -7296,7 +7296,7 @@
 	    }
 	    break;
 	case SMPDU_SOCK_OP_ACCEPT:
-	    smpd_dbg_printf("SOCK_OP_ACCEPT\n");
+	    smpd_dbg_printf("SOCK_OP_ACCEPT event.error = %d, result = %d, context=%s\n", event.error, result, smpd_get_context_str(context));
 	    if (event.error != SMPD_SUCCESS)
 	    {
 		smpd_err_printf("error listening and accepting socket: %s\n", get_sock_error_string(event.error));
@@ -7329,7 +7329,7 @@
 	    }
 	    break;
 	case SMPDU_SOCK_OP_CONNECT:
-	    smpd_dbg_printf("SOCK_OP_CONNECT\n");
+	    smpd_dbg_printf("SOCK_OP_CONNECT event.error = %d, result = %d, context=%s\n", event.error, result, smpd_get_context_str(context));
 	    if (event.error != SMPD_SUCCESS)
 	    {
 		smpd_err_printf("op_connect error: %s\n", get_sock_error_string(event.error));
@@ -7366,7 +7366,8 @@
 	    }
 	    break;
 	case SMPDU_SOCK_OP_CLOSE:
-	    smpd_dbg_printf("SOCK_OP_CLOSE\n"); fflush(stdout);
+	    smpd_dbg_printf("SOCK_OP_CLOSE event.error = %d, result = %d, context=%s\n", event.error, result, smpd_get_context_str(context));
+        fflush(stdout);
 	    if (event.error != SMPD_SUCCESS)
 		smpd_err_printf("error closing the %s context socket: %s\n", smpd_get_context_str(context), get_sock_error_string(event.error));
 	    result = smpd_handle_op_close(context, &event);