Changeset 4906

Timestamp:

07/06/09 14:43:19 (8 months ago)

Author:

jayesh

Message:

1) When stdin is closed and there is no data to read don't send any data back to mpiexec or post a read on the fd - let the state machine close this fd gracefully (2) If a read on a socket fails because the socket is closed don't print an error msg - printing a debug mesg instead - This should fix ticket #633

Location:

mpich2/trunk/src/pm/smpd

Files:

• smpd_state_machine.c (modified) (2 diffs)
• sock/poll/smpd_sock_immed.i (modified) (1 diff)

mpich2/trunk/src/pm/smpd/smpd_state_machine.c

@@ -1005 +1005 @@
             smpd_dbg_printf("SMPDU_Sock_read(%d) failed (%s), assuming %s is closed.\n",
                 SMPDU_Sock_get_sock_id(context->sock), get_sock_error_string(result), smpd_get_context_str(context));
+            smpd_exit_fn(FCNAME);
+            return SMPD_FAIL;
         }
         smpd_dbg_printf("%d bytes read from %s\n", num_read+1, smpd_get_context_str(context));
@@ -1049 +1051 @@
             smpd_dbg_printf("SMPDU_Sock_read(%d) failed (%s), assuming %s is closed.\n",
                 SMPDU_Sock_get_sock_id(context->sock), get_sock_error_string(result), smpd_get_context_str(context));
+            smpd_exit_fn(FCNAME);
+            return SMPD_FAIL;
         }
         smpd_dbg_printf("%d bytes read from %s\n", num_read+1, smpd_get_context_str(context));

mpich2/trunk/src/pm/smpd/sock/poll/smpd_sock_immed.i

@@ -294 +294 @@
             pollinfo->sock_set->id, pollinfo->sock_id);
         */
-        smpd_err_printf("Trying to read from a closed socket, errno = %d (%s)\n", errno, strerror(errno));
+        smpd_dbg_printf("Trying to read from a closed socket, errno = %d (%s)\n", errno, strerror(errno));
         result = SMPD_FAIL;