2011-08-29 Tobias Burnus <burnus@net-b.de>
* trans-decl.c (generate_coarray_sym_init): Use
GFC_CAF_COARRAY_STATIC for static coarrays.
libgfortan/
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@178193
138bc75d-0d04-0410-961f-
82ee72b054a4
+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>
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));
+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
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);
{
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)
}
-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);
}
}
/* Handle SYNC IMAGES(*). */
- if (unlikely(caf_is_finalized))
+ if (unlikely (caf_is_finalized))
ierr = STAT_STOPPED_IMAGE;
else
ierr = MPI_Barrier (MPI_COMM_WORLD);
{
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;
}
}
}
-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;
}