December 2014 - commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.2a2-35-g810dcf2
by noreply＠mpich.org 05 Dec '14

05 Dec '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 810dcf24c3f9c3c35106efe9af8e6fb6b73ce400 (commit) from 32788e87819dda3e98968b977ddf12827009d372 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/810dcf24c3f9c3c35106efe9af8e6fb6b… commit 810dcf24c3f9c3c35106efe9af8e6fb6b73ce400 Author: andrey.lobanov <andrey.lobanov(a)intel.com> Date: Fri Oct 17 13:58:21 2014 +0400 fixed memory leaks in pmi messages handling - name publishing/lookup support (pmi v1 and v2) - job and node attrs (v2) Change-Id: Id18d968da0d0bbf6e8cb2e7acffaf77d82a5e8b0 Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/pm/hydra/pm/pmiserv/pmip_pmi_v2.c b/src/pm/hydra/pm/pmiserv/pmip_pmi_v2.c index 66f677b..7a1723b 100644 --- a/src/pm/hydra/pm/pmiserv/pmip_pmi_v2.c +++ b/src/pm/hydra/pm/pmiserv/pmip_pmi_v2.c @@ -19,7 +19,7 @@ static HYD_status send_cmd_upstream(const char *start, int fd, char *args[]) { int i, sent, closed; struct HYD_string_stash stash; - char *buf; + char *buf = NULL; struct HYD_pmcd_hdr hdr; HYD_status status = HYD_SUCCESS; @@ -56,6 +56,8 @@ static HYD_status send_cmd_upstream(const char *start, int fd, char *args[]) HYDU_ASSERT(!closed, status); fn_exit: + if (buf) + HYDU_FREE(buf); HYDU_FUNC_EXIT(); return status; @@ -216,7 +218,7 @@ static HYD_status fn_job_getid(int fd, char *args[]) { struct HYD_string_stash stash; char *cmd, *thrid; - struct HYD_pmcd_token *tokens; + struct HYD_pmcd_token *tokens = NULL; int token_count; HYD_status status = HYD_SUCCESS; @@ -244,6 +246,8 @@ static HYD_status fn_job_getid(int fd, char *args[]) HYDU_FREE(cmd); fn_exit: + if (tokens) + HYD_pmcd_pmi_free_tokens(tokens, token_count); HYDU_FUNC_EXIT(); return status; @@ -255,7 +259,7 @@ static HYD_status fn_info_putnodeattr(int fd, char *args[]) { struct HYD_string_stash stash; char *key, *val, *thrid, *cmd; - struct HYD_pmcd_token *tokens; + struct HYD_pmcd_token *tokens = NULL; int token_count, ret; struct HYD_pmcd_pmi_v2_reqs *req; HYD_status status = HYD_SUCCESS; @@ -302,6 +306,8 @@ static HYD_status fn_info_putnodeattr(int fd, char *args[]) } fn_exit: + if (tokens) + HYD_pmcd_pmi_free_tokens(tokens, token_count); HYDU_FUNC_EXIT(); return status; @@ -316,7 +322,7 @@ static HYD_status fn_info_getnodeattr(int fd, char *args[]) char *key, *waitval, *thrid; struct HYD_string_stash stash; char *cmd; - struct HYD_pmcd_token *tokens; + struct HYD_pmcd_token *tokens = NULL; int token_count; HYD_status status = HYD_SUCCESS; @@ -384,6 +390,8 @@ static HYD_status fn_info_getnodeattr(int fd, char *args[]) } fn_exit: + if (tokens) + HYD_pmcd_pmi_free_tokens(tokens, token_count); HYDU_FUNC_EXIT(); return status; @@ -446,7 +454,7 @@ static HYD_status fn_finalize(int fd, char *args[]) char *thrid; struct HYD_string_stash stash; char *cmd; - struct HYD_pmcd_token *tokens; + struct HYD_pmcd_token *tokens = NULL; int token_count; HYD_status status = HYD_SUCCESS; @@ -476,6 +484,8 @@ static HYD_status fn_finalize(int fd, char *args[]) close(fd); fn_exit: + if (tokens) + HYD_pmcd_pmi_free_tokens(tokens, token_count); HYDU_FUNC_EXIT(); return status; diff --git a/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c b/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c index b3c0dfe..a855582 100644 --- a/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c +++ b/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c @@ -629,8 +629,8 @@ static HYD_status fn_publish_name(int fd, int pid, int pgid, char *args[]) struct HYD_string_stash stash; char *cmd, *val; int token_count; - struct HYD_pmcd_token *tokens; - char *name, *port; + struct HYD_pmcd_token *tokens = NULL; + char *name = NULL, *port = NULL; int success = 0; HYD_status status = HYD_SUCCESS; @@ -666,6 +666,13 @@ static HYD_status fn_publish_name(int fd, int pid, int pgid, char *args[]) HYDU_FREE(cmd); fn_exit: + if (tokens) + HYD_pmcd_pmi_free_tokens(tokens, token_count); + if (name) + HYDU_FREE(name); + if (port) + HYDU_FREE(port); + HYDU_FUNC_EXIT(); return status; @@ -678,7 +685,7 @@ static HYD_status fn_unpublish_name(int fd, int pid, int pgid, char *args[]) struct HYD_string_stash stash; char *cmd, *name; int token_count; - struct HYD_pmcd_token *tokens; + struct HYD_pmcd_token *tokens = NULL; int success = 0; HYD_status status = HYD_SUCCESS; @@ -709,6 +716,8 @@ static HYD_status fn_unpublish_name(int fd, int pid, int pgid, char *args[]) HYDU_FREE(cmd); fn_exit: + if (tokens) + HYD_pmcd_pmi_free_tokens(tokens, token_count); HYDU_FUNC_EXIT(); return status; @@ -719,9 +728,9 @@ static HYD_status fn_unpublish_name(int fd, int pid, int pgid, char *args[]) static HYD_status fn_lookup_name(int fd, int pid, int pgid, char *args[]) { struct HYD_string_stash stash; - char *cmd, *name, *value; + char *cmd, *name, *value = NULL; int token_count; - struct HYD_pmcd_token *tokens; + struct HYD_pmcd_token *tokens = NULL; HYD_status status = HYD_SUCCESS; HYDU_FUNC_ENTER(); @@ -753,6 +762,10 @@ static HYD_status fn_lookup_name(int fd, int pid, int pgid, char *args[]) HYDU_FREE(cmd); fn_exit: + if (tokens) + HYD_pmcd_pmi_free_tokens(tokens, token_count); + if (value) + HYDU_FREE(value); HYDU_FUNC_EXIT(); return status; diff --git a/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c b/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c index b079b7d..00e6377 100644 --- a/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c +++ b/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c @@ -747,9 +747,9 @@ static HYD_status fn_spawn(int fd, int pid, int pgid, char *args[]) static HYD_status fn_name_publish(int fd, int pid, int pgid, char *args[]) { struct HYD_string_stash stash; - char *cmd, *thrid, *val, *name, *port; + char *cmd, *thrid, *val, *name = NULL, *port = NULL; int token_count, success; - struct HYD_pmcd_token *tokens; + struct HYD_pmcd_token *tokens = NULL; HYD_status status = HYD_SUCCESS; HYDU_FUNC_ENTER(); @@ -792,6 +792,12 @@ static HYD_status fn_name_publish(int fd, int pid, int pgid, char *args[]) HYDU_FREE(cmd); fn_exit: + if (tokens) + HYD_pmcd_pmi_free_tokens(tokens, token_count); + if (name) + HYDU_FREE(name); + if (port) + HYDU_FREE(port); HYDU_FUNC_EXIT(); return status; @@ -804,7 +810,7 @@ static HYD_status fn_name_unpublish(int fd, int pid, int pgid, char *args[]) struct HYD_string_stash stash; char *cmd, *thrid, *name; int token_count, success; - struct HYD_pmcd_token *tokens; + struct HYD_pmcd_token *tokens = NULL; HYD_status status = HYD_SUCCESS; HYDU_FUNC_ENTER(); @@ -842,6 +848,8 @@ static HYD_status fn_name_unpublish(int fd, int pid, int pgid, char *args[]) HYDU_FREE(cmd); fn_exit: + if (tokens) + HYD_pmcd_pmi_free_tokens(tokens, token_count); HYDU_FUNC_EXIT(); return status; @@ -853,9 +861,8 @@ static HYD_status fn_name_lookup(int fd, int pid, int pgid, char *args[]) { struct HYD_string_stash stash; char *cmd, *thrid, *name, *value; - struct HYD_pmcd_pmi_publish *publish; int token_count; - struct HYD_pmcd_token *tokens; + struct HYD_pmcd_token *tokens = NULL; HYD_status status = HYD_SUCCESS; HYDU_FUNC_ENTER(); @@ -865,9 +872,6 @@ static HYD_status fn_name_lookup(int fd, int pid, int pgid, char *args[]) thrid = HYD_pmcd_pmi_find_token_keyval(tokens, token_count, "thrid"); - HYDU_MALLOC(publish, struct HYD_pmcd_pmi_publish *, sizeof(struct HYD_pmcd_pmi_publish), - status); - if ((name = HYD_pmcd_pmi_find_token_keyval(tokens, token_count, "name")) == NULL) HYDU_ERR_POP(status, "cannot find token: name\n"); @@ -897,6 +901,8 @@ static HYD_status fn_name_lookup(int fd, int pid, int pgid, char *args[]) HYDU_FREE(cmd); fn_exit: + if (tokens) + HYD_pmcd_pmi_free_tokens(tokens, token_count); HYDU_FUNC_EXIT(); return status; ----------------------------------------------------------------------- Summary of changes: src/pm/hydra/pm/pmiserv/pmip_pmi_v2.c | 20 +++++++++++++++----- src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c | 23 ++++++++++++++++++----- src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c | 22 ++++++++++++++-------- 3 files changed, 47 insertions(+), 18 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-34-g32788e8
by noreply＠mpich.org 05 Dec '14

05 Dec '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 32788e87819dda3e98968b977ddf12827009d372 (commit) from e7e36fc7011a4ae4d8ca4e2f8343f64b503f53e4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/32788e87819dda3e98968b977ddf12827… commit 32788e87819dda3e98968b977ddf12827009d372 Author: Paul Coffman <pkcoff(a)us.ibm.com> Date: Thu Dec 4 20:55:01 2014 -0600 romio gpfs: select correct read buffer addendum The original fix for 'romio gpfs: select correct read buffer' was still missing a critical piece for the last round to use the correct read buffer, resulting in a correctness issue that was missed by IOR but still found by the IBM PE test team. The fix was to correctly toggle the buffer after the last read. Signed-off-by: Paul Coffman <pkcoff(a)us.ibm.com> Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpi/romio/adio/common/p2p_aggregation.c b/src/mpi/romio/adio/common/p2p_aggregation.c index 292ba47..89e891b 100644 --- a/src/mpi/romio/adio/common/p2p_aggregation.c +++ b/src/mpi/romio/adio/common/p2p_aggregation.c @@ -733,10 +733,10 @@ void ADIOI_P2PContigReadAggregation(ADIO_File fd, } if (currentReadBuf == 0) { - read_buf = read_buf0; + read_buf = read_buf1; } else { - read_buf = read_buf1; + read_buf = read_buf0; } } ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/common/p2p_aggregation.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-33-ge7e36fc
by noreply＠mpich.org 04 Dec '14

04 Dec '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via e7e36fc7011a4ae4d8ca4e2f8343f64b503f53e4 (commit) from 8672503dc9dada489792c063dc8e6665cca0f47b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/e7e36fc7011a4ae4d8ca4e2f8343f64b5… commit e7e36fc7011a4ae4d8ca4e2f8343f64b503f53e4 Author: Min Si <msi(a)il.is.s.u-tokyo.ac.jp> Date: Thu Dec 4 17:01:11 2014 -0600 Fix win size translation in attrlangf90 test. This test passed a 0 size to win_create which is translated to a integer(32bit) var by fortran compiler and passed to c mpi_win_create as an invalid MPI_Aint(64bit) var by fortran binding because prototype checking is not supported. This test can be failed if mpi_win_create internally initializes resource related to the value of size (i.e., mxm maps win buffer in win_init). This patch fixed this issue by passing a 64bit local variable as size parameter instead of a constant var 0 in this f90 test. Signed-off-by: Junchao Zhang <jczhang(a)mcs.anl.gov> diff --git a/test/mpi/f90/attr/attrlangf90.f90 b/test/mpi/f90/attr/attrlangf90.f90 index e1cedbc..d126631 100644 --- a/test/mpi/f90/attr/attrlangf90.f90 +++ b/test/mpi/f90/attr/attrlangf90.f90 @@ -142,6 +142,7 @@ implicit none integer ierr integer errs, tv, rank + integer(MPI_ADDRESS_KIND) tmp errs = 0 call MPI_INIT( ierr ) @@ -193,7 +194,8 @@ & ) ! ! Create a window to use with the attribute tests in Fortran - call MPI_WIN_CREATE( MPI_BOTTOM, 0, 1, MPI_INFO_NULL,& + tmp = 0 + call MPI_WIN_CREATE( MPI_BOTTOM, tmp, 1, MPI_INFO_NULL,& & MPI_COMM_WORLD, win, ierr ) ! if (fverbose) then ----------------------------------------------------------------------- Summary of changes: test/mpi/f90/attr/attrlangf90.f90 | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-32-g8672503
by noreply＠mpich.org 03 Dec '14

03 Dec '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 8672503dc9dada489792c063dc8e6665cca0f47b (commit) via 77401b9511f55f8d2300fb217a2e2b8122b57832 (commit) via 422b06d25e39228d169fa3b18a8b8009f609597a (commit) from 3feca48f0a8d869e0dbe5d8155ce534c58a9a655 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/8672503dc9dada489792c063dc8e6665c… commit 8672503dc9dada489792c063dc8e6665cca0f47b Author: Wesley Bland <wbland(a)anl.gov> Date: Wed Dec 3 13:32:25 2014 -0600 Fix typo in error code man page No reviewer diff --git a/src/mpi/errhan/add_error_code.c b/src/mpi/errhan/add_error_code.c index 39b49ea..f32e383 100644 --- a/src/mpi/errhan/add_error_code.c +++ b/src/mpi/errhan/add_error_code.c @@ -32,7 +32,7 @@ int MPI_Add_error_code(int errorclass, int *errorcode) __attribute__((weak,alias #define FUNCNAME MPI_Add_error_code /*@ - MPI_Add_error_code - Add and MPI error code to an MPI error class + MPI_Add_error_code - Add an MPI error code to an MPI error class Input Parameters: . errorclass - Error class to add an error code. http://git.mpich.org/mpich.git/commitdiff/77401b9511f55f8d2300fb217a2e2b812… commit 77401b9511f55f8d2300fb217a2e2b8122b57832 Author: James Dinan <james.dinan(a)intel.com> Date: Thu Nov 20 08:27:49 2014 -0500 Add dynamic err code, predefined err class test Test for correct error class when a dynamic error code is created from a predefined error class. Signed-off-by: Wesley Bland <wbland(a)anl.gov> diff --git a/test/mpi/errhan/Makefile.am b/test/mpi/errhan/Makefile.am index 2d28fa9..2098592 100644 --- a/test/mpi/errhan/Makefile.am +++ b/test/mpi/errhan/Makefile.am @@ -19,7 +19,8 @@ noinst_PROGRAMS = \ commcall \ errfatal \ predef_eh \ - errstring2 + errstring2 \ + dynamic_errcode_predefined_errclass EXTRA_PROGRAMS = errcode errring errstring diff --git a/test/mpi/errhan/dynamic_errcode_predefined_errclass.c b/test/mpi/errhan/dynamic_errcode_predefined_errclass.c new file mode 100644 index 0000000..3fa1c9f --- /dev/null +++ b/test/mpi/errhan/dynamic_errcode_predefined_errclass.c @@ -0,0 +1,30 @@ +/* + * (C) 2006 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + * + * Portions of this code were written by Intel Corporation. + * Copyright (C) 2011-2012 Intel Corporation. Intel provides this material + * to Argonne National Laboratory subject to Software Grant and Corporate + * Contributor License Agreement dated February 8, 2012. + */ + +#include <stdio.h> +#include <mpi.h> + +int main(int argc, char **argv) { + int errcode, errclass; + + MPI_Init(&argc, &argv); + + MPI_Add_error_code(MPI_ERR_ARG, &errcode); + MPI_Error_class(errcode, &errclass); + + if (errclass != MPI_ERR_ARG) { + printf("ERROR: Got 0x%x, expected 0x%x\n", errclass, MPI_ERR_ARG); + } else { + printf( " No Errors\n" ); + } + + MPI_Finalize(); + return 0; +} diff --git a/test/mpi/errhan/testlist b/test/mpi/errhan/testlist index 8ddc826..ebd60ff 100644 --- a/test/mpi/errhan/testlist +++ b/test/mpi/errhan/testlist @@ -4,3 +4,4 @@ errfatal 1 resultTest=TestErrFatal predef_eh 1 predef_eh 2 errstring2 1 +dynamic_errcode_predefined_errclass 1 http://git.mpich.org/mpich.git/commitdiff/422b06d25e39228d169fa3b18a8b8009f… commit 422b06d25e39228d169fa3b18a8b8009f609597a Author: James Dinan <james.dinan(a)intel.com> Date: Thu Nov 20 08:20:18 2014 -0500 Fix error class buf in MPI_Error_add_code During error code creation, the error class was erroneously modified by applying ERROR_DYN_MASK when. The dynamic bit is already set for user-defined error classes, so this bug had no effect in all existing MPICH tests. However, when a predefined error class was passed during error code creation, it would be incorrectly marked as dynamic, resulting in an invalid result when the error class of a returned error code was returned via MPI_Error_class. Signed-off-by: Wesley Bland <wbland(a)anl.gov> diff --git a/src/mpi/errhan/dynerrutil.c b/src/mpi/errhan/dynerrutil.c index 8ac17af..0fb81cf 100644 --- a/src/mpi/errhan/dynerrutil.c +++ b/src/mpi/errhan/dynerrutil.c @@ -256,7 +256,7 @@ int MPIR_Err_add_code( int class ) /* --END ERROR HANDLING-- */ /* Create the full error code */ - new_code = class | ERROR_DYN_MASK | (new_code << ERROR_GENERIC_SHIFT); + new_code = class | (new_code << ERROR_GENERIC_SHIFT); /* FIXME: For robustness, we should make sure that the associated string is initialized to null */ ----------------------------------------------------------------------- Summary of changes: src/mpi/errhan/add_error_code.c | 2 +- src/mpi/errhan/dynerrutil.c | 2 +- test/mpi/errhan/Makefile.am | 3 +- .../errhan/dynamic_errcode_predefined_errclass.c | 30 ++++++++++++++++++++ test/mpi/errhan/testlist | 1 + 5 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 test/mpi/errhan/dynamic_errcode_predefined_errclass.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-29-g3feca48
by noreply＠mpich.org 03 Dec '14

03 Dec '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 3feca48f0a8d869e0dbe5d8155ce534c58a9a655 (commit) from 8bdfaf741104f88c27b8a845d4ca325ad5005122 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/3feca48f0a8d869e0dbe5d8155ce534c5… commit 3feca48f0a8d869e0dbe5d8155ce534c58a9a655 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Wed Nov 26 14:55:55 2014 -0600 fixups for revoke_shrink test Add the MPICH copyright header and remove C99 variable declaration in for loop. Signed-off-by: Wesley Bland <wbland(a)anl.gov> diff --git a/test/mpi/ft/revoke_shrink.c b/test/mpi/ft/revoke_shrink.c index cba2e05..2e30213 100644 --- a/test/mpi/ft/revoke_shrink.c +++ b/test/mpi/ft/revoke_shrink.c @@ -1,3 +1,10 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2014 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + #include <stdio.h> #include <stdlib.h> #include <stdbool.h> @@ -19,7 +26,7 @@ void error_handler(MPI_Comm *communicator, int *error_code, ...) { } int main(int argc, char *argv[]) { - int rank, size; + int rank, size, i; int sum = 0, val = 1; int errs = 0; MPI_Errhandler errhandler; @@ -38,7 +45,7 @@ int main(int argc, char *argv[]) { MPI_Comm_create_errhandler(&error_handler, &errhandler); MPI_Comm_set_errhandler(comm_all, errhandler); - for (int i = 0; i < 10; ++i) { + for (i = 0; i < 10; ++i) { MPI_Comm_size(comm_all, &size); sum = 0; if (i == 5 && rank == 1) { ----------------------------------------------------------------------- Summary of changes: test/mpi/ft/revoke_shrink.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a2-28-g8bdfaf7
by noreply＠mpich.org 02 Dec '14

02 Dec '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 8bdfaf741104f88c27b8a845d4ca325ad5005122 (commit) from d5a4685bf65bc28b1077d967244ea529af1bfc20 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/8bdfaf741104f88c27b8a845d4ca325ad… commit 8bdfaf741104f88c27b8a845d4ca325ad5005122 Author: Kuleshov Aleksey <rndfax(a)yandex.ru> Date: Mon Dec 1 09:45:30 2014 -0600 Fix bug in using wrong type for packsize. Type of the third argument for MPIR_Pack_size_impl should be a pointer to MPI_Aint. This patch fixes the wrong usage of int pointer for MPIR_Pack_size_impl in NEWMAD and MXM netmods. Signed-off-by: Sangmin Seo <sseo(a)anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c index e8bddc3..752a1f9 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c @@ -482,8 +482,8 @@ static int _mxm_process_rdtype(MPID_Request ** rreq_p, MPI_Datatype datatype, *iov_count = n_iov; } else { - int packsize = 0; - MPIR_Pack_size_impl(rreq->dev.user_count, rreq->dev.datatype, (MPI_Aint *) & packsize); + MPI_Aint packsize = 0; + MPIR_Pack_size_impl(rreq->dev.user_count, rreq->dev.datatype, &packsize); rreq->dev.tmpbuf = MPIU_Malloc((size_t) packsize); MPIU_Assert(rreq->dev.tmpbuf); rreq->dev.tmpbuf_sz = packsize; diff --git a/src/mpid/ch3/channels/nemesis/netmod/newmad/newmad_poll.c b/src/mpid/ch3/channels/nemesis/netmod/newmad/newmad_poll.c index 2dba872..5a32515 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/newmad/newmad_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/newmad/newmad_poll.c @@ -575,7 +575,7 @@ int MPID_nem_newmad_process_rdtype(MPID_Request **rreq_p, MPID_Datatype * dt_ptr } else { - int packsize = 0; + MPI_Aint packsize = 0; MPIR_Pack_size_impl(rreq->dev.user_count, rreq->dev.datatype, &packsize); rreq->dev.tmpbuf = MPIU_Malloc((size_t) packsize); MPIU_Assert(rreq->dev.tmpbuf); ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/netmod/mxm/mxm_poll.c | 4 ++-- .../channels/nemesis/netmod/newmad/newmad_poll.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository

1 0