Replacing allocated message buffer by using CCTK_VInfo().

git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGH/PUGH/trunk@225 b61c5cb5-eaca-4651-9a7a-d64986f99364

1 files changed, 39 insertions, 57 deletions

diff --git a/src/PughUtils.c b/src/PughUtils.c
index c14e505..22bccf8 100644
--- a/src/PughUtils.c
+++ b/src/PughUtils.c
@@ -39,7 +39,6 @@ void PUGH_Report(CCTK_CARGUMENTS)
   DECLARE_CCTK_PARAMETERS                                                   
 
   pGH *pughGH;           
-  char *message;
 
 #ifdef CCTK_MPI
   int i;
@@ -47,50 +46,44 @@ void PUGH_Report(CCTK_CARGUMENTS)
 
   pughGH = PUGH_pGH(cctkGH);
 
-  message = malloc(1024*sizeof(char));
 #ifdef CCTK_MPI
-  sprintf(message,"MPI Evolution on %d processors",pughGH->nprocs);
+  CCTK_VInfo(CCTK_THORNSTRING, "MPI Evolution on %d processors", pughGH->nprocs);
 #else
-  sprintf(message,"Single processor evolution");
+  CCTK_VInfo(CCTK_THORNSTRING, "Single processor evolution");
 #endif
-  CCTK_INFO(message);
 
   if (cctkGH->cctk_dim == 3)
   {
   
-    sprintf(message,"Size: %d %d %d",
-	    pughGH->GFExtras[2]->nsize[0],
-	    pughGH->GFExtras[2]->nsize[1],
-	    pughGH->GFExtras[2]->nsize[2]);
-    CCTK_INFO(message);
+    CCTK_VInfo(CCTK_THORNSTRING, "Size: %d %d %d",
+               pughGH->GFExtras[2]->nsize[0],
+               pughGH->GFExtras[2]->nsize[1],
+               pughGH->GFExtras[2]->nsize[2]);
     
 #ifdef CCTK_MPI
-    sprintf(message,"Processor topology: %d x %d x %d",
-            pughGH->Connectivity[2]->nprocs[0], 
-	    pughGH->Connectivity[2]->nprocs[1], 
-	    pughGH->Connectivity[2]->nprocs[2]);
-    CCTK_INFO(message);
+    CCTK_VInfo(CCTK_THORNSTRING, "Processor topology: %d x %d x %d",
+               pughGH->Connectivity[2]->nprocs[0], 
+               pughGH->Connectivity[2]->nprocs[1], 
+               pughGH->Connectivity[2]->nprocs[2]);
 
     if (CCTK_Equals(partition, "automatic")) 
     { 
-      sprintf(message,"Local load: %d   [%d x %d x %d]",
-              pughGH->GFExtras[2]->npoints,
-              pughGH->GFExtras[2]->lnsize[0], 
-	      pughGH->GFExtras[2]->lnsize[1], 
-	      pughGH->GFExtras[2]->lnsize[2]);
-      CCTK_INFO(message);                                                
+      CCTK_VInfo(CCTK_THORNSTRING, "Local load: %d   [%d x %d x %d]",
+                 pughGH->GFExtras[2]->npoints,
+                 pughGH->GFExtras[2]->lnsize[0], 
+                 pughGH->GFExtras[2]->lnsize[1], 
+                 pughGH->GFExtras[2]->lnsize[2]);
     } 
     else 
     { /* manual partition */
       for (i=0; i<pughGH->nprocs; i++) 
       { 
-        sprintf(message, 
-                "Local load on proc %d: %d [%d x %d x %d]",i,      
-                pughGH->GFExtras[2]->rnpoints[i],                           
-                pughGH->GFExtras[2]->rnsize[i][0],                          
-                pughGH->GFExtras[2]->rnsize[i][1],                          
-                pughGH->GFExtras[2]->rnsize[i][2]);                         
-        CCTK_INFO(message);                                                
+        CCTK_VInfo(CCTK_THORNSTRING, "Local load on proc %d: %d [%d x %d x %d]",
+                   i,      
+                   pughGH->GFExtras[2]->rnpoints[i],                           
+                   pughGH->GFExtras[2]->rnsize[i][0],                          
+                   pughGH->GFExtras[2]->rnsize[i][1],                          
+                   pughGH->GFExtras[2]->rnsize[i][2]);                         
       }                       
     }                                                    
 #endif
@@ -98,38 +91,32 @@ void PUGH_Report(CCTK_CARGUMENTS)
   else if (cctkGH->cctk_dim == 2)
   {
 
-    sprintf(message,"Size: %d %d",
-	    pughGH->GFExtras[1]->nsize[0],
-	    pughGH->GFExtras[1]->nsize[1]);
-    CCTK_INFO(message);
+    CCTK_VInfo(CCTK_THORNSTRING, "Size: %d %d",
+               pughGH->GFExtras[1]->nsize[0],
+               pughGH->GFExtras[1]->nsize[1]);
 
 #ifdef CCTK_MPI
-    sprintf(message,"Processor topology: %d x %d",
-            pughGH->Connectivity[1]->nprocs[0], 
-	    pughGH->Connectivity[1]->nprocs[1]);
-    CCTK_INFO(message);
-    sprintf(message,"Local load: %d   [%d x %d]",
-	    pughGH->GFExtras[1]->npoints,
-	    pughGH->GFExtras[1]->lnsize[0], 
-	    pughGH->GFExtras[1]->lnsize[1]);
-    CCTK_INFO(message);
+    CCTK_VInfo(CCTK_THORNSTRING, "Processor topology: %d x %d",
+               pughGH->Connectivity[1]->nprocs[0], 
+               pughGH->Connectivity[1]->nprocs[1]);
+    CCTK_VInfo(CCTK_THORNSTRING, "Local load: %d   [%d x %d]",
+               pughGH->GFExtras[1]->npoints,
+               pughGH->GFExtras[1]->lnsize[0], 
+               pughGH->GFExtras[1]->lnsize[1]);
 #endif
 
   }
   else if (cctkGH->cctk_dim == 1)
   {
 
-  sprintf(message,"Size: %d",pughGH->GFExtras[0]->nsize[0]);
-  CCTK_INFO(message);
+  CCTK_VInfo(CCTK_THORNSTRING, "Size: %d", pughGH->GFExtras[0]->nsize[0]);
 
 #ifdef CCTK_MPI
-    sprintf(message,"Processor topology: %d",
-	    pughGH->Connectivity[0]->nprocs[0]);
-    CCTK_INFO(message);
-    sprintf(message,"Local load: %d   [%d]",
-	    pughGH->GFExtras[0]->npoints,
-	    pughGH->GFExtras[0]->lnsize[0]);
-    CCTK_INFO(message);
+    CCTK_VInfo(CCTK_THORNSTRING, "Processor topology: %d",
+               pughGH->Connectivity[0]->nprocs[0]);
+    CCTK_VInfo(CCTK_THORNSTRING, "Local load: %d   [%d]",
+               pughGH->GFExtras[0]->npoints,
+               pughGH->GFExtras[0]->lnsize[0]);
 #endif
 
   }
@@ -139,15 +126,10 @@ void PUGH_Report(CCTK_CARGUMENTS)
   }
     
 #ifdef CCTK_MPI
-    sprintf(message,"Maximum load skew: %f",
-	    pughGH->GFExtras[pughGH->dim-1]->maxskew);
-    CCTK_INFO(message);
+    CCTK_VInfo(CCTK_THORNSTRING, "Maximum load skew: %f",
+               pughGH->GFExtras[pughGH->dim-1]->maxskew);
 #endif
 
-  free(message);
-
-  return;
-
 }
 
  /*@@