And of course, here is the patch and ChangeLog.
2011-07-14 Daniel Carrera <dcarr...@gmail.com>
* caf/single.c: Include stdarg.h header.
(caf_runtime_error): New function. Use "exit(EXIT_FAILURE)".
(_gfortran_caf_register): Use caf_runtime_error.
(_gfortran_caf_sync_images): Use "exit(EXIT_FAILURE)".
* caf/mpi.c (caf_runtime_error): Remove "error" parameter.
Return EXIT_FAILURE instead.
(_gfortran_caf_register): Update call to caf_runtime_error.
(_gfortran_caf_sync_all): Ditto.
(_gfortran_caf_sync_images): Ditto.
(_gfortran_caf_error_stop_str): Use "exit(EXIT_FAILURE)".
Now I'm just waiting for SVN update before I commit...
On 07/14/2011 05:34 PM, Daniel Carrera wrote:
Hi Tobias,
As per your suggestion, I'm copying to gfotran and gcc-patches. I've
made the change your asked and I'm going to commit the patch.
Cheers,
Daniel.
On 07/14/2011 05:31 PM, Tobias Burnus wrote:
On 07/14/2011 05:05 PM, Daniel Carrera wrote:
+caf_runtime_error (const char *message, ...)
+{
+ va_list ap;
+ fprintf (stderr, "Fortran runtime error.");
Could you replace "." by ": " (colon, space), I think "Fortran runtime
error: Could not ..." looks better than "Fortran runtime error.Could not
...".
Otherwise, the patch is OK. Could you then send the patch as to fortran@
and gcc-patches@?
Tobias
PS: You could directly commit the modified patch, simply reply to this
email, add a CC to fortran@/gcc-patches@ and attach the patch and
changelog. There is no need that I approve the patch again.
--
I'm not overweight, I'm undertall.
Index: libgfortran/caf/single.c
===================================================================
--- libgfortran/caf/single.c (revision 176230)
+++ libgfortran/caf/single.c (working copy)
@@ -28,6 +28,7 @@ see the files COPYING3 and COPYING.RUNTI
#include <stdio.h> /* For fputs and fprintf. */
#include <stdlib.h> /* For exit and malloc. */
#include <string.h> /* For memcpy and memset. */
+#include <stdarg.h> /* For variadic arguments. */
/* Define GFC_CAF_CHECK to enable run-time checking. */
/* #define GFC_CAF_CHECK 1 */
@@ -40,6 +41,21 @@ see the files COPYING3 and COPYING.RUNTI
caf_static_t *caf_static_list = NULL;
+/* Keep in sync with mpi.c. */
+static void
+caf_runtime_error (const char *message, ...)
+{
+ va_list ap;
+ fprintf (stderr, "Fortran runtime error: ");
+ va_start (ap, message);
+ fprintf (stderr, message, ap);
+ va_end (ap);
+ fprintf (stderr, "\n");
+
+ /* FIXME: Shutdown the Fortran RTL to flush the buffer. PR 43849. */
+ exit (EXIT_FAILURE);
+}
+
void
_gfortran_caf_init (int *argc __attribute__ ((unused)),
char ***argv __attribute__ ((unused)),
@@ -73,12 +89,12 @@ _gfortran_caf_register (ptrdiff_t size,
if (unlikely (local == NULL || token == NULL))
{
+ const char msg[] = "Failed to allocate coarray";
if (stat)
{
*stat = 1;
if (errmsg_len > 0)
{
- const char msg[] = "Failed to allocate coarray";
int len = ((int) sizeof (msg) > errmsg_len) ? errmsg_len
: (int) sizeof (msg);
memcpy (errmsg, msg, len);
@@ -88,10 +104,7 @@ _gfortran_caf_register (ptrdiff_t size,
return NULL;
}
else
- {
- fprintf (stderr, "ERROR: Failed to allocate coarray");
- exit (1);
- }
+ caf_runtime_error (msg);
}
if (stat)
@@ -140,7 +153,7 @@ _gfortran_caf_sync_images (int count __a
{
fprintf (stderr, "COARRAY ERROR: Invalid image index %d to SYNC "
"IMAGES", images[i]);
- exit (1);
+ exit (EXIT_FAILURE);
}
#endif
Index: libgfortran/caf/mpi.c
===================================================================
--- libgfortran/caf/mpi.c (revision 176230)
+++ libgfortran/caf/mpi.c (working copy)
@@ -47,8 +47,9 @@ static int caf_is_finalized;
caf_static_t *caf_static_list = NULL;
+/* Keep in sync with single.c. */
static void
-caf_runtime_error (int error, const char *message, ...)
+caf_runtime_error (const char *message, ...)
{
va_list ap;
fprintf (stderr, "Fortran runtime error on image %d: ", caf_this_image);
@@ -59,10 +60,10 @@ caf_runtime_error (int error, const char
/* FIXME: Shutdown the Fortran RTL to flush the buffer. PR 43849. */
/* FIXME: Do some more effort than just MPI_ABORT. */
- MPI_Abort (MPI_COMM_WORLD, error);
+ MPI_Abort (MPI_COMM_WORLD, EXIT_FAILURE);
/* Should be unreachable, but to make sure also call exit. */
- exit (2);
+ exit (EXIT_FAILURE);
}
@@ -179,7 +180,7 @@ error:
}
}
else
- caf_runtime_error (caf_is_finalized ? STAT_STOPPED_IMAGE : 1, msg);
+ caf_runtime_error (msg);
}
return NULL;
@@ -223,7 +224,7 @@ _gfortran_caf_sync_all (int *stat, char
memset (&errmsg[len], ' ', errmsg_len-len);
}
else
- caf_runtime_error (caf_is_finalized ? STAT_STOPPED_IMAGE : ierr, msg);
+ caf_runtime_error (msg);
}
}
@@ -291,7 +292,7 @@ _gfortran_caf_sync_images (int count, in
memset (&errmsg[len], ' ', errmsg_len-len);
}
else
- caf_runtime_error (caf_is_finalized ? STAT_STOPPED_IMAGE : ierr, msg);
+ caf_runtime_error (msg);
}
}
