From b2de55d72e133bdb5fc6bccf3d86ed5edc268e5f Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Thu, 5 Jan 2006 14:44:10 +0000 Subject: [PATCH] Back out some debugging stuff from a careless r8643 commit (only intended to include the OMPI_DEBUG_ZERO call). These debugging statements should not have affected correcteness because the value of 78 will be overridden in the read() and the assert()/abort() stuff will only be triggered on an error which should never happen (i.e., the error should have been handled by the prior if conditional). But still, thise code should not be there. This commit was SVN r8649. The following SVN revision numbers were found above: r8643 --> open-mpi/ompi@a6b869ed68f8be592419371eea5b36887efdb5f8 --- orte/mca/oob/tcp/oob_tcp.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/orte/mca/oob/tcp/oob_tcp.c b/orte/mca/oob/tcp/oob_tcp.c index 1a44a26ba2..fd24dbec6a 100644 --- a/orte/mca/oob/tcp/oob_tcp.c +++ b/orte/mca/oob/tcp/oob_tcp.c @@ -468,7 +468,6 @@ static void mca_oob_tcp_recv_handler(int sd, short flags, void* user) OMPI_DEBUG_ZERO(hdr); /* recv the process identifier */ - hdr.msg_src.cellid = 78; while((rc = recv(sd, (char *)&hdr, sizeof(hdr), 0)) != sizeof(hdr)) { if(rc >= 0) { if(mca_oob_tcp_component.tcp_debug > 1) { @@ -485,10 +484,6 @@ static void mca_oob_tcp_recv_handler(int sd, short flags, void* user) return; } } - assert(rc == sizeof(hdr)); - if (rc != sizeof(hdr)) { - abort(); - } MCA_OOB_TCP_HDR_NTOH(&hdr); /* dispatch based on message type */