From sridharj at mvapich.cse.ohio-state.edu Tue Sep 2 12:09:25 2008 From: sridharj at mvapich.cse.ohio-state.edu (sridharj@mvapich.cse.ohio-state.edu) Date: Tue Sep 2 12:09:40 2008 Subject: [mvapich-commit] r2963 - in mvapich2/trunk/src/pm/mpirun: include mpispawn Message-ID: <200809021609.m82G9Puk013050@mvapich.cse.ohio-state.edu> Author: sridharj Date: 2008-09-02 12:09:24 -0400 (Tue, 02 Sep 2008) New Revision: 2963 Modified: mvapich2/trunk/src/pm/mpirun/include/mpispawn_tree.h mvapich2/trunk/src/pm/mpirun/mpispawn/mpispawn.c Log: Cleaner error handling for mpirun framework. Modified: mvapich2/trunk/src/pm/mpirun/include/mpispawn_tree.h =================================================================== --- mvapich2/trunk/src/pm/mpirun/include/mpispawn_tree.h 2008-08-29 20:45:30 UTC (rev 2962) +++ mvapich2/trunk/src/pm/mpirun/include/mpispawn_tree.h 2008-09-02 16:09:24 UTC (rev 2963) @@ -25,6 +25,7 @@ #define MPISPAWN_PMGR_ABORT -2 #define MPISPAWN_RANK_ERROR -3 #define MPISPAWN_MT_ERROR -4 +#define MPISPAWN_PROCESS_ABORT -5 #define MAX_HOST_LEN 256 #define MAX_PORT_LEN 8 Modified: mvapich2/trunk/src/pm/mpirun/mpispawn/mpispawn.c =================================================================== --- mvapich2/trunk/src/pm/mpirun/mpispawn/mpispawn.c 2008-08-29 20:45:30 UTC (rev 2962) +++ mvapich2/trunk/src/pm/mpirun/mpispawn/mpispawn.c 2008-09-02 16:09:24 UTC (rev 2963) @@ -49,8 +49,6 @@ void mpispawn_abort (int abort_code) { int sock, id=env2int ("MPISPAWN_ID"); - fprintf (stderr, "MPISPAWN_ABORT %d\n", abort_code); - fflush (stderr); sock = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP); if (sock < 0) { /* Oops! */ @@ -78,7 +76,7 @@ write_socket (sock, &id, sizeof (int)); close (sock); } - while (1); + cleanup (); } lvalues get_lvalues(int i) { @@ -276,7 +274,7 @@ void cleanup_handler(int sig) { printf("Signal %d received.\n", sig); - cleanup(); + mpispawn_abort (MPISPAWN_PROCESS_ABORT); } void child_handler(int signal) { @@ -298,7 +296,7 @@ else { fprintf (stderr, "MPI process terminated unexpectedly\n"); - cleanup(); + mpispawn_abort (MPISPAWN_PROCESS_ABORT); } } } From perkinjo at mvapich.cse.ohio-state.edu Wed Sep 3 11:38:56 2008 From: perkinjo at mvapich.cse.ohio-state.edu (perkinjo@mvapich.cse.ohio-state.edu) Date: Wed Sep 3 11:39:11 2008 Subject: [mvapich-commit] r2966 - in mvapich/branches/1.0/mpid: ch_gen2/process ch_psm/process ch_smp/process Message-ID: <200809031538.m83Fcul6022831@mvapich.cse.ohio-state.edu> Author: perkinjo Date: 2008-09-03 11:38:54 -0400 (Wed, 03 Sep 2008) New Revision: 2966 Modified: mvapich/branches/1.0/mpid/ch_gen2/process/mpispawn.c mvapich/branches/1.0/mpid/ch_gen2/process/mpispawn_tree.h mvapich/branches/1.0/mpid/ch_psm/process/mpispawn.c mvapich/branches/1.0/mpid/ch_psm/process/mpispawn_tree.h mvapich/branches/1.0/mpid/ch_smp/process/mpispawn.c mvapich/branches/1.0/mpid/ch_smp/process/mpispawn_tree.h Log: Cleaner error handling for mpirun framework. Modified: mvapich/branches/1.0/mpid/ch_gen2/process/mpispawn.c =================================================================== --- mvapich/branches/1.0/mpid/ch_gen2/process/mpispawn.c 2008-09-02 16:33:15 UTC (rev 2965) +++ mvapich/branches/1.0/mpid/ch_gen2/process/mpispawn.c 2008-09-03 15:38:54 UTC (rev 2966) @@ -72,6 +72,7 @@ write_socket (sock, &id, sizeof (int)); close (sock); } + cleanup (); } lvalues get_lvalues(int i) { @@ -279,7 +280,7 @@ void cleanup_handler(int sig) { printf("Signal %d received.\n", sig); - cleanup(); + mpispawn_abort (MPISPAWN_PROCESS_ABORT); } void child_handler(int signal) { @@ -301,7 +302,7 @@ else { fprintf (stderr, "MPI process terminated unexpectedly\n"); - cleanup(); + mpispawn_abort (MPISPAWN_PROCESS_ABORT); } } } Modified: mvapich/branches/1.0/mpid/ch_gen2/process/mpispawn_tree.h =================================================================== --- mvapich/branches/1.0/mpid/ch_gen2/process/mpispawn_tree.h 2008-09-02 16:33:15 UTC (rev 2965) +++ mvapich/branches/1.0/mpid/ch_gen2/process/mpispawn_tree.h 2008-09-03 15:38:54 UTC (rev 2966) @@ -24,6 +24,7 @@ #define MPISPAWN_PMGR_ERROR -1 #define MPISPAWN_PMGR_ABORT -2 #define MPISPAWN_RANK_ERROR -3 +#define MPISPAWN_PROCESS_ABORT -5 #define MAX_HOST_LEN 256 #define MAX_PORT_LEN 8 Modified: mvapich/branches/1.0/mpid/ch_psm/process/mpispawn.c =================================================================== --- mvapich/branches/1.0/mpid/ch_psm/process/mpispawn.c 2008-09-02 16:33:15 UTC (rev 2965) +++ mvapich/branches/1.0/mpid/ch_psm/process/mpispawn.c 2008-09-03 15:38:54 UTC (rev 2966) @@ -72,6 +72,7 @@ write_socket (sock, &id, sizeof (int)); close (sock); } + cleanup (); } lvalues get_lvalues(int i) { @@ -279,7 +280,7 @@ void cleanup_handler(int sig) { printf("Signal %d received.\n", sig); - cleanup(); + mpispawn_abort (MPISPAWN_PROCESS_ABORT); } void child_handler(int signal) { @@ -301,7 +302,7 @@ else { fprintf (stderr, "MPI process terminated unexpectedly\n"); - cleanup(); + mpispawn_abort (MPISPAWN_PROCESS_ABORT); } } } Modified: mvapich/branches/1.0/mpid/ch_psm/process/mpispawn_tree.h =================================================================== --- mvapich/branches/1.0/mpid/ch_psm/process/mpispawn_tree.h 2008-09-02 16:33:15 UTC (rev 2965) +++ mvapich/branches/1.0/mpid/ch_psm/process/mpispawn_tree.h 2008-09-03 15:38:54 UTC (rev 2966) @@ -24,6 +24,7 @@ #define MPISPAWN_PMGR_ERROR -1 #define MPISPAWN_PMGR_ABORT -2 #define MPISPAWN_RANK_ERROR -3 +#define MPISPAWN_PROCESS_ABORT -5 #define MAX_HOST_LEN 256 #define MAX_PORT_LEN 8 Modified: mvapich/branches/1.0/mpid/ch_smp/process/mpispawn.c =================================================================== --- mvapich/branches/1.0/mpid/ch_smp/process/mpispawn.c 2008-09-02 16:33:15 UTC (rev 2965) +++ mvapich/branches/1.0/mpid/ch_smp/process/mpispawn.c 2008-09-03 15:38:54 UTC (rev 2966) @@ -72,6 +72,7 @@ write_socket (sock, &id, sizeof (int)); close (sock); } + cleanup (); } lvalues get_lvalues(int i) { @@ -279,7 +280,7 @@ void cleanup_handler(int sig) { printf("Signal %d received.\n", sig); - cleanup(); + mpispawn_abort (MPISPAWN_PROCESS_ABORT); } void child_handler(int signal) { @@ -301,7 +302,7 @@ else { fprintf (stderr, "MPI process terminated unexpectedly\n"); - cleanup(); + mpispawn_abort (MPISPAWN_PROCESS_ABORT); } } } Modified: mvapich/branches/1.0/mpid/ch_smp/process/mpispawn_tree.h =================================================================== --- mvapich/branches/1.0/mpid/ch_smp/process/mpispawn_tree.h 2008-09-02 16:33:15 UTC (rev 2965) +++ mvapich/branches/1.0/mpid/ch_smp/process/mpispawn_tree.h 2008-09-03 15:38:54 UTC (rev 2966) @@ -24,6 +24,7 @@ #define MPISPAWN_PMGR_ERROR -1 #define MPISPAWN_PMGR_ABORT -2 #define MPISPAWN_RANK_ERROR -3 +#define MPISPAWN_PROCESS_ABORT -5 #define MAX_HOST_LEN 256 #define MAX_PORT_LEN 8 From sridharj at mvapich.cse.ohio-state.edu Wed Sep 3 11:53:15 2008 From: sridharj at mvapich.cse.ohio-state.edu (sridharj@mvapich.cse.ohio-state.edu) Date: Wed Sep 3 11:53:28 2008 Subject: [mvapich-commit] r2967 - mvapich/branches/1.0/mpid/ch_gen2_ud/process Message-ID: <200809031553.m83FrFbc022864@mvapich.cse.ohio-state.edu> Author: sridharj Date: 2008-09-03 11:53:14 -0400 (Wed, 03 Sep 2008) New Revision: 2967 Modified: mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpispawn.c mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpispawn_tree.h Log: r2966 for UD device. Modified: mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpispawn.c =================================================================== --- mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpispawn.c 2008-09-03 15:38:54 UTC (rev 2966) +++ mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpispawn.c 2008-09-03 15:53:14 UTC (rev 2967) @@ -72,6 +72,7 @@ write_socket (sock, &id, sizeof (int)); close (sock); } + cleanup (); } lvalues get_lvalues(int i) { @@ -279,7 +280,7 @@ void cleanup_handler(int sig) { printf("Signal %d received.\n", sig); - cleanup(); + mpispawn_abort (MPISPAWN_PROCESS_ABORT); } void child_handler(int signal) { @@ -301,7 +302,7 @@ else { fprintf (stderr, "MPI process terminated unexpectedly\n"); - cleanup(); + mpispawn_abort (MPISPAWN_PROCESS_ABORT); } } } Modified: mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpispawn_tree.h =================================================================== --- mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpispawn_tree.h 2008-09-03 15:38:54 UTC (rev 2966) +++ mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpispawn_tree.h 2008-09-03 15:53:14 UTC (rev 2967) @@ -24,6 +24,7 @@ #define MPISPAWN_PMGR_ERROR -1 #define MPISPAWN_PMGR_ABORT -2 #define MPISPAWN_RANK_ERROR -3 +#define MPISPAWN_PROCESS_ABORT -5 #define MAX_HOST_LEN 256 #define MAX_PORT_LEN 8 From sridharj at mvapich.cse.ohio-state.edu Wed Sep 3 12:12:35 2008 From: sridharj at mvapich.cse.ohio-state.edu (sridharj@mvapich.cse.ohio-state.edu) Date: Wed Sep 3 12:12:50 2008 Subject: [mvapich-commit] r2968 - in mvapich/trunk/mpid: ch_gen2/process ch_gen2_ud/process ch_psm/process ch_smp/process Message-ID: <200809031612.m83GCZiZ022927@mvapich.cse.ohio-state.edu> Author: sridharj Date: 2008-09-03 12:12:34 -0400 (Wed, 03 Sep 2008) New Revision: 2968 Modified: mvapich/trunk/mpid/ch_gen2/process/mpispawn.c mvapich/trunk/mpid/ch_gen2/process/mpispawn_tree.h mvapich/trunk/mpid/ch_gen2_ud/process/mpispawn.c mvapich/trunk/mpid/ch_gen2_ud/process/mpispawn_tree.h mvapich/trunk/mpid/ch_psm/process/mpispawn.c mvapich/trunk/mpid/ch_psm/process/mpispawn_tree.h mvapich/trunk/mpid/ch_smp/process/mpispawn.c mvapich/trunk/mpid/ch_smp/process/mpispawn_tree.h Log: Cleaner handling of job aborts. Modified: mvapich/trunk/mpid/ch_gen2/process/mpispawn.c =================================================================== --- mvapich/trunk/mpid/ch_gen2/process/mpispawn.c 2008-09-03 15:53:14 UTC (rev 2967) +++ mvapich/trunk/mpid/ch_gen2/process/mpispawn.c 2008-09-03 16:12:34 UTC (rev 2968) @@ -72,6 +72,7 @@ write_socket (sock, &id, sizeof (int)); close (sock); } + cleanup (); } lvalues get_lvalues(int i) { @@ -279,7 +280,7 @@ void cleanup_handler(int sig) { printf("Signal %d received.\n", sig); - cleanup(); + mpispawn_abort (MPISPAWN_PROCESS_ABORT); } void child_handler(int signal) { @@ -301,7 +302,7 @@ else { fprintf (stderr, "MPI process terminated unexpectedly\n"); - cleanup(); + mpispawn_abort (MPISPAWN_PROCESS_ABORT); } } } Modified: mvapich/trunk/mpid/ch_gen2/process/mpispawn_tree.h =================================================================== --- mvapich/trunk/mpid/ch_gen2/process/mpispawn_tree.h 2008-09-03 15:53:14 UTC (rev 2967) +++ mvapich/trunk/mpid/ch_gen2/process/mpispawn_tree.h 2008-09-03 16:12:34 UTC (rev 2968) @@ -24,6 +24,7 @@ #define MPISPAWN_PMGR_ERROR -1 #define MPISPAWN_PMGR_ABORT -2 #define MPISPAWN_RANK_ERROR -3 +#define MPISPAWN_PROCESS_ABORT -5 #define MAX_HOST_LEN 256 #define MAX_PORT_LEN 8 Modified: mvapich/trunk/mpid/ch_gen2_ud/process/mpispawn.c =================================================================== --- mvapich/trunk/mpid/ch_gen2_ud/process/mpispawn.c 2008-09-03 15:53:14 UTC (rev 2967) +++ mvapich/trunk/mpid/ch_gen2_ud/process/mpispawn.c 2008-09-03 16:12:34 UTC (rev 2968) @@ -72,6 +72,7 @@ write_socket (sock, &id, sizeof (int)); close (sock); } + cleanup (); } lvalues get_lvalues(int i) { @@ -279,7 +280,7 @@ void cleanup_handler(int sig) { printf("Signal %d received.\n", sig); - cleanup(); + mpispawn_abort (MPISPAWN_PROCESS_ABORT); } void child_handler(int signal) { @@ -301,7 +302,7 @@ else { fprintf (stderr, "MPI process terminated unexpectedly\n"); - cleanup(); + mpispawn_abort (MPISPAWN_PROCESS_ABORT); } } } Modified: mvapich/trunk/mpid/ch_gen2_ud/process/mpispawn_tree.h =================================================================== --- mvapich/trunk/mpid/ch_gen2_ud/process/mpispawn_tree.h 2008-09-03 15:53:14 UTC (rev 2967) +++ mvapich/trunk/mpid/ch_gen2_ud/process/mpispawn_tree.h 2008-09-03 16:12:34 UTC (rev 2968) @@ -24,6 +24,7 @@ #define MPISPAWN_PMGR_ERROR -1 #define MPISPAWN_PMGR_ABORT -2 #define MPISPAWN_RANK_ERROR -3 +#define MPISPAWN_PROCESS_ABORT -5 #define MAX_HOST_LEN 256 #define MAX_PORT_LEN 8 Modified: mvapich/trunk/mpid/ch_psm/process/mpispawn.c =================================================================== --- mvapich/trunk/mpid/ch_psm/process/mpispawn.c 2008-09-03 15:53:14 UTC (rev 2967) +++ mvapich/trunk/mpid/ch_psm/process/mpispawn.c 2008-09-03 16:12:34 UTC (rev 2968) @@ -72,6 +72,7 @@ write_socket (sock, &id, sizeof (int)); close (sock); } + cleanup (); } lvalues get_lvalues(int i) { @@ -279,7 +280,7 @@ void cleanup_handler(int sig) { printf("Signal %d received.\n", sig); - cleanup(); + mpispawn_abort (MPISPAWN_PROCESS_ABORT); } void child_handler(int signal) { @@ -301,7 +302,7 @@ else { fprintf (stderr, "MPI process terminated unexpectedly\n"); - cleanup(); + mpispawn_abort (MPISPAWN_PROCESS_ABORT); } } } Modified: mvapich/trunk/mpid/ch_psm/process/mpispawn_tree.h =================================================================== --- mvapich/trunk/mpid/ch_psm/process/mpispawn_tree.h 2008-09-03 15:53:14 UTC (rev 2967) +++ mvapich/trunk/mpid/ch_psm/process/mpispawn_tree.h 2008-09-03 16:12:34 UTC (rev 2968) @@ -24,6 +24,7 @@ #define MPISPAWN_PMGR_ERROR -1 #define MPISPAWN_PMGR_ABORT -2 #define MPISPAWN_RANK_ERROR -3 +#define MPISPAWN_PROCESS_ABORT -5 #define MAX_HOST_LEN 256 #define MAX_PORT_LEN 8 Modified: mvapich/trunk/mpid/ch_smp/process/mpispawn.c =================================================================== --- mvapich/trunk/mpid/ch_smp/process/mpispawn.c 2008-09-03 15:53:14 UTC (rev 2967) +++ mvapich/trunk/mpid/ch_smp/process/mpispawn.c 2008-09-03 16:12:34 UTC (rev 2968) @@ -72,6 +72,7 @@ write_socket (sock, &id, sizeof (int)); close (sock); } + cleanup (); } lvalues get_lvalues(int i) { @@ -279,7 +280,7 @@ void cleanup_handler(int sig) { printf("Signal %d received.\n", sig); - cleanup(); + mpispawn_abort (MPISPAWN_PROCESS_ABORT); } void child_handler(int signal) { @@ -301,7 +302,7 @@ else { fprintf (stderr, "MPI process terminated unexpectedly\n"); - cleanup(); + mpispawn_abort (MPISPAWN_PROCESS_ABORT); } } } Modified: mvapich/trunk/mpid/ch_smp/process/mpispawn_tree.h =================================================================== --- mvapich/trunk/mpid/ch_smp/process/mpispawn_tree.h 2008-09-03 15:53:14 UTC (rev 2967) +++ mvapich/trunk/mpid/ch_smp/process/mpispawn_tree.h 2008-09-03 16:12:34 UTC (rev 2968) @@ -24,6 +24,7 @@ #define MPISPAWN_PMGR_ERROR -1 #define MPISPAWN_PMGR_ABORT -2 #define MPISPAWN_RANK_ERROR -3 +#define MPISPAWN_PROCESS_ABORT -5 #define MAX_HOST_LEN 256 #define MAX_PORT_LEN 8 From perkinjo at mvapich.cse.ohio-state.edu Thu Sep 4 16:51:52 2008 From: perkinjo at mvapich.cse.ohio-state.edu (perkinjo@mvapich.cse.ohio-state.edu) Date: Thu Sep 4 16:52:07 2008 Subject: [mvapich-commit] r2969 - in mvapich/branches/1.0/mpid: ch_gen2/process ch_gen2_ud/process ch_psm/process ch_smp/process Message-ID: <200809042051.m84KpqQL032649@mvapich.cse.ohio-state.edu> Author: perkinjo Date: 2008-09-04 16:51:50 -0400 (Thu, 04 Sep 2008) New Revision: 2969 Modified: mvapich/branches/1.0/mpid/ch_gen2/process/mpispawn.h mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpispawn.h mvapich/branches/1.0/mpid/ch_psm/process/mpispawn.h mvapich/branches/1.0/mpid/ch_smp/process/mpispawn.h Log: Prevent possible compilation error for using a function before it is declared. Modified: mvapich/branches/1.0/mpid/ch_gen2/process/mpispawn.h =================================================================== --- mvapich/branches/1.0/mpid/ch_gen2/process/mpispawn.h 2008-09-03 16:12:34 UTC (rev 2968) +++ mvapich/branches/1.0/mpid/ch_gen2/process/mpispawn.h 2008-09-04 20:51:50 UTC (rev 2969) @@ -14,5 +14,7 @@ #include "mpirun_rsh.h" +void cleanup (void); + #endif /* vi:set sw=4 sts=4 tw=80: */ Modified: mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpispawn.h =================================================================== --- mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpispawn.h 2008-09-03 16:12:34 UTC (rev 2968) +++ mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpispawn.h 2008-09-04 20:51:50 UTC (rev 2969) @@ -14,5 +14,7 @@ #include "mpirun_rsh.h" +void cleanup (void); + #endif /* vi:set sw=4 sts=4 tw=80: */ Modified: mvapich/branches/1.0/mpid/ch_psm/process/mpispawn.h =================================================================== --- mvapich/branches/1.0/mpid/ch_psm/process/mpispawn.h 2008-09-03 16:12:34 UTC (rev 2968) +++ mvapich/branches/1.0/mpid/ch_psm/process/mpispawn.h 2008-09-04 20:51:50 UTC (rev 2969) @@ -14,5 +14,7 @@ #include "mpirun_rsh.h" +void cleanup (void); + #endif /* vi:set sw=4 sts=4 tw=80: */ Modified: mvapich/branches/1.0/mpid/ch_smp/process/mpispawn.h =================================================================== --- mvapich/branches/1.0/mpid/ch_smp/process/mpispawn.h 2008-09-03 16:12:34 UTC (rev 2968) +++ mvapich/branches/1.0/mpid/ch_smp/process/mpispawn.h 2008-09-04 20:51:50 UTC (rev 2969) @@ -14,5 +14,7 @@ #include "mpirun_rsh.h" +void cleanup (void); + #endif /* vi:set sw=4 sts=4 tw=80: */ From perkinjo at mvapich.cse.ohio-state.edu Thu Sep 4 16:54:03 2008 From: perkinjo at mvapich.cse.ohio-state.edu (perkinjo@mvapich.cse.ohio-state.edu) Date: Thu Sep 4 16:54:18 2008 Subject: [mvapich-commit] r2971 - in mvapich/trunk/mpid: ch_gen2/process ch_gen2_ud/process ch_psm/process ch_smp/process Message-ID: <200809042054.m84Ks32G032685@mvapich.cse.ohio-state.edu> Author: perkinjo Date: 2008-09-04 16:54:03 -0400 (Thu, 04 Sep 2008) New Revision: 2971 Modified: mvapich/trunk/mpid/ch_gen2/process/mpispawn.h mvapich/trunk/mpid/ch_gen2_ud/process/mpispawn.h mvapich/trunk/mpid/ch_psm/process/mpispawn.h mvapich/trunk/mpid/ch_smp/process/mpispawn.h Log: Prevent possible compilation error for using a function before it is declared. Modified: mvapich/trunk/mpid/ch_gen2/process/mpispawn.h =================================================================== --- mvapich/trunk/mpid/ch_gen2/process/mpispawn.h 2008-09-04 20:52:33 UTC (rev 2970) +++ mvapich/trunk/mpid/ch_gen2/process/mpispawn.h 2008-09-04 20:54:03 UTC (rev 2971) @@ -14,5 +14,7 @@ #include "mpirun_rsh.h" +void cleanup (void); + #endif /* vi:set sw=4 sts=4 tw=80: */ Modified: mvapich/trunk/mpid/ch_gen2_ud/process/mpispawn.h =================================================================== --- mvapich/trunk/mpid/ch_gen2_ud/process/mpispawn.h 2008-09-04 20:52:33 UTC (rev 2970) +++ mvapich/trunk/mpid/ch_gen2_ud/process/mpispawn.h 2008-09-04 20:54:03 UTC (rev 2971) @@ -14,5 +14,7 @@ #include "mpirun_rsh.h" +void cleanup (void); + #endif /* vi:set sw=4 sts=4 tw=80: */ Modified: mvapich/trunk/mpid/ch_psm/process/mpispawn.h =================================================================== --- mvapich/trunk/mpid/ch_psm/process/mpispawn.h 2008-09-04 20:52:33 UTC (rev 2970) +++ mvapich/trunk/mpid/ch_psm/process/mpispawn.h 2008-09-04 20:54:03 UTC (rev 2971) @@ -14,5 +14,7 @@ #include "mpirun_rsh.h" +void cleanup (void); + #endif /* vi:set sw=4 sts=4 tw=80: */ Modified: mvapich/trunk/mpid/ch_smp/process/mpispawn.h =================================================================== --- mvapich/trunk/mpid/ch_smp/process/mpispawn.h 2008-09-04 20:52:33 UTC (rev 2970) +++ mvapich/trunk/mpid/ch_smp/process/mpispawn.h 2008-09-04 20:54:03 UTC (rev 2971) @@ -14,5 +14,7 @@ #include "mpirun_rsh.h" +void cleanup (void); + #endif /* vi:set sw=4 sts=4 tw=80: */ From perkinjo at mvapich.cse.ohio-state.edu Thu Sep 4 16:58:21 2008 From: perkinjo at mvapich.cse.ohio-state.edu (perkinjo@mvapich.cse.ohio-state.edu) Date: Thu Sep 4 16:58:35 2008 Subject: [mvapich-commit] r2972 - mvapich2/trunk/src/pm/mpirun/mpispawn Message-ID: <200809042058.m84KwLp4032706@mvapich.cse.ohio-state.edu> Author: perkinjo Date: 2008-09-04 16:58:17 -0400 (Thu, 04 Sep 2008) New Revision: 2972 Modified: mvapich2/trunk/src/pm/mpirun/mpispawn/mpispawn.c Log: Prevent possible compilation error for using a function before it is declared. Modified: mvapich2/trunk/src/pm/mpirun/mpispawn/mpispawn.c =================================================================== --- mvapich2/trunk/src/pm/mpirun/mpispawn/mpispawn.c 2008-09-04 20:54:03 UTC (rev 2971) +++ mvapich2/trunk/src/pm/mpirun/mpispawn/mpispawn.c 2008-09-04 20:58:17 UTC (rev 2972) @@ -38,6 +38,8 @@ static in_port_t c_port; child_t *children; +void cleanup(void); + static inline int env2int(char * env_ptr) { return (env_ptr = getenv(env_ptr)) ? atoi(env_ptr) : 0; } From koop at mvapich.cse.ohio-state.edu Mon Sep 8 11:21:18 2008 From: koop at mvapich.cse.ohio-state.edu (koop@mvapich.cse.ohio-state.edu) Date: Mon Sep 8 11:21:31 2008 Subject: [mvapich-commit] r2977 - mvapich/trunk/mpid/ch_gen2/ptmalloc2 Message-ID: <200809081521.m88FLI8n004404@mvapich.cse.ohio-state.edu> Author: koop Date: 2008-09-08 11:21:16 -0400 (Mon, 08 Sep 2008) New Revision: 2977 Modified: mvapich/trunk/mpid/ch_gen2/ptmalloc2/arena.c Log: * Increase HEAP_MAX_SIZE to 4MB Modified: mvapich/trunk/mpid/ch_gen2/ptmalloc2/arena.c =================================================================== --- mvapich/trunk/mpid/ch_gen2/ptmalloc2/arena.c 2008-09-07 14:17:30 UTC (rev 2976) +++ mvapich/trunk/mpid/ch_gen2/ptmalloc2/arena.c 2008-09-08 15:21:16 UTC (rev 2977) @@ -35,7 +35,7 @@ #define HEAP_MIN_SIZE (32*1024) #ifndef HEAP_MAX_SIZE -#define HEAP_MAX_SIZE (1024*1024) /* must be a power of two */ +#define HEAP_MAX_SIZE (4*1024*1024) /* must be a power of two */ #endif /* HEAP_MIN_SIZE and HEAP_MAX_SIZE limit the size of mmap()ed heaps From perkinjo at mvapich.cse.ohio-state.edu Thu Sep 11 16:28:07 2008 From: perkinjo at mvapich.cse.ohio-state.edu (perkinjo@mvapich.cse.ohio-state.edu) Date: Thu Sep 11 16:28:21 2008 Subject: [mvapich-commit] r2979 - in mvapich/trunk/mpid: ch_gen2/process ch_gen2_ud/process ch_psm/process ch_smp/process Message-ID: <200809112028.m8BKS78K032354@mvapich.cse.ohio-state.edu> Author: perkinjo Date: 2008-09-11 16:28:05 -0400 (Thu, 11 Sep 2008) New Revision: 2979 Modified: mvapich/trunk/mpid/ch_gen2/process/mpirun_rsh.c mvapich/trunk/mpid/ch_gen2/process/mpispawn.c mvapich/trunk/mpid/ch_gen2_ud/process/mpirun_rsh.c mvapich/trunk/mpid/ch_gen2_ud/process/mpispawn.c mvapich/trunk/mpid/ch_psm/process/mpirun_rsh.c mvapich/trunk/mpid/ch_psm/process/mpispawn.c mvapich/trunk/mpid/ch_smp/process/mpirun_rsh.c mvapich/trunk/mpid/ch_smp/process/mpispawn.c Log: Close stdin of any non rank 0 ssh connections. Modified: mvapich/trunk/mpid/ch_gen2/process/mpirun_rsh.c =================================================================== --- mvapich/trunk/mpid/ch_gen2/process/mpirun_rsh.c 2008-09-10 13:29:44 UTC (rev 2978) +++ mvapich/trunk/mpid/ch_gen2/process/mpirun_rsh.c 2008-09-11 20:28:05 UTC (rev 2979) @@ -1969,6 +1969,10 @@ exit(EXIT_SUCCESS); } + if(strcmp(pglist->data[i].hostname, plist[0].hostname)) { + close(STDIN_FILENO); + } + execv(argv[0], (char* const*) argv); perror("execv"); Modified: mvapich/trunk/mpid/ch_gen2/process/mpispawn.c =================================================================== --- mvapich/trunk/mpid/ch_gen2/process/mpispawn.c 2008-09-10 13:29:44 UTC (rev 2978) +++ mvapich/trunk/mpid/ch_gen2/process/mpispawn.c 2008-09-11 20:28:05 UTC (rev 2979) @@ -205,11 +205,6 @@ setup_local_environment(lv); - //if(lv.mpirun_rank != 0) { - //int fd = open("/dev/null", O_RDWR, 0); - /* dup2(fd, STDIN_FILENO); */ - //} - argc = env2int("MPISPAWN_ARGC"); if(lv.mpirun_rank == 0 && env2int("MPISPAWN_USE_TOTALVIEW")) { Modified: mvapich/trunk/mpid/ch_gen2_ud/process/mpirun_rsh.c =================================================================== --- mvapich/trunk/mpid/ch_gen2_ud/process/mpirun_rsh.c 2008-09-10 13:29:44 UTC (rev 2978) +++ mvapich/trunk/mpid/ch_gen2_ud/process/mpirun_rsh.c 2008-09-11 20:28:05 UTC (rev 2979) @@ -1969,6 +1969,10 @@ exit(EXIT_SUCCESS); } + if(strcmp(pglist->data[i].hostname, plist[0].hostname)) { + close(STDIN_FILENO); + } + execv(argv[0], (char* const*) argv); perror("execv"); Modified: mvapich/trunk/mpid/ch_gen2_ud/process/mpispawn.c =================================================================== --- mvapich/trunk/mpid/ch_gen2_ud/process/mpispawn.c 2008-09-10 13:29:44 UTC (rev 2978) +++ mvapich/trunk/mpid/ch_gen2_ud/process/mpispawn.c 2008-09-11 20:28:05 UTC (rev 2979) @@ -205,11 +205,6 @@ setup_local_environment(lv); - //if(lv.mpirun_rank != 0) { - //int fd = open("/dev/null", O_RDWR, 0); - /* dup2(fd, STDIN_FILENO); */ - //} - argc = env2int("MPISPAWN_ARGC"); if(lv.mpirun_rank == 0 && env2int("MPISPAWN_USE_TOTALVIEW")) { Modified: mvapich/trunk/mpid/ch_psm/process/mpirun_rsh.c =================================================================== --- mvapich/trunk/mpid/ch_psm/process/mpirun_rsh.c 2008-09-10 13:29:44 UTC (rev 2978) +++ mvapich/trunk/mpid/ch_psm/process/mpirun_rsh.c 2008-09-11 20:28:05 UTC (rev 2979) @@ -1969,6 +1969,10 @@ exit(EXIT_SUCCESS); } + if(strcmp(pglist->data[i].hostname, plist[0].hostname)) { + close(STDIN_FILENO); + } + execv(argv[0], (char* const*) argv); perror("execv"); Modified: mvapich/trunk/mpid/ch_psm/process/mpispawn.c =================================================================== --- mvapich/trunk/mpid/ch_psm/process/mpispawn.c 2008-09-10 13:29:44 UTC (rev 2978) +++ mvapich/trunk/mpid/ch_psm/process/mpispawn.c 2008-09-11 20:28:05 UTC (rev 2979) @@ -205,11 +205,6 @@ setup_local_environment(lv); - //if(lv.mpirun_rank != 0) { - //int fd = open("/dev/null", O_RDWR, 0); - /* dup2(fd, STDIN_FILENO); */ - //} - argc = env2int("MPISPAWN_ARGC"); if(lv.mpirun_rank == 0 && env2int("MPISPAWN_USE_TOTALVIEW")) { Modified: mvapich/trunk/mpid/ch_smp/process/mpirun_rsh.c =================================================================== --- mvapich/trunk/mpid/ch_smp/process/mpirun_rsh.c 2008-09-10 13:29:44 UTC (rev 2978) +++ mvapich/trunk/mpid/ch_smp/process/mpirun_rsh.c 2008-09-11 20:28:05 UTC (rev 2979) @@ -1971,6 +1971,10 @@ exit(EXIT_SUCCESS); } + if(strcmp(pglist->data[i].hostname, plist[0].hostname)) { + close(STDIN_FILENO); + } + execv(argv[0], (char* const*) argv); perror("execv"); Modified: mvapich/trunk/mpid/ch_smp/process/mpispawn.c =================================================================== --- mvapich/trunk/mpid/ch_smp/process/mpispawn.c 2008-09-10 13:29:44 UTC (rev 2978) +++ mvapich/trunk/mpid/ch_smp/process/mpispawn.c 2008-09-11 20:28:05 UTC (rev 2979) @@ -205,11 +205,6 @@ setup_local_environment(lv); - //if(lv.mpirun_rank != 0) { - //int fd = open("/dev/null", O_RDWR, 0); - /* dup2(fd, STDIN_FILENO); */ - //} - argc = env2int("MPISPAWN_ARGC"); if(lv.mpirun_rank == 0 && env2int("MPISPAWN_USE_TOTALVIEW")) { From perkinjo at mvapich.cse.ohio-state.edu Thu Sep 11 16:35:44 2008 From: perkinjo at mvapich.cse.ohio-state.edu (perkinjo@mvapich.cse.ohio-state.edu) Date: Thu Sep 11 16:35:59 2008 Subject: [mvapich-commit] r2980 - in mvapich/branches/1.0/mpid: ch_gen2/process ch_gen2_ud/process ch_psm/process ch_smp/process Message-ID: <200809112035.m8BKZisr032382@mvapich.cse.ohio-state.edu> Author: perkinjo Date: 2008-09-11 16:35:42 -0400 (Thu, 11 Sep 2008) New Revision: 2980 Modified: mvapich/branches/1.0/mpid/ch_gen2/process/mpirun_rsh.c mvapich/branches/1.0/mpid/ch_gen2/process/mpispawn.c mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpirun_rsh.c mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpispawn.c mvapich/branches/1.0/mpid/ch_psm/process/mpirun_rsh.c mvapich/branches/1.0/mpid/ch_psm/process/mpispawn.c mvapich/branches/1.0/mpid/ch_smp/process/mpirun_rsh.c mvapich/branches/1.0/mpid/ch_smp/process/mpispawn.c Log: Close stdin of any non rank 0 ssh connections. Modified: mvapich/branches/1.0/mpid/ch_gen2/process/mpirun_rsh.c =================================================================== --- mvapich/branches/1.0/mpid/ch_gen2/process/mpirun_rsh.c 2008-09-11 20:28:05 UTC (rev 2979) +++ mvapich/branches/1.0/mpid/ch_gen2/process/mpirun_rsh.c 2008-09-11 20:35:42 UTC (rev 2980) @@ -1969,6 +1969,10 @@ exit(EXIT_SUCCESS); } + if(strcmp(pglist->data[i].hostname, plist[0].hostname)) { + close(STDIN_FILENO); + } + execv(argv[0], (char* const*) argv); perror("execv"); Modified: mvapich/branches/1.0/mpid/ch_gen2/process/mpispawn.c =================================================================== --- mvapich/branches/1.0/mpid/ch_gen2/process/mpispawn.c 2008-09-11 20:28:05 UTC (rev 2979) +++ mvapich/branches/1.0/mpid/ch_gen2/process/mpispawn.c 2008-09-11 20:35:42 UTC (rev 2980) @@ -205,11 +205,6 @@ setup_local_environment(lv); - //if(lv.mpirun_rank != 0) { - //int fd = open("/dev/null", O_RDWR, 0); - /* dup2(fd, STDIN_FILENO); */ - //} - argc = env2int("MPISPAWN_ARGC"); if(lv.mpirun_rank == 0 && env2int("MPISPAWN_USE_TOTALVIEW")) { Modified: mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpirun_rsh.c =================================================================== --- mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpirun_rsh.c 2008-09-11 20:28:05 UTC (rev 2979) +++ mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpirun_rsh.c 2008-09-11 20:35:42 UTC (rev 2980) @@ -1969,6 +1969,10 @@ exit(EXIT_SUCCESS); } + if(strcmp(pglist->data[i].hostname, plist[0].hostname)) { + close(STDIN_FILENO); + } + execv(argv[0], (char* const*) argv); perror("execv"); Modified: mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpispawn.c =================================================================== --- mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpispawn.c 2008-09-11 20:28:05 UTC (rev 2979) +++ mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpispawn.c 2008-09-11 20:35:42 UTC (rev 2980) @@ -205,11 +205,6 @@ setup_local_environment(lv); - //if(lv.mpirun_rank != 0) { - //int fd = open("/dev/null", O_RDWR, 0); - /* dup2(fd, STDIN_FILENO); */ - //} - argc = env2int("MPISPAWN_ARGC"); if(lv.mpirun_rank == 0 && env2int("MPISPAWN_USE_TOTALVIEW")) { Modified: mvapich/branches/1.0/mpid/ch_psm/process/mpirun_rsh.c =================================================================== --- mvapich/branches/1.0/mpid/ch_psm/process/mpirun_rsh.c 2008-09-11 20:28:05 UTC (rev 2979) +++ mvapich/branches/1.0/mpid/ch_psm/process/mpirun_rsh.c 2008-09-11 20:35:42 UTC (rev 2980) @@ -1969,6 +1969,10 @@ exit(EXIT_SUCCESS); } + if(strcmp(pglist->data[i].hostname, plist[0].hostname)) { + close(STDIN_FILENO); + } + execv(argv[0], (char* const*) argv); perror("execv"); Modified: mvapich/branches/1.0/mpid/ch_psm/process/mpispawn.c =================================================================== --- mvapich/branches/1.0/mpid/ch_psm/process/mpispawn.c 2008-09-11 20:28:05 UTC (rev 2979) +++ mvapich/branches/1.0/mpid/ch_psm/process/mpispawn.c 2008-09-11 20:35:42 UTC (rev 2980) @@ -205,11 +205,6 @@ setup_local_environment(lv); - //if(lv.mpirun_rank != 0) { - //int fd = open("/dev/null", O_RDWR, 0); - /* dup2(fd, STDIN_FILENO); */ - //} - argc = env2int("MPISPAWN_ARGC"); if(lv.mpirun_rank == 0 && env2int("MPISPAWN_USE_TOTALVIEW")) { Modified: mvapich/branches/1.0/mpid/ch_smp/process/mpirun_rsh.c =================================================================== --- mvapich/branches/1.0/mpid/ch_smp/process/mpirun_rsh.c 2008-09-11 20:28:05 UTC (rev 2979) +++ mvapich/branches/1.0/mpid/ch_smp/process/mpirun_rsh.c 2008-09-11 20:35:42 UTC (rev 2980) @@ -1971,6 +1971,10 @@ exit(EXIT_SUCCESS); } + if(strcmp(pglist->data[i].hostname, plist[0].hostname)) { + close(STDIN_FILENO); + } + execv(argv[0], (char* const*) argv); perror("execv"); Modified: mvapich/branches/1.0/mpid/ch_smp/process/mpispawn.c =================================================================== --- mvapich/branches/1.0/mpid/ch_smp/process/mpispawn.c 2008-09-11 20:28:05 UTC (rev 2979) +++ mvapich/branches/1.0/mpid/ch_smp/process/mpispawn.c 2008-09-11 20:35:42 UTC (rev 2980) @@ -205,11 +205,6 @@ setup_local_environment(lv); - //if(lv.mpirun_rank != 0) { - //int fd = open("/dev/null", O_RDWR, 0); - /* dup2(fd, STDIN_FILENO); */ - //} - argc = env2int("MPISPAWN_ARGC"); if(lv.mpirun_rank == 0 && env2int("MPISPAWN_USE_TOTALVIEW")) { From perkinjo at mvapich.cse.ohio-state.edu Thu Sep 11 16:51:06 2008 From: perkinjo at mvapich.cse.ohio-state.edu (perkinjo@mvapich.cse.ohio-state.edu) Date: Thu Sep 11 16:51:21 2008 Subject: [mvapich-commit] r2981 - mvapich2/trunk/src/pm/mpirun/mpirun_rsh Message-ID: <200809112051.m8BKp5vW032415@mvapich.cse.ohio-state.edu> Author: perkinjo Date: 2008-09-11 16:51:03 -0400 (Thu, 11 Sep 2008) New Revision: 2981 Modified: mvapich2/trunk/src/pm/mpirun/mpirun_rsh/mpirun_rsh.c Log: Close stdin of any non rank 0 ssh connections. Modified: mvapich2/trunk/src/pm/mpirun/mpirun_rsh/mpirun_rsh.c =================================================================== --- mvapich2/trunk/src/pm/mpirun/mpirun_rsh/mpirun_rsh.c 2008-09-11 20:35:42 UTC (rev 2980) +++ mvapich2/trunk/src/pm/mpirun/mpirun_rsh/mpirun_rsh.c 2008-09-11 20:51:03 UTC (rev 2981) @@ -1549,6 +1549,10 @@ exit(EXIT_SUCCESS); } + if(strcmp(pglist->data[i].hostname, plist[0].hostname)) { + close(STDIN_FILENO); + } + execv(argv[0], (char* const*) argv); perror("execv"); From perkinjo at mvapich.cse.ohio-state.edu Mon Sep 15 09:42:00 2008 From: perkinjo at mvapich.cse.ohio-state.edu (perkinjo@mvapich.cse.ohio-state.edu) Date: Mon Sep 15 09:42:16 2008 Subject: [mvapich-commit] r2987 - in mvapich/branches/1.0/mpid: ch_gen2/process ch_gen2_ud/process ch_psm/process ch_smp/process Message-ID: <200809151342.m8FDg0hZ008583@mvapich.cse.ohio-state.edu> Author: perkinjo Date: 2008-09-15 09:41:59 -0400 (Mon, 15 Sep 2008) New Revision: 2987 Modified: mvapich/branches/1.0/mpid/ch_gen2/process/mpirun_rsh.c mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpirun_rsh.c mvapich/branches/1.0/mpid/ch_psm/process/mpirun_rsh.c mvapich/branches/1.0/mpid/ch_smp/process/mpirun_rsh.c Log: Define PATH_MAX if not defined by the host platform. Thanks to Pasha @ Mellanox. Modified: mvapich/branches/1.0/mpid/ch_gen2/process/mpirun_rsh.c =================================================================== --- mvapich/branches/1.0/mpid/ch_gen2/process/mpirun_rsh.c 2008-09-12 17:26:19 UTC (rev 2986) +++ mvapich/branches/1.0/mpid/ch_gen2/process/mpirun_rsh.c 2008-09-15 13:41:59 UTC (rev 2987) @@ -1622,6 +1622,10 @@ } } +#ifndef PATH_MAX +#define PATH_MAX 4096 +#endif + void spawn_fast(int argc, char *argv[], char *totalview_cmd, char *env) { char * mpispawn_env, * tmp, * ld_library_path; char * name, * value; Modified: mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpirun_rsh.c =================================================================== --- mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpirun_rsh.c 2008-09-12 17:26:19 UTC (rev 2986) +++ mvapich/branches/1.0/mpid/ch_gen2_ud/process/mpirun_rsh.c 2008-09-15 13:41:59 UTC (rev 2987) @@ -1622,6 +1622,10 @@ } } +#ifndef PATH_MAX +#define PATH_MAX 4096 +#endif + void spawn_fast(int argc, char *argv[], char *totalview_cmd, char *env) { char * mpispawn_env, * tmp, * ld_library_path; char * name, * value; Modified: mvapich/branches/1.0/mpid/ch_psm/process/mpirun_rsh.c =================================================================== --- mvapich/branches/1.0/mpid/ch_psm/process/mpirun_rsh.c 2008-09-12 17:26:19 UTC (rev 2986) +++ mvapich/branches/1.0/mpid/ch_psm/process/mpirun_rsh.c 2008-09-15 13:41:59 UTC (rev 2987) @@ -1622,6 +1622,10 @@ } } +#ifndef PATH_MAX +#define PATH_MAX 4096 +#endif + void spawn_fast(int argc, char *argv[], char *totalview_cmd, char *env) { char * mpispawn_env, * tmp, * ld_library_path; char * name, * value; Modified: mvapich/branches/1.0/mpid/ch_smp/process/mpirun_rsh.c =================================================================== --- mvapich/branches/1.0/mpid/ch_smp/process/mpirun_rsh.c 2008-09-12 17:26:19 UTC (rev 2986) +++ mvapich/branches/1.0/mpid/ch_smp/process/mpirun_rsh.c 2008-09-15 13:41:59 UTC (rev 2987) @@ -1624,6 +1624,10 @@ } } +#ifndef PATH_MAX +#define PATH_MAX 4096 +#endif + void spawn_fast(int argc, char *argv[], char *totalview_cmd, char *env) { char * mpispawn_env, * tmp, * ld_library_path; char * name, * value; From perkinjo at mvapich.cse.ohio-state.edu Mon Sep 15 09:42:55 2008 From: perkinjo at mvapich.cse.ohio-state.edu (perkinjo@mvapich.cse.ohio-state.edu) Date: Mon Sep 15 09:43:10 2008 Subject: [mvapich-commit] r2989 - in mvapich/trunk/mpid: ch_gen2/process ch_gen2_ud/process ch_psm/process ch_smp/process Message-ID: <200809151342.m8FDgtU9008619@mvapich.cse.ohio-state.edu> Author: perkinjo Date: 2008-09-15 09:42:55 -0400 (Mon, 15 Sep 2008) New Revision: 2989 Modified: mvapich/trunk/mpid/ch_gen2/process/mpirun_rsh.c mvapich/trunk/mpid/ch_gen2_ud/process/mpirun_rsh.c mvapich/trunk/mpid/ch_psm/process/mpirun_rsh.c mvapich/trunk/mpid/ch_smp/process/mpirun_rsh.c Log: Define PATH_MAX if not defined by the host platform. Thanks to Pasha @ Mellanox. Modified: mvapich/trunk/mpid/ch_gen2/process/mpirun_rsh.c =================================================================== --- mvapich/trunk/mpid/ch_gen2/process/mpirun_rsh.c 2008-09-15 13:42:27 UTC (rev 2988) +++ mvapich/trunk/mpid/ch_gen2/process/mpirun_rsh.c 2008-09-15 13:42:55 UTC (rev 2989) @@ -1622,6 +1622,10 @@ } } +#ifndef PATH_MAX +#define PATH_MAX 4096 +#endif + void spawn_fast(int argc, char *argv[], char *totalview_cmd, char *env) { char * mpispawn_env, * tmp, * ld_library_path; char * name, * value; Modified: mvapich/trunk/mpid/ch_gen2_ud/process/mpirun_rsh.c =================================================================== --- mvapich/trunk/mpid/ch_gen2_ud/process/mpirun_rsh.c 2008-09-15 13:42:27 UTC (rev 2988) +++ mvapich/trunk/mpid/ch_gen2_ud/process/mpirun_rsh.c 2008-09-15 13:42:55 UTC (rev 2989) @@ -1622,6 +1622,10 @@ } } +#ifndef PATH_MAX +#define PATH_MAX 4096 +#endif + void spawn_fast(int argc, char *argv[], char *totalview_cmd, char *env) { char * mpispawn_env, * tmp, * ld_library_path; char * name, * value; Modified: mvapich/trunk/mpid/ch_psm/process/mpirun_rsh.c =================================================================== --- mvapich/trunk/mpid/ch_psm/process/mpirun_rsh.c 2008-09-15 13:42:27 UTC (rev 2988) +++ mvapich/trunk/mpid/ch_psm/process/mpirun_rsh.c 2008-09-15 13:42:55 UTC (rev 2989) @@ -1622,6 +1622,10 @@ } } +#ifndef PATH_MAX +#define PATH_MAX 4096 +#endif + void spawn_fast(int argc, char *argv[], char *totalview_cmd, char *env) { char * mpispawn_env, * tmp, * ld_library_path; char * name, * value; Modified: mvapich/trunk/mpid/ch_smp/process/mpirun_rsh.c =================================================================== --- mvapich/trunk/mpid/ch_smp/process/mpirun_rsh.c 2008-09-15 13:42:27 UTC (rev 2988) +++ mvapich/trunk/mpid/ch_smp/process/mpirun_rsh.c 2008-09-15 13:42:55 UTC (rev 2989) @@ -1624,6 +1624,10 @@ } } +#ifndef PATH_MAX +#define PATH_MAX 4096 +#endif + void spawn_fast(int argc, char *argv[], char *totalview_cmd, char *env) { char * mpispawn_env, * tmp, * ld_library_path; char * name, * value; From gopalakk at mvapich.cse.ohio-state.edu Wed Sep 17 16:58:05 2008 From: gopalakk at mvapich.cse.ohio-state.edu (gopalakk@mvapich.cse.ohio-state.edu) Date: Wed Sep 17 16:58:09 2008 Subject: [mvapich-commit] r2991 - mvapich2/trunk/src/mpid/ch3/channels/mrail/src/gen2 Message-ID: <200809172058.m8HKw5T6027869@mvapich.cse.ohio-state.edu> Author: gopalakk Date: 2008-09-17 16:57:58 -0400 (Wed, 17 Sep 2008) New Revision: 2991 Modified: mvapich2/trunk/src/mpid/ch3/channels/mrail/src/gen2/cm.c Log: Protect access to VC States with the CM lock to prevent a race between MPIDI_CH3I_CM_Suspend() and CR_IBU_Release_network() during Checkpointing. Modified: mvapich2/trunk/src/mpid/ch3/channels/mrail/src/gen2/cm.c =================================================================== --- mvapich2/trunk/src/mpid/ch3/channels/mrail/src/gen2/cm.c 2008-09-17 20:57:01 UTC (rev 2990) +++ mvapich2/trunk/src/mpid/ch3/channels/mrail/src/gen2/cm.c 2008-09-17 20:57:58 UTC (rev 2991) @@ -1574,12 +1574,15 @@ continue; } + pthread_mutex_lock(&cm_automic_op_lock); if (NULL!=vc_vector[i] && vc_vector[i]->ch.state != MPIDI_CH3I_VC_STATE_SUSPENDED) { + pthread_mutex_unlock(&cm_automic_op_lock); flag = 1; break; } + pthread_mutex_unlock(&cm_automic_op_lock); } if (flag == 0) { @@ -1681,10 +1684,13 @@ /* Handle the reactivation of the SMP channel */ if (SMP_INIT && (vc->smp.local_nodes >= 0)) { + pthread_mutex_lock(&cm_automic_op_lock); if (vc->ch.state != MPIDI_CH3I_VC_STATE_IDLE) { + pthread_mutex_unlock(&cm_automic_op_lock); flag = 1; break; } + pthread_mutex_unlock(&cm_automic_op_lock); continue; } From chail at mvapich.cse.ohio-state.edu Thu Sep 18 18:58:10 2008 From: chail at mvapich.cse.ohio-state.edu (chail@mvapich.cse.ohio-state.edu) Date: Thu Sep 18 18:58:15 2008 Subject: [mvapich-commit] r2993 - mvapich2/trunk/src/mpid/ch3/channels/mrail/src/gen2 Message-ID: <200809182258.m8IMwA66004752@mvapich.cse.ohio-state.edu> Author: chail Date: 2008-09-18 18:58:08 -0400 (Thu, 18 Sep 2008) New Revision: 2993 Modified: mvapich2/trunk/src/mpid/ch3/channels/mrail/src/gen2/rdma_iba_priv.c Log: Fix a bug when MV2_NUM_HCAS is larger than the number of active HCAs. The program should return error message in this case. Modified: mvapich2/trunk/src/mpid/ch3/channels/mrail/src/gen2/rdma_iba_priv.c =================================================================== --- mvapich2/trunk/src/mpid/ch3/channels/mrail/src/gen2/rdma_iba_priv.c 2008-09-18 14:47:46 UTC (rev 2992) +++ mvapich2/trunk/src/mpid/ch3/channels/mrail/src/gen2/rdma_iba_priv.c 2008-09-18 22:58:08 UTC (rev 2993) @@ -216,9 +216,7 @@ /* User hasn't specified any HCA name * We will use the first available HCA */ - if(dev_list[i]) { - ib_dev = dev_list[i]; - } + ib_dev = dev_list[i]; } else { From chail at mvapich.cse.ohio-state.edu Fri Sep 19 14:02:57 2008 From: chail at mvapich.cse.ohio-state.edu (chail@mvapich.cse.ohio-state.edu) Date: Fri Sep 19 14:03:00 2008 Subject: [mvapich-commit] r2996 - mvapich2/branches/1.0/src/mpid/osu_ch3/channels/mrail/src/gen2 Message-ID: <200809191802.m8JI2vLs013394@mvapich.cse.ohio-state.edu> Author: chail Date: 2008-09-19 14:02:55 -0400 (Fri, 19 Sep 2008) New Revision: 2996 Modified: mvapich2/branches/1.0/src/mpid/osu_ch3/channels/mrail/src/gen2/rdma_iba_priv.c Log: Fix a bug when MV2_NUM_HCAS is larger than the number of active HCAs. The program should return error message in this case. Modified: mvapich2/branches/1.0/src/mpid/osu_ch3/channels/mrail/src/gen2/rdma_iba_priv.c =================================================================== --- mvapich2/branches/1.0/src/mpid/osu_ch3/channels/mrail/src/gen2/rdma_iba_priv.c 2008-09-19 17:42:52 UTC (rev 2995) +++ mvapich2/branches/1.0/src/mpid/osu_ch3/channels/mrail/src/gen2/rdma_iba_priv.c 2008-09-19 18:02:55 UTC (rev 2996) @@ -350,9 +350,7 @@ /* User hasn't specified any HCA name * We will use the first available HCA */ - if(dev_list[i]) { - ib_dev = dev_list[i]; - } + ib_dev = dev_list[i]; } else { From perkinjo at mvapich.cse.ohio-state.edu Sat Sep 20 20:43:45 2008 From: perkinjo at mvapich.cse.ohio-state.edu (perkinjo@mvapich.cse.ohio-state.edu) Date: Sat Sep 20 20:43:51 2008 Subject: [mvapich-commit] r2997 - in mvapich2/trunk/src/mpid/ch3/channels/mrail: . src/udapl Message-ID: <200809210043.m8L0hj4k022986@mvapich.cse.ohio-state.edu> Author: perkinjo Date: 2008-09-20 20:43:44 -0400 (Sat, 20 Sep 2008) New Revision: 2997 Modified: mvapich2/trunk/src/mpid/ch3/channels/mrail/configure.in mvapich2/trunk/src/mpid/ch3/channels/mrail/src/udapl/udapl_arch.h mvapich2/trunk/src/mpid/ch3/channels/mrail/src/udapl/udapl_param.h Log: Allow builds on architectures for which tuning parameters do not exist. Modified: mvapich2/trunk/src/mpid/ch3/channels/mrail/configure.in =================================================================== --- mvapich2/trunk/src/mpid/ch3/channels/mrail/configure.in 2008-09-19 18:02:55 UTC (rev 2996) +++ mvapich2/trunk/src/mpid/ch3/channels/mrail/configure.in 2008-09-21 00:43:44 UTC (rev 2997) @@ -107,7 +107,7 @@ AC_DEFINE(_EM64T_, 1, [Define to specify the build CPU type.]) fi else - AC_MSG_ERROR([The build CPU type is not supported.]) + AC_MSG_WARN([The build CPU type may not be supported.]) fi if test "$with_pmi" != "slurm"; then @@ -172,6 +172,7 @@ fi if test "$with_ib_libpath" != "default"; then + mrail_ld_library_path=${with_ib_libpath}:$mrail_ld_library_path mrail_fflags="-L${with_ib_libpath} $mrail_fflags" mrail_ldflags="-L${with_ib_libpath} $mrail_ldflags" LDFLAGS="-L${with_ib_libpath} $LDFLAGS" Modified: mvapich2/trunk/src/mpid/ch3/channels/mrail/src/udapl/udapl_arch.h =================================================================== --- mvapich2/trunk/src/mpid/ch3/channels/mrail/src/udapl/udapl_arch.h 2008-09-19 18:02:55 UTC (rev 2996) +++ mvapich2/trunk/src/mpid/ch3/channels/mrail/src/udapl/udapl_arch.h 2008-09-21 00:43:44 UTC (rev 2997) @@ -41,52 +41,24 @@ * */ -#if !defined(SOLARIS) && !defined(_IA32_) && !defined(_IA64_) && !defined(_X86_64_) \ -&& !defined(_EM64T_) && !defined(MAC_OSX) - -#error Either _IA32_ or _IA64_ or _X86_64_ or _EM64T_ or MAC_OSX must be defined +#if defined(SOLARIS) +# if defined(_IA32_) || defined(_IA64_) || defined(_X86_64_) || defined(_EM64T_) +# error Multiple build cpu settings defined. +# endif +#elif defined(_IA32_) +# if defined(_IA64_) || defined(_X86_64_) || defined(_EM64T_) +# error Multiple build cpu settings defined. +# endif +#elif defined(_IA64_) +# if defined(_X86_64_) || defined(_EM64T_) +# error Multiple build cpu settings defined. +# endif +#elif defined(_X86_64_) +# if defined(_EM64T_) +# error Multiple build cpu settings defined. +# endif #endif -#if defined(_IA32_) && defined(_IA64_) -#error Only one of IA32 and IA64 can be defined -#endif - -#if defined(_IA32_) && defined(_X86_64_) -#error Only one of _IA32_ and _X86_64_ can be defined -#endif - -#if defined(_IA32_) && defined(_EM64T_) -#error Only one of _IA32_ and _EM64T_ can be defined -#endif - -#if defined(_IA64_) && defined(_X86_64_) -#error Only one of _IA64_ and _X86_64_ can be defined -#endif - -#if defined(_IA64_) && defined(_EM64T_) -#error Only one of _IA64_ and _EM64T_ can be defined -#endif - -#if defined(_X86_64_) && defined(_EM64T_) -#error Only one of _X86_64_ and _EM64T_ can be defined -#endif - -#if defined(MAC_OSX) && defined(_IA64_) -#error Only one of MAC_OSX and _IA64_ can be defined -#endif - -#if defined(MAC_OSX) && defined(_X86_64_) -#error Only one of MAC_OSX and _X86_64_ can be defined -#endif - -#if defined(MAC_OSX) && defined(_EM64T_) -#error Only one of MAC_OSX and _EM64T_ can be defined -#endif - -#if defined(MAC_OSX) && defined(_IA32_) -#error Only one of _IA32_ and MAC_OSX can be defined -#endif - #if defined(_DDR_) && defined(_SDR_) #error Only one of _DDR_ and _SDR_ can be defined #endif @@ -107,16 +79,8 @@ #error The platform is Solaris. Please choose IBTL instead of GEN2. #endif -#if (defined(_IA64_) || defined(_X86_64_) || defined(_EM64T_) \ - || defined(MAC_OSX)) +#if defined(_IA32_) -typedef unsigned long aint_t; -#define AINT_FORMAT "%lx" - -#define UINT32_FORMAT "%u" - -#elif defined(_IA32_) - /* * note that aint_t could be unsigned long for x86. * unsigned int is the same. Leave it this way so @@ -125,18 +89,21 @@ */ typedef unsigned int aint_t; #define AINT_FORMAT "%x" - #define UINT32_FORMAT "%u" #elif defined(SOLARIS) + typedef unsigned long aint_t; typedef uint32_t u_int32_t; typedef uint16_t u_int16_t; typedef uint8_t u_int8_t; -#else +#else /* _IA64_ || _X86_64_ || _EM64T_ || MAC_OSX || Something else */ -#error Either _IA32_ or _IA64_ or _X86_64_ or _EM64T_ or MAC_OSX must be defined. +typedef unsigned long aint_t; +#define AINT_FORMAT "%lx" +#define UINT32_FORMAT "%u" + #endif #endif /* _VIA64_H */ Modified: mvapich2/trunk/src/mpid/ch3/channels/mrail/src/udapl/udapl_param.h =================================================================== --- mvapich2/trunk/src/mpid/ch3/channels/mrail/src/udapl/udapl_param.h 2008-09-19 18:02:55 UTC (rev 2996) +++ mvapich2/trunk/src/mpid/ch3/channels/mrail/src/udapl/udapl_param.h 2008-09-21 00:43:44 UTC (rev 2997) @@ -420,6 +420,24 @@ #define RDMA_PUT_FALLBACK_THRESHOLD (8 * 1024) #define RDMA_GET_FALLBACK_THRESHOLD (16 * 1024) + #else + + #ifdef _LARGE_CLUSTER + #define NUM_RDMA_BUFFER (16) + #define RDMA_IBA_EAGER_THRESHOLD (12*1024) + #elif defined(_MEDIUM_CLUSTER) + #define NUM_RDMA_BUFFER (16) + #define RDMA_IBA_EAGER_THRESHOLD (12*1024) + #else + #define NUM_RDMA_BUFFER (32) + #define RDMA_IBA_EAGER_THRESHOLD (VBUF_BUFFER_SIZE) + #endif + + #define RDMA_EAGERSIZE_1SC (4 * 1024) + #define RDMA_PUT_FALLBACK_THRESHOLD (8 * 1024) + #define RDMA_GET_FALLBACK_THRESHOLD (394 * 1024) + + #endif #endif From chail at mvapich.cse.ohio-state.edu Mon Sep 22 18:22:28 2008 From: chail at mvapich.cse.ohio-state.edu (chail@mvapich.cse.ohio-state.edu) Date: Mon Sep 22 18:22:31 2008 Subject: [mvapich-commit] r2999 - in mvapich/trunk: mpe/include mpe/src mpid/ch_gen2 mpid/ch_gen2/ptmalloc2 Message-ID: <200809222222.m8MMMRmo009447@mvapich.cse.ohio-state.edu> Author: chail Date: 2008-09-22 18:22:25 -0400 (Mon, 22 Sep 2008) New Revision: 2999 Modified: mvapich/trunk/mpe/include/mpetools.h mvapich/trunk/mpe/src/mpe_proff.c mvapich/trunk/mpid/ch_gen2/mem_hooks.c mvapich/trunk/mpid/ch_gen2/mem_hooks.h mvapich/trunk/mpid/ch_gen2/ptmalloc2/hooks.c Log: Fix data types for memory allocations. Thanks for Dr. Bill Barth from TACC for the patches. Modified: mvapich/trunk/mpe/include/mpetools.h =================================================================== --- mvapich/trunk/mpe/include/mpetools.h 2008-09-22 20:12:32 UTC (rev 2998) +++ mvapich/trunk/mpe/include/mpetools.h 2008-09-22 22:22:25 UTC (rev 2999) @@ -14,10 +14,10 @@ #include #endif -#define MALLOC(a) malloc((unsigned)(a)) +#define MALLOC(a) malloc((size_t)(a)) #define FREE(a) free((char *)(a)) -#define CALLOC(a,b) calloc((unsigned)(a),(unsigned)(b)) -#define REALLOC(a,b) realloc(a,(unsigned)(b)) +#define CALLOC(a,b) calloc((size_t)(a),(size_t)(b)) +#define REALLOC(a,b) realloc(a,(size_t)(b)) #define NEW(a) (a *)MALLOC(sizeof(a)) Modified: mvapich/trunk/mpe/src/mpe_proff.c =================================================================== --- mvapich/trunk/mpe/src/mpe_proff.c 2008-09-22 20:12:32 UTC (rev 2998) +++ mvapich/trunk/mpe/src/mpe_proff.c 2008-09-22 22:22:25 UTC (rev 2999) @@ -49,7 +49,7 @@ */ #if defined(MPIR_MEMDEBUG) /* Enable memory tracing. This requires MPICH's mpid/util/tr2.c codes */ -#define MALLOC(a) MPID_trmalloc((unsigned)(a),__LINE__,__FILE__) +#define MALLOC(a) MPID_trmalloc((size_t)(a),__LINE__,__FILE__) #define FREE(a) MPID_trfree(a,__LINE__,__FILE__) #else Modified: mvapich/trunk/mpid/ch_gen2/mem_hooks.c =================================================================== --- mvapich/trunk/mpid/ch_gen2/mem_hooks.c 2008-09-22 20:12:32 UTC (rev 2998) +++ mvapich/trunk/mpid/ch_gen2/mem_hooks.c 2008-09-22 22:22:25 UTC (rev 2999) @@ -116,7 +116,7 @@ #ifndef DISABLE_TRAP_SBRK -void *mvapich_sbrk(int delta) +void *mvapich_sbrk(intptr_t delta) { if (delta < 0) { Modified: mvapich/trunk/mpid/ch_gen2/mem_hooks.h =================================================================== --- mvapich/trunk/mpid/ch_gen2/mem_hooks.h 2008-09-22 20:12:32 UTC (rev 2998) +++ mvapich/trunk/mpid/ch_gen2/mem_hooks.h 2008-09-22 22:22:25 UTC (rev 2999) @@ -46,7 +46,7 @@ #endif #ifndef DISABLE_TRAP_SBRK -void *mvapich_sbrk(int delta); +void *mvapich_sbrk(intptr_t delta); #endif #endif /* DISABLE_PTMALLOC */ Modified: mvapich/trunk/mpid/ch_gen2/ptmalloc2/hooks.c =================================================================== --- mvapich/trunk/mpid/ch_gen2/ptmalloc2/hooks.c 2008-09-22 20:12:32 UTC (rev 2998) +++ mvapich/trunk/mpid/ch_gen2/ptmalloc2/hooks.c 2008-09-22 22:22:25 UTC (rev 2999) @@ -484,7 +484,7 @@ long version; mbinptr av[NBINS * 2 + 2]; char* sbrk_base; - int sbrked_mem_bytes; + intptr_t sbrked_mem_bytes; unsigned long trim_threshold; unsigned long top_pad; unsigned int n_mmaps_max; From chail at mvapich.cse.ohio-state.edu Mon Sep 22 18:54:01 2008 From: chail at mvapich.cse.ohio-state.edu (chail@mvapich.cse.ohio-state.edu) Date: Mon Sep 22 18:54:06 2008 Subject: [mvapich-commit] r3001 - in mvapich2/trunk/src: mpe2/src/graphics/include mpe2/src/logging/include mpe2/src/wrappers/src mpid/ch3/channels/mrail/include mpid/ch3/channels/mrail/src/memory Message-ID: <200809222254.m8MMs1l7009547@mvapich.cse.ohio-state.edu> Author: chail Date: 2008-09-22 18:53:59 -0400 (Mon, 22 Sep 2008) New Revision: 3001 Modified: mvapich2/trunk/src/mpe2/src/graphics/include/mpetools.h mvapich2/trunk/src/mpe2/src/logging/include/clog_mem.h mvapich2/trunk/src/mpe2/src/wrappers/src/mpe_proff.c mvapich2/trunk/src/mpid/ch3/channels/mrail/include/mem_hooks.h mvapich2/trunk/src/mpid/ch3/channels/mrail/src/memory/mem_hooks.c Log: Fix data types for memory allocations. Thanks for Dr. Bill Barth from TACC for the patches. Modified: mvapich2/trunk/src/mpe2/src/graphics/include/mpetools.h =================================================================== --- mvapich2/trunk/src/mpe2/src/graphics/include/mpetools.h 2008-09-22 22:31:35 UTC (rev 3000) +++ mvapich2/trunk/src/mpe2/src/graphics/include/mpetools.h 2008-09-22 22:53:59 UTC (rev 3001) @@ -18,10 +18,10 @@ #include #endif -#define MALLOC(a) malloc((unsigned)(a)) +#define MALLOC(a) malloc((size_t)(a)) #define FREE(a) free((char *)(a)) -#define CALLOC(a,b) calloc((unsigned)(a),(unsigned)(b)) -#define REALLOC(a,b) realloc(a,(unsigned)(b)) +#define CALLOC(a,b) calloc((size_t)(a),(size_t)(b)) +#define REALLOC(a,b) realloc(a,(size_t)(b)) #define NEW(a) (a *)MALLOC(sizeof(a)) Modified: mvapich2/trunk/src/mpe2/src/logging/include/clog_mem.h =================================================================== --- mvapich2/trunk/src/mpe2/src/logging/include/clog_mem.h 2008-09-22 22:31:35 UTC (rev 3000) +++ mvapich2/trunk/src/mpe2/src/logging/include/clog_mem.h 2008-09-22 22:53:59 UTC (rev 3001) @@ -12,7 +12,7 @@ #if defined(MPIR_MEMDEBUG) /* Enable memory tracing. This requires MPICH's mpid/util/tr2.c codes */ #include "mpimem.h" /* Chameleon memory debugging stuff */ -#define MALLOC(a) MPID_trmalloc((unsigned)(a),__LINE__,__FILE__) +#define MALLOC(a) MPID_trmalloc((size_t)(a),__LINE__,__FILE__) #define FREE(a) MPID_trfree(a,__LINE__,__FILE__) #define REALLOC(a,b) realloc(a,b) #else Modified: mvapich2/trunk/src/mpe2/src/wrappers/src/mpe_proff.c =================================================================== --- mvapich2/trunk/src/mpe2/src/wrappers/src/mpe_proff.c 2008-09-22 22:31:35 UTC (rev 3000) +++ mvapich2/trunk/src/mpe2/src/wrappers/src/mpe_proff.c 2008-09-22 22:53:59 UTC (rev 3001) @@ -75,7 +75,7 @@ */ #if defined(MPIR_MEMDEBUG) /* Enable memory tracing. This requires MPICH's mpid/util/tr2.c codes */ -#define MALLOC(a) MPID_trmalloc((unsigned)(a),__LINE__,__FILE__) +#define MALLOC(a) MPID_trmalloc((size_t)(a),__LINE__,__FILE__) #define FREE(a) MPID_trfree(a,__LINE__,__FILE__) #else Modified: mvapich2/trunk/src/mpid/ch3/channels/mrail/include/mem_hooks.h =================================================================== --- mvapich2/trunk/src/mpid/ch3/channels/mrail/include/mem_hooks.h 2008-09-22 22:31:35 UTC (rev 3000) +++ mvapich2/trunk/src/mpid/ch3/channels/mrail/include/mem_hooks.h 2008-09-22 22:53:59 UTC (rev 3001) @@ -52,7 +52,7 @@ #endif #ifndef DISABLE_TRAP_SBRK -void *mvapich2_sbrk(int delta); +void *mvapich2_sbrk(intptr_t delta); #endif /* DISABLE_TRAP_SBRK */ #else /* DISABLE_PTMALLOC */ #include Modified: mvapich2/trunk/src/mpid/ch3/channels/mrail/src/memory/mem_hooks.c =================================================================== --- mvapich2/trunk/src/mpid/ch3/channels/mrail/src/memory/mem_hooks.c 2008-09-22 22:31:35 UTC (rev 3000) +++ mvapich2/trunk/src/mpid/ch3/channels/mrail/src/memory/mem_hooks.c 2008-09-22 22:53:59 UTC (rev 3001) @@ -113,7 +113,7 @@ #endif /* !defined(DISABLE_MUNMAP_HOOK) */ #if !defined(DISABLE_TRAP_SBRK) -void *mvapich2_sbrk(int delta) +void *mvapich2_sbrk(intptr_t delta) { if (delta < 0) { From chail at mvapich.cse.ohio-state.edu Mon Sep 22 23:26:55 2008 From: chail at mvapich.cse.ohio-state.edu (chail@mvapich.cse.ohio-state.edu) Date: Mon Sep 22 23:27:00 2008 Subject: [mvapich-commit] r3004 - in mvapich/branches/1.0: mpe/include mpe/src mpid/ch_gen2 mpid/ch_gen2/ptmalloc2 Message-ID: <200809230326.m8N3QtM7010148@mvapich.cse.ohio-state.edu> Author: chail Date: 2008-09-22 23:26:54 -0400 (Mon, 22 Sep 2008) New Revision: 3004 Modified: mvapich/branches/1.0/mpe/include/mpetools.h mvapich/branches/1.0/mpe/src/mpe_proff.c mvapich/branches/1.0/mpid/ch_gen2/mem_hooks.c mvapich/branches/1.0/mpid/ch_gen2/mem_hooks.h mvapich/branches/1.0/mpid/ch_gen2/ptmalloc2/hooks.c Log: Fix data types for memory allocations. Thanks for Dr. Bill Barth from TACC for the patches. Modified: mvapich/branches/1.0/mpe/include/mpetools.h =================================================================== --- mvapich/branches/1.0/mpe/include/mpetools.h 2008-09-23 03:21:29 UTC (rev 3003) +++ mvapich/branches/1.0/mpe/include/mpetools.h 2008-09-23 03:26:54 UTC (rev 3004) @@ -14,10 +14,10 @@ #include #endif -#define MALLOC(a) malloc((unsigned)(a)) +#define MALLOC(a) malloc((size_t)(a)) #define FREE(a) free((char *)(a)) -#define CALLOC(a,b) calloc((unsigned)(a),(unsigned)(b)) -#define REALLOC(a,b) realloc(a,(unsigned)(b)) +#define CALLOC(a,b) calloc((size_t)(a),(size_t)(b)) +#define REALLOC(a,b) realloc(a,(size_t)(b)) #define NEW(a) (a *)MALLOC(sizeof(a)) Modified: mvapich/branches/1.0/mpe/src/mpe_proff.c =================================================================== --- mvapich/branches/1.0/mpe/src/mpe_proff.c 2008-09-23 03:21:29 UTC (rev 3003) +++ mvapich/branches/1.0/mpe/src/mpe_proff.c 2008-09-23 03:26:54 UTC (rev 3004) @@ -49,7 +49,7 @@ */ #if defined(MPIR_MEMDEBUG) /* Enable memory tracing. This requires MPICH's mpid/util/tr2.c codes */ -#define MALLOC(a) MPID_trmalloc((unsigned)(a),__LINE__,__FILE__) +#define MALLOC(a) MPID_trmalloc((size_t)(a),__LINE__,__FILE__) #define FREE(a) MPID_trfree(a,__LINE__,__FILE__) #else Modified: mvapich/branches/1.0/mpid/ch_gen2/mem_hooks.c =================================================================== --- mvapich/branches/1.0/mpid/ch_gen2/mem_hooks.c 2008-09-23 03:21:29 UTC (rev 3003) +++ mvapich/branches/1.0/mpid/ch_gen2/mem_hooks.c 2008-09-23 03:26:54 UTC (rev 3004) @@ -116,7 +116,7 @@ #ifndef DISABLE_TRAP_SBRK -void *mvapich_sbrk(int delta) +void *mvapich_sbrk(intptr_t delta) { if (delta < 0) { Modified: mvapich/branches/1.0/mpid/ch_gen2/mem_hooks.h =================================================================== --- mvapich/branches/1.0/mpid/ch_gen2/mem_hooks.h 2008-09-23 03:21:29 UTC (rev 3003) +++ mvapich/branches/1.0/mpid/ch_gen2/mem_hooks.h 2008-09-23 03:26:54 UTC (rev 3004) @@ -46,7 +46,7 @@ #endif #ifndef DISABLE_TRAP_SBRK -void *mvapich_sbrk(int delta); +void *mvapich_sbrk(intptr_t delta); #endif #endif /* DISABLE_PTMALLOC */ Modified: mvapich/branches/1.0/mpid/ch_gen2/ptmalloc2/hooks.c =================================================================== --- mvapich/branches/1.0/mpid/ch_gen2/ptmalloc2/hooks.c 2008-09-23 03:21:29 UTC (rev 3003) +++ mvapich/branches/1.0/mpid/ch_gen2/ptmalloc2/hooks.c 2008-09-23 03:26:54 UTC (rev 3004) @@ -484,7 +484,7 @@ long version; mbinptr av[NBINS * 2 + 2]; char* sbrk_base; - int sbrked_mem_bytes; + intptr_t sbrked_mem_bytes; unsigned long trim_threshold; unsigned long top_pad; unsigned int n_mmaps_max; From chail at mvapich.cse.ohio-state.edu Tue Sep 23 14:43:04 2008 From: chail at mvapich.cse.ohio-state.edu (chail@mvapich.cse.ohio-state.edu) Date: Tue Sep 23 14:43:09 2008 Subject: [mvapich-commit] r3005 - in mvapich/trunk/mpid: ch_gen2 util Message-ID: <200809231843.m8NIh46H018284@mvapich.cse.ohio-state.edu> Author: chail Date: 2008-09-23 14:43:02 -0400 (Tue, 23 Sep 2008) New Revision: 3005 Modified: mvapich/trunk/mpid/ch_gen2/ibverbs_header.h mvapich/trunk/mpid/ch_gen2/mpimem.h mvapich/trunk/mpid/util/sbcnst2.h mvapich/trunk/mpid/util/tr2.c mvapich/trunk/mpid/util/tr2.h Log: Fix data types for memory allocation. Modified: mvapich/trunk/mpid/ch_gen2/ibverbs_header.h =================================================================== --- mvapich/trunk/mpid/ch_gen2/ibverbs_header.h 2008-09-23 03:26:54 UTC (rev 3004) +++ mvapich/trunk/mpid/ch_gen2/ibverbs_header.h 2008-09-23 18:43:02 UTC (rev 3005) @@ -40,7 +40,7 @@ #undef MALLOC #undef FREE /* src/env/initutil.c NEW not defined */ -#define MALLOC(a) malloc((unsigned)(a)) +#define MALLOC(a) malloc((size_t)(a)) #define CALLOC(a,b) calloc((unsigned)(a),(unsigned)(b)) #define FREE(a) free((char *)(a)) #define NEW(a) (a *)MALLOC(sizeof(a)) Modified: mvapich/trunk/mpid/ch_gen2/mpimem.h =================================================================== --- mvapich/trunk/mpid/ch_gen2/mpimem.h 2008-09-23 03:26:54 UTC (rev 3004) +++ mvapich/trunk/mpid/ch_gen2/mpimem.h 2008-09-23 18:43:02 UTC (rev 3005) @@ -59,7 +59,7 @@ /* Need to determine how to declare malloc for all systems, some of which may need/allow an explicit declaration */ #include -#define MALLOC(a) malloc( (unsigned)(a) ) +#define MALLOC(a) malloc( (size_t)(a) ) #define FREE free #define CALLOC calloc #define NEW(a) (a *)malloc(sizeof(a)) Modified: mvapich/trunk/mpid/util/sbcnst2.h =================================================================== --- mvapich/trunk/mpid/util/sbcnst2.h 2008-09-23 03:26:54 UTC (rev 3004) +++ mvapich/trunk/mpid/util/sbcnst2.h 2008-09-23 18:43:02 UTC (rev 3005) @@ -42,7 +42,7 @@ /* Also replace the SB allocators so that we can get the trmalloc line/file tracing. */ #define MPID_SBinit(a,b,c) ((void *)(a)) -#define MPID_SBalloc(a) MPID_trmalloc((unsigned)(a),__LINE__,__FILE__) +#define MPID_SBalloc(a) MPID_trmalloc((size_t)(a),__LINE__,__FILE__) #define MPID_SBfree(a,b) MPID_trfree((char *)(b),__LINE__,__FILE__) #define MPID_SBdestroy(a) #else @@ -71,8 +71,8 @@ #endif /* HAVE_STDLIB_H || STDC_HEADERS */ #endif /* !defined(P4_INCLUDED) */ -#define MALLOC(a) malloc((unsigned)(a)) -#define CALLOC(a,b) calloc((unsigned)(a),(unsigned)(b)) +#define MALLOC(a) malloc((size_t)(a)) +#define CALLOC(a,b) calloc((size_t)(a),(size_t)(b)) #define FREE(a) free((char *)(a)) #define NEW(a) (a *)MALLOC(sizeof(a)) #endif /*MPIR_MEMDEBUG*/ Modified: mvapich/trunk/mpid/util/tr2.c =================================================================== --- mvapich/trunk/mpid/util/tr2.c 2008-09-23 03:26:54 UTC (rev 3004) +++ mvapich/trunk/mpid/util/tr2.c 2008-09-23 18:43:02 UTC (rev 3005) @@ -139,12 +139,12 @@ double aligned pointer to requested storage, or null if not available. +*/ -void *MPID_trmalloc( unsigned int a, int lineno, char *fname ) +void *MPID_trmalloc( size_t a, int lineno, char *fname ) { TRSPACE *head; char *new; unsigned long *nend; - unsigned int nsize; + size_t nsize; int l; if (TRdebugLevel > 0) { @@ -163,7 +163,7 @@ return 0; } - new = malloc( (unsigned)( nsize + sizeof(TrSPACE) + sizeof(unsigned long) ) ); + new = malloc( (size_t)( nsize + sizeof(TrSPACE) + sizeof(unsigned long) ) ); if (!new) return 0; memset( new, 0xfc, nsize + sizeof(TrSPACE) + sizeof(unsigned long) ); @@ -584,14 +584,14 @@ available. +*/ void *MPID_trcalloc( - unsigned nelem, - unsigned elsize, + size_t nelem, + size_t elsize, int lineno, char *fname ) { void *p; -p = MPID_trmalloc( (unsigned)(nelem*elsize), lineno, fname ); +p = MPID_trmalloc( (size_t)(nelem*elsize), lineno, fname ); if (p) { memset(p,0,nelem*elsize); } @@ -614,7 +614,7 @@ +*/ void *MPID_trrealloc( void *p, - int size, + size_t size, int lineno, char *fname) { @@ -634,7 +634,7 @@ return 0; } - pnew = MPID_trmalloc( (unsigned)size, lineno, fname ); + pnew = MPID_trmalloc( (size_t)size, lineno, fname ); if (!pnew) return p; nsize = size; Modified: mvapich/trunk/mpid/util/tr2.h =================================================================== --- mvapich/trunk/mpid/util/tr2.h 2008-09-23 03:26:54 UTC (rev 3004) +++ mvapich/trunk/mpid/util/tr2.h 2008-09-23 18:43:02 UTC (rev 3005) @@ -14,15 +14,15 @@ /* Define MPIR_MEMDEBUG to enable these memory tracing routines */ #if defined(MPIR_MEMDEBUG) || defined(_TR_SOURCE) -#define MALLOC(a) MPID_trmalloc((unsigned)(a),__LINE__,__FILE__) +#define MALLOC(a) MPID_trmalloc((size_t)(a),__LINE__,__FILE__) #define CALLOC(a,b) \ - MPID_trcalloc((unsigned)(a),(unsigned)(b),__LINE__,__FILE__) + MPID_trcalloc((size_t)(a),(size_t)(b),__LINE__,__FILE__) #define FREE(a) MPID_trfree(a,__LINE__,__FILE__) #define NEW(a) (a *)MALLOC(sizeof(a)) #define STRDUP(a) MPID_trstrdup(a,__LINE__,__FILE__) void MPID_trinit ( int ); -void *MPID_trmalloc ( unsigned int, int, char * ); +void *MPID_trmalloc ( size_t, int, char * ); void MPID_trfree ( void *, int, char * ); int MPID_trvalid ( char * ); void MPID_trspace ( int *, int * ); @@ -34,14 +34,14 @@ void MPID_trpop (void); void MPID_trDebugLevel ( int ); void *MPID_trstrdup( const char *, int, const char * ); -void *MPID_trcalloc ( unsigned, unsigned, int, char * ); -void *MPID_trrealloc ( void *, int, int, char * ); +void *MPID_trcalloc ( size_t, size_t, int, char * ); +void *MPID_trrealloc ( void *, size_t, int, char * ); void MPID_trdumpGrouped ( FILE * ); void MPID_TrSetMaxMem ( int ); #else /* Should these use size_t for ANSI? */ -#define MALLOC(a) malloc((unsigned)(a)) -#define CALLOC(a,b) calloc((unsigned)(a),(unsigned)(b)) +#define MALLOC(a) malloc((size_t)(a)) +#define CALLOC(a,b) calloc((size_t)(a),(size_t)(b)) #define FREE(a) free((void *)(a)) #define NEW(a) (a *)MALLOC(sizeof(a)) #define STRDUP(a) strdup(a) From chail at mvapich.cse.ohio-state.edu Tue Sep 23 15:34:39 2008 From: chail at mvapich.cse.ohio-state.edu (chail@mvapich.cse.ohio-state.edu) Date: Tue Sep 23 15:34:44 2008 Subject: [mvapich-commit] r3006 - mvapich/trunk/mpid/ch_gen2 Message-ID: <200809231934.m8NJYdx7018375@mvapich.cse.ohio-state.edu> Author: chail Date: 2008-09-23 15:34:37 -0400 (Tue, 23 Sep 2008) New Revision: 3006 Modified: mvapich/trunk/mpid/ch_gen2/ibverbs_header.h Log: Omitted one place for data type fix. Modified: mvapich/trunk/mpid/ch_gen2/ibverbs_header.h =================================================================== --- mvapich/trunk/mpid/ch_gen2/ibverbs_header.h 2008-09-23 18:43:02 UTC (rev 3005) +++ mvapich/trunk/mpid/ch_gen2/ibverbs_header.h 2008-09-23 19:34:37 UTC (rev 3006) @@ -41,7 +41,7 @@ #undef FREE /* src/env/initutil.c NEW not defined */ #define MALLOC(a) malloc((size_t)(a)) -#define CALLOC(a,b) calloc((unsigned)(a),(unsigned)(b)) +#define CALLOC(a,b) calloc((size_t)(a),(size_t)(b)) #define FREE(a) free((char *)(a)) #define NEW(a) (a *)MALLOC(sizeof(a)) #define STRDUP(a) strdup(a) From chail at mvapich.cse.ohio-state.edu Tue Sep 23 15:55:55 2008 From: chail at mvapich.cse.ohio-state.edu (chail@mvapich.cse.ohio-state.edu) Date: Tue Sep 23 15:56:01 2008 Subject: [mvapich-commit] r3008 - in mvapich/branches/1.0/mpid: ch_gen2 util Message-ID: <200809231955.m8NJttbf018432@mvapich.cse.ohio-state.edu> Author: chail Date: 2008-09-23 15:55:51 -0400 (Tue, 23 Sep 2008) New Revision: 3008 Modified: mvapich/branches/1.0/mpid/ch_gen2/ibverbs_header.h mvapich/branches/1.0/mpid/ch_gen2/mpimem.h mvapich/branches/1.0/mpid/util/sbcnst2.h mvapich/branches/1.0/mpid/util/tr2.c mvapich/branches/1.0/mpid/util/tr2.h Log: Fix data types for memory allocation. Modified: mvapich/branches/1.0/mpid/ch_gen2/ibverbs_header.h =================================================================== --- mvapich/branches/1.0/mpid/ch_gen2/ibverbs_header.h 2008-09-23 19:43:55 UTC (rev 3007) +++ mvapich/branches/1.0/mpid/ch_gen2/ibverbs_header.h 2008-09-23 19:55:51 UTC (rev 3008) @@ -40,8 +40,8 @@ #undef MALLOC #undef FREE /* src/env/initutil.c NEW not defined */ -#define MALLOC(a) malloc((unsigned)(a)) -#define CALLOC(a,b) calloc((unsigned)(a),(unsigned)(b)) +#define MALLOC(a) malloc((size_t)(a)) +#define CALLOC(a,b) calloc((size_t)(a),(size_t)(b)) #define FREE(a) free((char *)(a)) #define NEW(a) (a *)MALLOC(sizeof(a)) #define STRDUP(a) strdup(a) Modified: mvapich/branches/1.0/mpid/ch_gen2/mpimem.h =================================================================== --- mvapich/branches/1.0/mpid/ch_gen2/mpimem.h 2008-09-23 19:43:55 UTC (rev 3007) +++ mvapich/branches/1.0/mpid/ch_gen2/mpimem.h 2008-09-23 19:55:51 UTC (rev 3008) @@ -59,7 +59,7 @@ /* Need to determine how to declare malloc for all systems, some of which may need/allow an explicit declaration */ #include -#define MALLOC(a) malloc( (unsigned)(a) ) +#define MALLOC(a) malloc( (size_t)(a) ) #define FREE free #define CALLOC calloc #define NEW(a) (a *)malloc(sizeof(a)) Modified: mvapich/branches/1.0/mpid/util/sbcnst2.h =================================================================== --- mvapich/branches/1.0/mpid/util/sbcnst2.h 2008-09-23 19:43:55 UTC (rev 3007) +++ mvapich/branches/1.0/mpid/util/sbcnst2.h 2008-09-23 19:55:51 UTC (rev 3008) @@ -42,7 +42,7 @@ /* Also replace the SB allocators so that we can get the trmalloc line/file tracing. */ #define MPID_SBinit(a,b,c) ((void *)(a)) -#define MPID_SBalloc(a) MPID_trmalloc((unsigned)(a),__LINE__,__FILE__) +#define MPID_SBalloc(a) MPID_trmalloc((size_t)(a),__LINE__,__FILE__) #define MPID_SBfree(a,b) MPID_trfree((char *)(b),__LINE__,__FILE__) #define MPID_SBdestroy(a) #else @@ -71,8 +71,8 @@ #endif /* HAVE_STDLIB_H || STDC_HEADERS */ #endif /* !defined(P4_INCLUDED) */ -#define MALLOC(a) malloc((unsigned)(a)) -#define CALLOC(a,b) calloc((unsigned)(a),(unsigned)(b)) +#define MALLOC(a) malloc((size_t)(a)) +#define CALLOC(a,b) calloc((size_t)(a),(size_t)(b)) #define FREE(a) free((char *)(a)) #define NEW(a) (a *)MALLOC(sizeof(a)) #endif /*MPIR_MEMDEBUG*/ Modified: mvapich/branches/1.0/mpid/util/tr2.c =================================================================== --- mvapich/branches/1.0/mpid/util/tr2.c 2008-09-23 19:43:55 UTC (rev 3007) +++ mvapich/branches/1.0/mpid/util/tr2.c 2008-09-23 19:55:51 UTC (rev 3008) @@ -139,12 +139,12 @@ double aligned pointer to requested storage, or null if not available. +*/ -void *MPID_trmalloc( unsigned int a, int lineno, char *fname ) +void *MPID_trmalloc( size_t a, int lineno, char *fname ) { TRSPACE *head; char *new; unsigned long *nend; - unsigned int nsize; + size_t nsize; int l; if (TRdebugLevel > 0) { @@ -163,7 +163,7 @@ return 0; } - new = malloc( (unsigned)( nsize + sizeof(TrSPACE) + sizeof(unsigned long) ) ); + new = malloc( (size_t)( nsize + sizeof(TrSPACE) + sizeof(unsigned long) ) ); if (!new) return 0; memset( new, 0xfc, nsize + sizeof(TrSPACE) + sizeof(unsigned long) ); @@ -584,14 +584,14 @@ available. +*/ void *MPID_trcalloc( - unsigned nelem, - unsigned elsize, + size_t nelem, + size_t elsize, int lineno, char *fname ) { void *p; -p = MPID_trmalloc( (unsigned)(nelem*elsize), lineno, fname ); +p = MPID_trmalloc( (size_t)(nelem*elsize), lineno, fname ); if (p) { memset(p,0,nelem*elsize); } @@ -614,7 +614,7 @@ +*/ void *MPID_trrealloc( void *p, - int size, + size_t size, int lineno, char *fname) { @@ -634,7 +634,7 @@ return 0; } - pnew = MPID_trmalloc( (unsigned)size, lineno, fname ); + pnew = MPID_trmalloc( (size_t)size, lineno, fname ); if (!pnew) return p; nsize = size; Modified: mvapich/branches/1.0/mpid/util/tr2.h =================================================================== --- mvapich/branches/1.0/mpid/util/tr2.h 2008-09-23 19:43:55 UTC (rev 3007) +++ mvapich/branches/1.0/mpid/util/tr2.h 2008-09-23 19:55:51 UTC (rev 3008) @@ -14,15 +14,15 @@ /* Define MPIR_MEMDEBUG to enable these memory tracing routines */ #if defined(MPIR_MEMDEBUG) || defined(_TR_SOURCE) -#define MALLOC(a) MPID_trmalloc((unsigned)(a),__LINE__,__FILE__) +#define MALLOC(a) MPID_trmalloc((size_t)(a),__LINE__,__FILE__) #define CALLOC(a,b) \ - MPID_trcalloc((unsigned)(a),(unsigned)(b),__LINE__,__FILE__) + MPID_trcalloc((size_t)(a),(size_t)(b),__LINE__,__FILE__) #define FREE(a) MPID_trfree(a,__LINE__,__FILE__) #define NEW(a) (a *)MALLOC(sizeof(a)) #define STRDUP(a) MPID_trstrdup(a,__LINE__,__FILE__) void MPID_trinit ( int ); -void *MPID_trmalloc ( unsigned int, int, char * ); +void *MPID_trmalloc ( size_t, int, char * ); void MPID_trfree ( void *, int, char * ); int MPID_trvalid ( char * ); void MPID_trspace ( int *, int * ); @@ -34,14 +34,14 @@ void MPID_trpop (void); void MPID_trDebugLevel ( int ); void *MPID_trstrdup( const char *, int, const char * ); -void *MPID_trcalloc ( unsigned, unsigned, int, char * ); -void *MPID_trrealloc ( void *, int, int, char * ); +void *MPID_trcalloc ( size_t, size_t, int, char * ); +void *MPID_trrealloc ( void *, size_t, int, char * ); void MPID_trdumpGrouped ( FILE * ); void MPID_TrSetMaxMem ( int ); #else /* Should these use size_t for ANSI? */ -#define MALLOC(a) malloc((unsigned)(a)) -#define CALLOC(a,b) calloc((unsigned)(a),(unsigned)(b)) +#define MALLOC(a) malloc((size_t)(a)) +#define CALLOC(a,b) calloc((size_t)(a),(size_t)(b)) #define FREE(a) free((void *)(a)) #define NEW(a) (a *)MALLOC(sizeof(a)) #define STRDUP(a) strdup(a) From chail at mvapich.cse.ohio-state.edu Wed Sep 24 23:17:31 2008 From: chail at mvapich.cse.ohio-state.edu (chail@mvapich.cse.ohio-state.edu) Date: Wed Sep 24 23:17:37 2008 Subject: [mvapich-commit] r3010 - mvapich/branches/1.0/mpid/ch_gen2 Message-ID: <200809250317.m8P3HV4D028683@mvapich.cse.ohio-state.edu> Author: chail Date: 2008-09-24 23:17:29 -0400 (Wed, 24 Sep 2008) New Revision: 3010 Modified: mvapich/branches/1.0/mpid/ch_gen2/mpid_hrecv.c Log: Remove an unnecessary check for non-contiguous data type. Modified: mvapich/branches/1.0/mpid/ch_gen2/mpid_hrecv.c =================================================================== --- mvapich/branches/1.0/mpid/ch_gen2/mpid_hrecv.c 2008-09-24 18:22:34 UTC (rev 3009) +++ mvapich/branches/1.0/mpid/ch_gen2/mpid_hrecv.c 2008-09-25 03:17:29 UTC (rev 3010) @@ -117,21 +117,6 @@ return; } - - /* We have a non-contiguous buffer. - * Normally we would check for a null user buffer inside - * MPID_VIA_Irecv, but in this case we will pass the allocated - * buffer, not the user buffer, so check the user buffer - * here. - */ - - if (Is_MPI_Bottom(buf, count, dtype_ptr)) { - /* do not have to adjust ptr here */ - } else if (buf == 0 && count > 0) { - *error_code = MPI_ERR_BUFFER; - return; - } - /* Increment reference count for this type */ MPIR_Type_dup(dtype_ptr); From chail at mvapich.cse.ohio-state.edu Thu Sep 25 14:58:46 2008 From: chail at mvapich.cse.ohio-state.edu (chail@mvapich.cse.ohio-state.edu) Date: Thu Sep 25 14:58:53 2008 Subject: [mvapich-commit] r3011 - in mvapich2/trunk/src: include util/mem Message-ID: <200809251858.m8PIwkNI004399@mvapich.cse.ohio-state.edu> Author: chail Date: 2008-09-25 14:58:45 -0400 (Thu, 25 Sep 2008) New Revision: 3011 Modified: mvapich2/trunk/src/include/mpimem.h mvapich2/trunk/src/util/mem/trmem.c mvapich2/trunk/src/util/mem/trmem.h Log: Fix data types for mamory allocation. Modified: mvapich2/trunk/src/include/mpimem.h =================================================================== --- mvapich2/trunk/src/include/mpimem.h 2008-09-25 03:17:29 UTC (rev 3010) +++ mvapich2/trunk/src/include/mpimem.h 2008-09-25 18:58:45 UTC (rev 3011) @@ -157,7 +157,7 @@ Utility M*/ -#define MPIU_Malloc(a) MPIU_trmalloc((unsigned)(a),__LINE__,__FILE__) +#define MPIU_Malloc(a) MPIU_trmalloc((size_t)(a),__LINE__,__FILE__) /*M MPIU_Calloc - Allocate memory that is initialized to zero. @@ -178,7 +178,7 @@ Utility M*/ #define MPIU_Calloc(a,b) \ - MPIU_trcalloc((unsigned)(a),(unsigned)(b),__LINE__,__FILE__) + MPIU_trcalloc((size_t)(a),(size_t)(b),__LINE__,__FILE__) /*M MPIU_Free - Free memory @@ -233,7 +233,7 @@ src/util/mem/trmem.c package, and are no longer used. Also, it may be preferable to use trmem.h instead of these definitions */ void MPIU_trinit ( int ); -void *MPIU_trmalloc ( unsigned int, int, const char * ); +void *MPIU_trmalloc ( size_t, int, const char * ); void MPIU_trfree ( void *, int, const char * ); int MPIU_trvalid ( const char * ); void MPIU_trspace ( int *, int * ); @@ -243,8 +243,8 @@ void MPIU_trpop (void); void MPIU_trDebugLevel ( int ); void *MPIU_trstrdup( const char *, int, const char * ); -void *MPIU_trcalloc ( unsigned, unsigned, int, const char * ); -void *MPIU_trrealloc ( void *, int, int, const char * ); +void *MPIU_trcalloc ( size_t, size_t, int, const char * ); +void *MPIU_trrealloc ( void *, size_t, int, const char * ); void MPIU_TrSetMaxMem ( int ); #ifndef MPIU_MEM_NOSTDIO Modified: mvapich2/trunk/src/util/mem/trmem.c =================================================================== --- mvapich2/trunk/src/util/mem/trmem.c 2008-09-25 03:17:29 UTC (rev 3010) +++ mvapich2/trunk/src/util/mem/trmem.c 2008-09-25 18:58:45 UTC (rev 3011) @@ -191,7 +191,7 @@ double aligned pointer to requested storage, or null if not available. +*/ -void *MPIU_trmalloc( unsigned int a, int lineno, const char fname[] ) +void *MPIU_trmalloc( size_t a, int lineno, const char fname[] ) { TRSPACE *head; char *new; @@ -219,7 +219,7 @@ return 0; } - new = malloc( (unsigned)( nsize + sizeof(TrSPACE) + sizeof(unsigned long) ) ); + new = malloc( (size_t)( nsize + sizeof(TrSPACE) + sizeof(unsigned long) ) ); if (!new) return 0; memset( new, TRDefaultByte, @@ -649,12 +649,12 @@ Double aligned pointer to requested storage, or null if not available. +*/ -void *MPIU_trcalloc( unsigned int nelem, unsigned int elsize, int lineno, +void *MPIU_trcalloc( size_t nelem, size_t elsize, int lineno, const char fname[] ) { void *p; - p = MPIU_trmalloc( (unsigned)(nelem*elsize), lineno, fname ); + p = MPIU_trmalloc( (size_t)(nelem*elsize), lineno, fname ); if (p) { memset(p,0,nelem*elsize); } @@ -675,7 +675,7 @@ available. This implementation ALWAYS allocates new space and copies the contents into the new space. +*/ -void *MPIU_trrealloc( void *p, int size, int lineno, const char fname[] ) +void *MPIU_trrealloc( void *p, size_t size, int lineno, const char fname[] ) { void *pnew; char *pa; @@ -697,7 +697,7 @@ return 0; } } - pnew = MPIU_trmalloc( (unsigned)size, lineno, fname ); + pnew = MPIU_trmalloc( (size_t)size, lineno, fname ); if (!pnew) return p; if (p) { Modified: mvapich2/trunk/src/util/mem/trmem.h =================================================================== --- mvapich2/trunk/src/util/mem/trmem.h 2008-09-25 03:17:29 UTC (rev 3010) +++ mvapich2/trunk/src/util/mem/trmem.h 2008-09-25 18:58:45 UTC (rev 3011) @@ -8,15 +8,15 @@ #define _TRMEM_H_INCLUDED void MPIU_trinit( int ); -void *MPIU_trmalloc( unsigned int, int, const char [] ); +void *MPIU_trmalloc( size_t, int, const char [] ); void MPIU_trfree( void *, int, const char [] ); int MPIU_trvalid( const char [] ); void MPIU_trspace( int *, int * ); void MPIU_trid( int ); void MPIU_trlevel( int ); void MPIU_trDebugLevel( int ); -void *MPIU_trcalloc( unsigned int, unsigned int, int, const char [] ); -void *MPIU_trrealloc( void *, int, int, const char[] ); +void *MPIU_trcalloc( size_t, size_t, int, const char [] ); +void *MPIU_trrealloc( void *, size_t, int, const char[] ); void *MPIU_trstrdup( const char *, int, const char[] ); void MPIU_TrSetMaxMem( int ); From chail at mvapich.cse.ohio-state.edu Thu Sep 25 15:08:24 2008 From: chail at mvapich.cse.ohio-state.edu (chail@mvapich.cse.ohio-state.edu) Date: Thu Sep 25 15:08:32 2008 Subject: [mvapich-commit] r3013 - mvapich/trunk/mpid/ch_psm Message-ID: <200809251908.m8PJ8OAa004470@mvapich.cse.ohio-state.edu> Author: chail Date: 2008-09-25 15:08:24 -0400 (Thu, 25 Sep 2008) New Revision: 3013 Modified: mvapich/trunk/mpid/ch_psm/mpimem.h Log: Fix data type for memory allocation in psm device. Modified: mvapich/trunk/mpid/ch_psm/mpimem.h =================================================================== --- mvapich/trunk/mpid/ch_psm/mpimem.h 2008-09-25 19:04:34 UTC (rev 3012) +++ mvapich/trunk/mpid/ch_psm/mpimem.h 2008-09-25 19:08:24 UTC (rev 3013) @@ -59,7 +59,7 @@ /* Need to determine how to declare malloc for all systems, some of which may need/allow an explicit declaration */ #include -#define MALLOC(a) malloc( (unsigned)(a) ) +#define MALLOC(a) malloc( (size_t)(a) ) #define FREE free #define CALLOC calloc #define NEW(a) (a *)malloc(sizeof(a)) From chail at mvapich.cse.ohio-state.edu Thu Sep 25 15:09:08 2008 From: chail at mvapich.cse.ohio-state.edu (chail@mvapich.cse.ohio-state.edu) Date: Thu Sep 25 15:09:15 2008 Subject: [mvapich-commit] r3014 - mvapich/branches/1.0/mpid/ch_psm Message-ID: <200809251909.m8PJ98WJ004488@mvapich.cse.ohio-state.edu> Author: chail Date: 2008-09-25 15:09:08 -0400 (Thu, 25 Sep 2008) New Revision: 3014 Modified: mvapich/branches/1.0/mpid/ch_psm/mpimem.h Log: Fix data type for memory allocation in psm device. Modified: mvapich/branches/1.0/mpid/ch_psm/mpimem.h =================================================================== --- mvapich/branches/1.0/mpid/ch_psm/mpimem.h 2008-09-25 19:08:24 UTC (rev 3013) +++ mvapich/branches/1.0/mpid/ch_psm/mpimem.h 2008-09-25 19:09:08 UTC (rev 3014) @@ -59,7 +59,7 @@ /* Need to determine how to declare malloc for all systems, some of which may need/allow an explicit declaration */ #include -#define MALLOC(a) malloc( (unsigned)(a) ) +#define MALLOC(a) malloc( (size_t)(a) ) #define FREE free #define CALLOC calloc #define NEW(a) (a *)malloc(sizeof(a)) From chail at mvapich.cse.ohio-state.edu Thu Sep 25 15:32:08 2008 From: chail at mvapich.cse.ohio-state.edu (chail@mvapich.cse.ohio-state.edu) Date: Thu Sep 25 15:32:13 2008 Subject: [mvapich-commit] r3017 - mvapich/trunk/mpid/ch_smp Message-ID: <200809251932.m8PJW8Tu004570@mvapich.cse.ohio-state.edu> Author: chail Date: 2008-09-25 15:32:08 -0400 (Thu, 25 Sep 2008) New Revision: 3017 Modified: mvapich/trunk/mpid/ch_smp/mpimem.h Log: Fix data type for memory allocation in smp device. Modified: mvapich/trunk/mpid/ch_smp/mpimem.h =================================================================== --- mvapich/trunk/mpid/ch_smp/mpimem.h 2008-09-25 19:31:30 UTC (rev 3016) +++ mvapich/trunk/mpid/ch_smp/mpimem.h 2008-09-25 19:32:08 UTC (rev 3017) @@ -59,7 +59,7 @@ /* Need to determine how to declare malloc for all systems, some of which may need/allow an explicit declaration */ #include -#define MALLOC(a) malloc( (unsigned)(a) ) +#define MALLOC(a) malloc( (size_t)(a) ) #define FREE free #define CALLOC calloc #define NEW(a) (a *)malloc(sizeof(a)) From chail at mvapich.cse.ohio-state.edu Thu Sep 25 15:32:40 2008 From: chail at mvapich.cse.ohio-state.edu (chail@mvapich.cse.ohio-state.edu) Date: Thu Sep 25 15:32:44 2008 Subject: [mvapich-commit] r3018 - mvapich/branches/1.0/mpid/ch_smp Message-ID: <200809251932.m8PJWe0L004588@mvapich.cse.ohio-state.edu> Author: chail Date: 2008-09-25 15:32:39 -0400 (Thu, 25 Sep 2008) New Revision: 3018 Modified: mvapich/branches/1.0/mpid/ch_smp/mpimem.h Log: Fix data type for memory allocation in smp device. Modified: mvapich/branches/1.0/mpid/ch_smp/mpimem.h =================================================================== --- mvapich/branches/1.0/mpid/ch_smp/mpimem.h 2008-09-25 19:32:08 UTC (rev 3017) +++ mvapich/branches/1.0/mpid/ch_smp/mpimem.h 2008-09-25 19:32:39 UTC (rev 3018) @@ -59,7 +59,7 @@ /* Need to determine how to declare malloc for all systems, some of which may need/allow an explicit declaration */ #include -#define MALLOC(a) malloc( (unsigned)(a) ) +#define MALLOC(a) malloc( (size_t)(a) ) #define FREE free #define CALLOC calloc #define NEW(a) (a *)malloc(sizeof(a)) From chail at mvapich.cse.ohio-state.edu Thu Sep 25 20:10:26 2008 From: chail at mvapich.cse.ohio-state.edu (chail@mvapich.cse.ohio-state.edu) Date: Thu Sep 25 20:10:32 2008 Subject: [mvapich-commit] r3019 - mvapich2/trunk/src/mpid/ch3/channels/mrail/src/gen2 Message-ID: <200809260010.m8Q0AQWW005083@mvapich.cse.ohio-state.edu> Author: chail Date: 2008-09-25 20:10:24 -0400 (Thu, 25 Sep 2008) New Revision: 3019 Modified: mvapich2/trunk/src/mpid/ch3/channels/mrail/src/gen2/ibv_param.c mvapich2/trunk/src/mpid/ch3/channels/mrail/src/gen2/ibv_param.h Log: Change MV2_DEFAULT_MAX_WQE from 200 to 64 to reduce memory usage. Make MV2_MAX_INLINE_SIZE an env variable for the user to change the default inline size. Modified: mvapich2/trunk/src/mpid/ch3/channels/mrail/src/gen2/ibv_param.c =================================================================== --- mvapich2/trunk/src/mpid/ch3/channels/mrail/src/gen2/ibv_param.c 2008-09-25 19:32:39 UTC (rev 3018) +++ mvapich2/trunk/src/mpid/ch3/channels/mrail/src/gen2/ibv_param.c 2008-09-26 00:10:24 UTC (rev 3019) @@ -891,6 +891,9 @@ if ((value = getenv("MV2_PIN_POOL_SIZE")) != NULL) { rdma_pin_pool_size = (int)atoi(value); } + if ((value = getenv("MV2_MAX_INLINE_SIZE")) != NULL) { + rdma_max_inline_size = (int)atoi(value); + } if ((value = getenv("MV2_DEFAULT_MAX_CQ_SIZE")) != NULL) { rdma_default_max_cq_size = (int)atoi(value); } Modified: mvapich2/trunk/src/mpid/ch3/channels/mrail/src/gen2/ibv_param.h =================================================================== --- mvapich2/trunk/src/mpid/ch3/channels/mrail/src/gen2/ibv_param.h 2008-09-25 19:32:39 UTC (rev 3018) +++ mvapich2/trunk/src/mpid/ch3/channels/mrail/src/gen2/ibv_param.h 2008-09-26 00:10:24 UTC (rev 3019) @@ -102,7 +102,7 @@ #define RDMA_DEFAULT_MAX_CQ_SIZE (40000) #define RDMA_DEFAULT_PORT (-1) #define RDMA_DEFAULT_MAX_PORTS (2) -#define RDMA_DEFAULT_MAX_WQE (200) +#define RDMA_DEFAULT_MAX_WQE (64) #define RDMA_READ_RESERVE (10) #define RDMA_DEFAULT_MAX_SG_LIST (1) #define RDMA_DEFAULT_PKEY_IX (0)