minor fixes to c compability, c-test now works

Author: galfthan

example/c_test/Makefile

@@ -6,17 +6,17 @@ OBJ = $(SRC:.c=.o)
 INCLUDES = 
 
 # C compiler flags (-g -O2 -Wall)
-CFLAGS = -O3 -I../../include 
-LDFLAGS = -L../../lib -lphiprof
+CFLAGS = -O3 -I../../include -fopenmp
+LDFLAGS = -L../../lib -lphiprof  -lgomp -ldl
 # compiler
-CCC = mpicc
+CCC = cc
 # linker (c++ compiler)
-LNK = mpiCC
+LNK = CC
 
 .SUFFIXES: .c
 
 default: $(OBJ) 
-	$(LNK) -o test  $(OBJ) $(LDFLAGS) 
+	$(LNK) -o test   $(OBJ)  $(LDFLAGS) 
 
 .c.o:
 	$(CCC) $(INCLUDES) $(CFLAGS) -c $< -o $@

example/c_test/test.c

@@ -56,7 +56,9 @@ int main(int argc,char **argv){
    if(rank==0)
       printf( "Measuring performance of start-stop calls\n");
 
+   phiprof_initialize();
 
+
    phiprof_start("Benchmarking phiprof"); 
    phiprof_start("Initalized timers using ID");
 
@@ -97,33 +99,21 @@ int main(int argc,char **argv){
    phiprof_start("Test accuracy");
    if(rank==0)
       printf( "  1/2\n");
-   phiprof_start("100 computations"); 
+   phiprof_start("100 computations x 0.1s"); 
    for(i=0;i<100;i++){
       phiprof_start("compute");
       compute(0.1);
       phiprof_stop("compute");
    }
-   phiprof_stop("100 computations");
+   phiprof_stop("100 computations x 0.1s");
 
-   if(rank==0)
-      printf( "  2/2\n" );
-   MPI_Barrier(MPI_COMM_WORLD);
-   phiprof_start("100 computations + logprofile"); 
-   for(i=0;i<100;i++){
-      phiprof_start("compute");
-      compute(0.1);
-      phiprof_printLogProfile(MPI_COMM_WORLD,i,"profile_log_alllev"," ",0);
-      phiprof_printLogProfile(MPI_COMM_WORLD,i,"profile_log_maxlev1"," ",1);
-      phiprof_stop("compute");
-   }
-   phiprof_stop("100 computations + logprofile"); 
 
    phiprof_stop("Test accuracy");
 
    MPI_Barrier(MPI_COMM_WORLD);
    double t1=MPI_Wtime();
-   phiprof_print(MPI_COMM_WORLD,"profile_full",0.0);
-   phiprof_print(MPI_COMM_WORLD,"profile_minfrac0.01",0.01);
+   phiprof_print(MPI_COMM_WORLD,"profile");
+
    if(rank==0)   
       printf( "Print time is %g\n",MPI_Wtime()-t1);
 

include/phiprof.h

@@ -35,9 +35,9 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #define GET_MACRO(_1,_2,NAME,...) NAME
 #define phiprof_assert(...) GET_MACRO(__VA_ARGS__, phiprof_assert2, phiprof_assert1)(__VA_ARGS__)
 
-
+int phiprof_initialize();
 int phiprof_initializeTimer(char *label,int nGroups, ... );
-int phiprof_getId(char *label);
+int phiprof_getChildId(char *label);
 
 int phiprof_start(char *label);
 int phiprof_stop(char *label);
@@ -46,7 +46,7 @@ int phiprof_startId(int id);
 int phiprof_stopId(int id);
 int phiprof_stopIdUnits(int id,double units,char *unitName);
 
-int phiprof_print(MPI_Comm comm, char *fileNamePrefix, double minFraction);
+int phiprof_print(MPI_Comm comm, char *fileNamePrefix);
 
 void phiprof_phiprofAssert(int condition, char* errorMessage, char* fileName, int line);
 

include/phiprof.hpp

@@ -68,19 +68,19 @@ namespace phiprof
     */
    int initializeTimer(const std::string &label,const std::vector<std::string> &groups);
    /**
-    * \overload int phiprof::initializeTimer(const std::string &label,const std::vector<std::string> &groups);
+    * \overload int phiprof::initializeTimer(const std::string &label,const std::vector<std::string> &groups)
     */
    int initializeTimer(const std::string &label);
    /**
-    * \overload int phiprof::initializeTimer(const std::string &label,const std::vector<std::string> &groups);
+    * \overload int phiprof::initializeTimer(const std::string &label,const std::vector<std::string> &groups)
     */
    int initializeTimer(const std::string &label,const std::string &group1);
    /**
-    * \overload int phiprof::initializeTimer(const std::string &label,const std::vector<std::string> &groups);
+    * \overload int phiprof::initializeTimer(const std::string &label,const std::vector<std::string> &groups)
     */
    int initializeTimer(const std::string &label,const std::string &group1,const std::string &group2);
    /**
-    * \overload int phiprof::initializeTimer(const std::string &label,const std::vector<std::string> &groups);
+    * \overload int phiprof::initializeTimer(const std::string &label,const std::vector<std::string> &groups)
     */
    int initializeTimer(const std::string &label,const std::string &group1,const std::string &group2,const std::string &group3);
 
@@ -92,7 +92,7 @@ namespace phiprof
     * @return
     *  The id of the timer. -1 if it does not exist.
     */
-   int getId(const std::string &label);
+   int getChildId(const std::string &label);
 
    /**
     * Start a profiling timer.
@@ -177,12 +177,6 @@ namespace phiprof
     */
    bool print(MPI_Comm comm, std::string fileNamePrefix="profile");
 
-
-
-
-  
-
-
    /**
     * Assert function
     *

src/Makefile

@@ -1,5 +1,5 @@
 # source files.
-SRC = prettyprinttable.cpp timerdata.cpp timertree.cpp paralleltimertree.cpp  phiprof.cpp  #phiprof_c.cpp
+SRC = prettyprinttable.cpp timerdata.cpp timertree.cpp paralleltimertree.cpp  phiprof.cpp phiprof_c.cpp
 SRC_NO = nophiprof.cpp phiprof_c.cpp
 OBJ = $(SRC:.cpp=.o)
 OBJ_NO = $(SRC_NO:.cpp=.o)
@@ -16,7 +16,7 @@ INCLUDES = -I../include
 CLOCK_ID = CLOCK_MONOTONIC
 
 # C++ compiler flags 
-CCFLAGS = -O3 -fopenmp -std=c++11 -DCLOCK_ID=$(CLOCK_ID) #-DDEBUG_PHIPROF_TIMERS # -W -Wall -Wextra -pedantic 
+CCFLAGS = -fpic -O3 -fopenmp -std=c++11 -DCLOCK_ID=$(CLOCK_ID) #-DDEBUG_PHIPROF_TIMERS # -W -Wall -Wextra -pedantic 
 
 # compiler
 CCC = CC

src/phiprof_c.cpp

@@ -26,6 +26,11 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 using namespace std;
 
+extern "C" int phiprof_initialize(){
+   return (int)phiprof::initialize();
+
+}
+
 extern "C" int phiprof_initializeTimer(char *label,int nGroups, ... ){
   va_list listPointer;
   vector<string> groupStrings;
@@ -41,8 +46,8 @@ extern "C" int phiprof_initializeTimer(char *label,int nGroups, ... ){
 
 }
 
-extern "C" int phiprof_getId(char *label){
-  return phiprof::getId(string(label));
+extern "C" int phiprof_getChildId(char *label){
+  return phiprof::getChildId(string(label));
 }
 
 

src/timertree.cpp

@@ -22,9 +22,12 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include <string>
 #include <limits>
 #include <algorithm>
-#include <omp.h>
 #include <iostream>
 
+#ifdef _OPENMP
+#include <omp.h>
+#endif
+
 #include "timerdata.hpp"
 #include "timertree.hpp"
 #include "common.hpp"

src/timertree.hpp

@@ -22,7 +22,9 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #define TIMERTREE_H
 #include <vector>
 #include "timerdata.hpp"
-
+#ifdef _OPENMP
+#include <omp.h>
+#endif
 
 class TimerTree {
 public:
@@ -65,8 +67,7 @@ class TimerTree {
       std::vector<int> childIds = timers[currentId[thread]].getChildIds(); 
       if ( std::find(childIds.begin(), childIds.end(), id) == childIds.end() ) {
 #pragma omp critical 
-         std::cerr << "PHIPROF-ERROR for thread "<< thread<< " omp_get_thread_num "<< 
-            omp_get_thread_num() << ": id "<< id << 
+         std::cerr << "PHIPROF-ERROR for thread "<< thread<< ": id "<< id << 
             " is invalid, timer is not child of current timer "<< currentId[thread] << 
             ":" << timers[currentId[thread]].getLabel() << std::endl;
          return false;