diff options
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/trans-decl.c | 2 | ||||
| -rw-r--r-- | libgfortran/ChangeLog | 10 | ||||
| -rw-r--r-- | libgfortran/caf/libcaf.h | 2 | ||||
| -rw-r--r-- | libgfortran/caf/mpi.c | 43 | ||||
| -rw-r--r-- | libgfortran/caf/single.c | 19 |
6 files changed, 69 insertions, 14 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index a9b85b29bd9..a00723ea826 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,7 +1,12 @@ +2011-08-29 Tobias Burnus <burnus@net-b.de> + + * trans-decl.c (generate_coarray_sym_init): Use + GFC_CAF_COARRAY_STATIC for static coarrays. + 2011-08-28 Dodji Seketeli <dodji@redhat.com> * scanner.c (load_file): Don't abuse LC_RENAME reason while - (indirectly) calling linemap_add. + (indirectly) calling linemap_add. 2011-08-26 Jakub Jelinek <jakub@redhat.com> diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index c85e20c007b..ead8acf20b2 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -4241,7 +4241,7 @@ generate_coarray_sym_init (gfc_symbol *sym) tmp = build_call_expr_loc (input_location, gfor_fndecl_caf_register, 6, size, build_int_cst (integer_type_node, - GFC_CAF_COARRAY_ALLOC), /* type. */ + GFC_CAF_COARRAY_STATIC), /* type. */ token, null_pointer_node, /* token, stat. */ null_pointer_node, /* errgmsg, errmsg_len. */ build_int_cst (integer_type_node, 0)); diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 6c57beb2a6d..f20713e579e 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,13 @@ +2011-08-29 Tobias Burnus <burnus@net-b.de> + + * caf/libcaf.h (_gfortran_caf_deregister): Update prototype. + * caf/mpi.c (_gfortran_caf_deregister): Modify prototype, + actually free memory and add error diagnostic. + (_gfortran_caf_finalize): Add additional free calls. + * caf/single.c (_gfortran_caf_deregister): Modify prototype, + actually free memory and add error diagnostic. + (_gfortran_caf_finalize): Add additional free calls. + 2011-08-29 Thomas Koenig <tkoenig@gcc.gnu.org> PR libfortran/50192 diff --git a/libgfortran/caf/libcaf.h b/libgfortran/caf/libcaf.h index 4fe09e4c8a0..e6be7ce7ace 100644 --- a/libgfortran/caf/libcaf.h +++ b/libgfortran/caf/libcaf.h @@ -69,7 +69,7 @@ void _gfortran_caf_finalize (void); void * _gfortran_caf_register (ptrdiff_t, caf_register_t, void **, int *, char *, int); -int _gfortran_caf_deregister (void **); +void _gfortran_caf_deregister (void **, int *, char *, int); void _gfortran_caf_sync_all (int *, char *, int); diff --git a/libgfortran/caf/mpi.c b/libgfortran/caf/mpi.c index ea4c0f05c27..c69c5b9574f 100644 --- a/libgfortran/caf/mpi.c +++ b/libgfortran/caf/mpi.c @@ -103,8 +103,12 @@ _gfortran_caf_finalize (void) { while (caf_static_list != NULL) { - free(caf_static_list->token[caf_this_image-1]); - caf_static_list = caf_static_list->prev; + caf_static_t *tmp = caf_static_list->prev; + + free (caf_static_list->token[caf_this_image-1]); + free (caf_static_list->token); + free (caf_static_list); + caf_static_list = tmp; } if (!caf_mpi_initialized) @@ -187,10 +191,37 @@ error: } -int -_gfortran_caf_deregister (void **token __attribute__ ((unused))) +void +_gfortran_caf_deregister (void **token, int *stat, char *errmsg, int errmsg_len) { - return 0; + if (unlikely (caf_is_finalized)) + { + const char msg[] = "Failed to deallocate coarray - " + "there are stopped images"; + if (stat) + { + *stat = STAT_STOPPED_IMAGE; + + if (errmsg_len > 0) + { + int len = ((int) sizeof (msg) - 1 > errmsg_len) + ? errmsg_len : (int) sizeof (msg) - 1; + memcpy (errmsg, msg, len); + if (errmsg_len > len) + memset (&errmsg[len], ' ', errmsg_len-len); + } + return; + } + caf_runtime_error (msg); + } + + _gfortran_caf_sync_all (NULL, NULL, 0); + + if (stat) + *stat = 0; + + free (token[caf_this_image-1]); + free (token); } @@ -267,7 +298,7 @@ _gfortran_caf_sync_images (int count, int images[], int *stat, char *errmsg, } /* Handle SYNC IMAGES(*). */ - if (unlikely(caf_is_finalized)) + if (unlikely (caf_is_finalized)) ierr = STAT_STOPPED_IMAGE; else ierr = MPI_Barrier (MPI_COMM_WORLD); diff --git a/libgfortran/caf/single.c b/libgfortran/caf/single.c index 09cc62f1f58..5353c7b86f7 100644 --- a/libgfortran/caf/single.c +++ b/libgfortran/caf/single.c @@ -71,8 +71,11 @@ _gfortran_caf_finalize (void) { while (caf_static_list != NULL) { - free(caf_static_list->token[0]); - caf_static_list = caf_static_list->prev; + caf_static_t *tmp = caf_static_list->prev; + free (caf_static_list->token[0]); + free (caf_static_list->token); + free (caf_static_list); + caf_static_list = tmp; } } @@ -121,10 +124,16 @@ _gfortran_caf_register (ptrdiff_t size, caf_register_t type, void **token, } -int -_gfortran_caf_deregister (void **token __attribute__ ((unused))) +void +_gfortran_caf_deregister (void **token, int *stat, + char *errmsg __attribute__ ((unused)), + int errmsg_len __attribute__ ((unused))) { - return 0; + free (*token); + free (token); + + if (stat) + *stat = 0; } |