Create timers with unique names by using an integer serial number.

This removes spurious timer warnings.

Check malloc return value.

Change message from "[...] at [group]" to "[...] in [group]".


git-svn-id: http://svn.cactuscode.org/flesh/trunk@3646 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 17 insertions, 6 deletions

diff --git a/src/main/ScheduleInterface.c b/src/main/ScheduleInterface.c
index ac5066c8..61ede556 100644
--- a/src/main/ScheduleInterface.c
+++ b/src/main/ScheduleInterface.c
@@ -1238,6 +1238,7 @@ static t_attribute *CreateAttribute(const char *where,
                                     const int *timelevels,
                                     va_list *ap)
 {
+  static int timernum = 0;
   char *timername;
   t_attribute *this;
   int i;
@@ -1323,15 +1324,25 @@ static t_attribute *CreateAttribute(const char *where,
 
       /* Add a timer to the item */
       timername = malloc (strlen (thorn) + strlen (description) +
-                          strlen (where) + 7);
-      sprintf (timername, "%s: %s at %s", thorn, description, where);
-      this->timer_handle = CCTK_TimerCreate(timername);
-      if (this->timer_handle < 0)
+                          strlen (where) + 100);
+      if (!timername)
       {
         CCTK_VWarn (1, __LINE__, __FILE__, "Cactus",
-                    "Couldn't create timer with name '%s'", timername);
+                    "Could not allocate memory for timer");
+        this->timer_handle = -1;
+      }
+      else
+      {
+        sprintf (timername, "[%04d] %s: %s in %s",
+                 timernum++, thorn, description, where);
+        this->timer_handle = CCTK_TimerCreate(timername);
+        if (this->timer_handle < 0)
+        {
+          CCTK_VWarn (1, __LINE__, __FILE__, "Cactus",
+                      "Could not create timer with name '%s'", timername);
+        }
+        free (timername);
       }
-      free (timername);
     }
     else
     {