Merge pull request #5 from cniethammer/general-code-cleanup

General code cleanup

Author: cniethammer

one-sided/tst_get_with_fence.c

@@ -12,9 +12,6 @@
  * Date: Oct 14th 2003
  */
 
-//#include "config.h"
-//#ifdef HAVE_MPI2_ONESIDE
-
 #include <mpi.h>
 #include "mpi_test_suite.h"
 
@@ -128,5 +125,3 @@ int tst_get_with_fence_alltoall_cleanup (struct tst_env * env)
   return 0;
 }
 
-//#endif
-

one-sided/tst_get_with_lock.c

@@ -13,9 +13,6 @@
  * Copyright (c) 2009 Cisco Systems, Inc.  All rights reserved.
  */
 
-//#include "config.h"
-//#ifdef HAVE_MPI2_ONESIDE
-
 #include <mpi.h>
 #include "mpi_test_suite.h"
 
@@ -131,5 +128,4 @@ int tst_get_with_lock_alltoall_cleanup (struct tst_env * env)
 
   return 0;
 }
-//#endif
 

one-sided/tst_get_with_post.c

@@ -12,9 +12,6 @@
  * Date: Oct 14th 2003
  */
 
-//#include "config.h"
-//#ifdef HAVE_MPI2_ONESIDE
-
 #include <mpi.h>
 #include "mpi_test_suite.h"
 
@@ -161,4 +158,4 @@ int tst_get_with_post_alltoall_cleanup (struct tst_env * env)
 
   return 0;
 }
-//#endif
+

one-sided/tst_put_with_fence.c

@@ -13,9 +13,6 @@
  * Copyright (c) 2009 Cisco Systems, Inc.  All rights reserved.
  */
 
-//#include "config.h"
-//#ifdef HAVE_MPI2_ONESIDE
-
 #include <mpi.h>
 #include "mpi_test_suite.h"
 
@@ -131,4 +128,4 @@ int tst_put_with_fence_alltoall_cleanup (struct tst_env * env)
 
   return 0;
 }
-//#endif
+

one-sided/tst_put_with_lock.c

@@ -2,9 +2,6 @@
  * Copyright (c) 2009 Cisco Systems, Inc.  All rights reserved.
  */
 
-//#include "config.h"
-//#ifdef HAVE_MPI2_ONESIDE
-
 #include <mpi.h>
 #include "mpi_test_suite.h"
 
@@ -123,4 +120,4 @@ int tst_put_with_lock_alltoall_cleanup (struct tst_env * env)
 
   return 0;
 }
-//#endif
+

one-sided/tst_put_with_post.c

@@ -1,5 +1,3 @@
-//#include "config.h"
-//#ifdef HAVE_MPI2_ONESIDE
 
 #include <mpi.h>
 #include "mpi_test_suite.h"
@@ -148,4 +146,3 @@ int tst_put_with_post_alltoall_cleanup (struct tst_env * env)
   return 0;
 }
 
-//#endif

tst_output.c

@@ -33,7 +33,6 @@ const char * tst_reports[] = {
 };
 
 #ifdef HAVE_MPI2_THREADS
-extern int num_threads;
 extern int tst_thread_running (void);
 #endif
 
@@ -73,16 +72,6 @@ tst_output_types tst_output_init(tst_output_stream * output, int rank,
   }
 #endif
 
-  /* Check if stream type uses a file and get the name of this file */
-  if (type == TST_OUTPUT_TYPE_LOGFILE) {
-    va_start(arglist, type);
-    fname = va_arg (arglist, char *);
-    sprintf (output->filename,"R%d_", tst_output_global_rank);
-    freelen = 255 - strlen(output->filename);
-    strncat (output->filename, fname, freelen);
-    va_end (arglist);
-  }
-
   /* Now do the initialisation for the different stream types */
   switch (type) {
     case TST_OUTPUT_TYPE_STDERR:
@@ -92,6 +81,11 @@ tst_output_types tst_output_init(tst_output_stream * output, int rank,
       output->streamptr = stdout;
       break;
     case TST_OUTPUT_TYPE_LOGFILE:
+      va_start(arglist, type);
+      fname = va_arg (arglist, char *);
+      snprintf(output->filename, TST_OUTPUT_FILENAME_MAX, "R%d_%s",
+              tst_output_global_rank, fname);
+      va_end (arglist);
       output->streamptr = fopen(output->filename, "w+");
       if (output->streamptr == NULL) {
         fprintf (stderr, "Error opening stream: Could not open output file.");

tst_output.h

@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include "./config.h"
+#include "config.h"
 
 
 #define DEBUG_REPORT_TYPE       TST_REPORT_MAX
@@ -33,10 +33,11 @@ typedef enum {
 } tst_report_types;
 
 
+#define TST_OUTPUT_FILENAME_MAX 256
 typedef struct {
   FILE * streamptr;  /**< Pointer on the stream */
   tst_output_types type;
-  char filename[256];  /**< Filename if stream writes to file */
+  char filename[TST_OUTPUT_FILENAME_MAX];  /**< Filename if stream writes to file */
   tst_report_types level;
   int rank;    /**< MPI rank responsible for output */
   int isopen;  /**< open status: 1 if open */