resolve issues in cleanup

This commit was SVN r2086.

src/mca/ptl/tcp/src/ptl_tcp_peer.c

@@ -64,10 +64,15 @@ static void mca_ptl_tcp_peer_construct(mca_ptl_base_peer_t* ptl_peer)
 
 static void mca_ptl_tcp_peer_destruct(mca_ptl_base_peer_t* ptl_peer)
 {
-#if 0
+    OMPI_THREAD_LOCK(&ptl_peer->peer_send_lock);
+    OMPI_THREAD_LOCK(&ptl_peer->peer_recv_lock);
     mca_ptl_tcp_proc_remove(ptl_peer->peer_proc, ptl_peer);
-#endif
     mca_ptl_tcp_peer_close(ptl_peer);
+    OMPI_THREAD_UNLOCK(&ptl_peer->peer_send_lock);
+    OMPI_THREAD_UNLOCK(&ptl_peer->peer_recv_lock);
+    OBJ_DESTRUCT(&ptl_peer->peer_frags);
+    OBJ_DESTRUCT(&ptl_peer->peer_send_lock);
+    OBJ_DESTRUCT(&ptl_peer->peer_recv_lock);
 }
 
 /*

src/mca/ptl/tcp/src/ptl_tcp_proc.c

@@ -198,8 +198,8 @@ int mca_ptl_tcp_proc_remove(mca_ptl_tcp_proc_t* ptl_proc, mca_ptl_base_peer_t* p
     OMPI_THREAD_LOCK(&ptl_proc->proc_lock);
     for(i=0; i<ptl_proc->proc_peer_count; i++) {
         if(ptl_proc->proc_peers[i] == ptl_peer) {
-            memmove(ptl_proc->proc_peers+i,ptl_proc->proc_peers+i+1,
+            memmove(ptl_proc->proc_peers+i, ptl_proc->proc_peers+i+1,
-                (ptl_proc->proc_peer_count-i)*sizeof(mca_ptl_base_peer_t*));
+                (ptl_proc->proc_peer_count-i-1)*sizeof(mca_ptl_base_peer_t*));
             ptl_proc->proc_peer_count--;
             ptl_peer->peer_addr->addr_inuse--;
             break;