5d81ddd07f
* trans-openmp.c (gfc_omp_clause_dtor,
* gfc_trans_omp_array_reduction):
Update call to gfc_trans_dealloc_allocated.
* trans.c (gfc_allocate_using_malloc): Fix spacing.
(gfc_allocate_allocatable): For gfc_allocate_using_lib, jump to
label_finish when an error occurs.
(gfc_deallocate_with_status): Call caf_deregister for -fcoarray=lib.
* trans.h (gfc_allocate_allocatable,
* gfc_deallocate_with_status):
Update prototype.
(gfor_fndecl_caf_deregister): New tree symbol.
* trans-expr.c (gfc_conv_procedure_call): Update
gfc_deallocate_with_status and gfc_trans_dealloc_allocated calls.
* trans-array.c (gfc_array_allocate,
* gfc_trans_dealloc_allocated,
structure_alloc_comps, gfc_trans_deferred_array): Ditto.
(gfc_array_deallocate): Handle coarrays with -fcoarray=lib.
* trans-array.h (gfc_array_deallocate, gfc_array_allocate,
gfc_trans_dealloc_allocated): Update prototypes.
* trans-stmt.c (gfc_trans_sync): Fix indentation.
(gfc_trans_allocate): Fix errmsg padding and label handling.
(gfc_trans_deallocate): Ditto and handle -fcoarray=lib.
* expr.c (gfc_is_coarray): Fix algorithm for BT_CLASS.
* libgfortran.h (GFC_STAT_STOPPED_IMAGE): Use large value
to avoid other stats accidentally matching this one.
* trans-decl.c (gfor_fndecl_caf_deregister): New global var.
(gfc_build_builtin_function_decls): Fix prototype decl of caf_register
and add decl for caf_deregister.
(gfc_trans_deferred_vars): Handle CAF vars with -fcoarrays=lib.
* trans-intrinsic.c (conv_intrinsic_move_alloc): Update call to
gfc_deallocate_with_status.
2012-01-06 Tobias Burnus <burnus@net-b.de>
* caf/single.c (_gfortran_caf_register,
* _gfortran_caf_deregister):
Fix token handling.
* caf/mpi.c (_gfortran_caf_register, _gfortran_caf_deregister):
* Ditto.
* caf/libcaf.h (STAT_STOPPED_IMAGE): Sync with libgfortran.h.
(_gfortran_caf_register, _gfortran_caf_deregister): Update prototype.
2012-01-06 Tobias Burnus <burnus@net-b.de>
* gfortran.dg/deallocate_stat_2.f90: New.
* coarray/allocate_errgmsg.f90: New.
* gfortran.dg/coarray_lib_alloc_1.f90: New.
* gfortran.dg/coarray_lib_alloc_2.f90: New.
* coarray/subobject_1.f90: Fix for num_images > 1.
* gfortran.dg/deallocate_stat.f90: Update due to changed
stat= handling.
From-SVN: r182951
89 lines
2.8 KiB
C
89 lines
2.8 KiB
C
/* Common declarations for all of GNU Fortran libcaf implementations.
|
|
Copyright (C) 2011, 2012
|
|
Free Software Foundation, Inc.
|
|
Contributed by Tobias Burnus <burnus@net-b.de>
|
|
|
|
This file is part of the GNU Fortran Coarray Runtime Library (libcaf).
|
|
|
|
Libcaf is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3, or (at your option)
|
|
any later version.
|
|
|
|
Libcaf is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
Under Section 7 of GPL version 3, you are granted additional
|
|
permissions described in the GCC Runtime Library Exception, version
|
|
3.1, as published by the Free Software Foundation.
|
|
|
|
You should have received a copy of the GNU General Public License and
|
|
a copy of the GCC Runtime Library Exception along with this program;
|
|
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef LIBCAF_H
|
|
#define LIBCAF_H
|
|
|
|
#include <stdint.h> /* For int32_t. */
|
|
#include <stddef.h> /* For ptrdiff_t. */
|
|
|
|
#ifndef __GNUC__
|
|
#define __attribute__(x)
|
|
#define likely(x) (x)
|
|
#define unlikely(x) (x)
|
|
#else
|
|
#define likely(x) __builtin_expect(!!(x), 1)
|
|
#define unlikely(x) __builtin_expect(!!(x), 0)
|
|
#endif
|
|
|
|
/* Definitions of the Fortran 2008 standard; need to kept in sync with
|
|
ISO_FORTRAN_ENV, cf. libgfortran.h. */
|
|
#define STAT_UNLOCKED 0
|
|
#define STAT_LOCKED 1
|
|
#define STAT_LOCKED_OTHER_IMAGE 2
|
|
#define STAT_STOPPED_IMAGE 6000
|
|
|
|
/* Describes what type of array we are registerring. Keep in sync with
|
|
gcc/fortran/trans.h. */
|
|
typedef enum caf_register_t {
|
|
CAF_REGTYPE_COARRAY_STATIC,
|
|
CAF_REGTYPE_COARRAY_ALLOC,
|
|
CAF_REGTYPE_LOCK,
|
|
CAF_REGTYPE_LOCK_COMP
|
|
}
|
|
caf_register_t;
|
|
|
|
/* Linked list of static coarrays registered. */
|
|
typedef struct caf_static_t {
|
|
void **token;
|
|
struct caf_static_t *prev;
|
|
}
|
|
caf_static_t;
|
|
|
|
|
|
void _gfortran_caf_init (int *, char ***, int *, int *);
|
|
void _gfortran_caf_finalize (void);
|
|
|
|
void * _gfortran_caf_register (ptrdiff_t, caf_register_t, void ***, int *,
|
|
char *, int);
|
|
void _gfortran_caf_deregister (void ***, int *, char *, int);
|
|
|
|
|
|
void _gfortran_caf_sync_all (int *, char *, int);
|
|
void _gfortran_caf_sync_images (int, int[], int *, char *, int);
|
|
|
|
/* FIXME: The CRITICAL functions should be removed;
|
|
the functionality is better represented using Coarray's lock feature. */
|
|
void _gfortran_caf_critical (void) { }
|
|
void _gfortran_caf_end_critical (void) { }
|
|
|
|
|
|
void _gfortran_caf_error_stop_str (const char *, int32_t)
|
|
__attribute__ ((noreturn));
|
|
void _gfortran_caf_error_stop (int32_t) __attribute__ ((noreturn));
|
|
|
|
#endif /* LIBCAF_H */
|