Changeset 1671 for XIOS/dev/dev_trunk_omp/src/filter

Timestamp:

06/04/19 10:00:52 (5 years ago)

Author:

yushan

Message:

MARK: branch merged with trunk @1663. One output graph file with output file names in file writer filter.

Location:

XIOS/dev/dev_trunk_omp/src/filter

Files:

• file_writer_filter.cpp (modified) (1 diff)
• file_writer_filter.hpp (modified) (2 diffs)
• garbage_collector.hpp (modified) (1 diff)
• output_pin.cpp (modified) (2 diffs)
• spatial_transform_filter.cpp (modified) (1 diff)

XIOS/dev/dev_trunk_omp/src/filter/file_writer_filter.cpp

@@ -16 +16 @@
     if (buildWorkflowGraph)
     {
-      if(InvalidableObject::count_ptr == 0) InvalidableObject::count_ptr = new std::map< StdString, int>;
-      if(InvalidableObject::count_ptr->find(CWorkflowGraph::my_filename) == InvalidableObject::count_ptr->end())
-      {
-        (*InvalidableObject::count_ptr)[CWorkflowGraph::my_filename] = 0; 
-      }
-      //filterId = InvalidableObject::count;
-      filterId = (*InvalidableObject::count_ptr)[CWorkflowGraph::my_filename];
-      printf("file_writer_filter ================ filterId = %d\n", (*InvalidableObject::count_ptr)[CWorkflowGraph::my_filename]);
-      (*InvalidableObject::count_ptr)[CWorkflowGraph::my_filename]++;
-      //InvalidableObject::count++;
+      filterId = InvalidableObject::count;
+      InvalidableObject::count++;
     }
   }

XIOS/dev/dev_trunk_omp/src/filter/file_writer_filter.hpp

@@ -3 +3 @@
 
 #include "input_pin.hpp"
+#include "file.hpp"
 
 namespace xios
@@ -24 +25 @@
       CFileWriterFilter(CGarbageCollector& gc, CField* field, bool buildWorkflowGraph = false);
 
-      inline StdString GetName(void) {return StdString("File writer filter");};
+      //inline StdString GetName(void) {return StdString("File writer filter");};
+      inline StdString GetName(void) {return StdString("File writer filter : ") + StdString(this->field->file->name);};
+
 
       /*!

XIOS/dev/dev_trunk_omp/src/filter/garbage_collector.hpp

@@ -20 +20 @@
      */
     void virtual invalidate(Time timestamp) = 0;
-
-    static std::map<StdString, int> *count_ptr;
-    #pragma omp threadprivate(count_ptr)
   
     static int count; //!< Counter used to identify a filter in case building workflow graph

XIOS/dev/dev_trunk_omp/src/filter/output_pin.cpp

@@ -12 +12 @@
     if (buildWorkflowGraph)
     {
-      if(InvalidableObject::count_ptr == 0) InvalidableObject::count_ptr = new std::map< StdString, int>;
-      if(InvalidableObject::count_ptr->find(CWorkflowGraph::my_filename) == InvalidableObject::count_ptr->end())
-      {
-        (*InvalidableObject::count_ptr)[CWorkflowGraph::my_filename] = 0; 
-      }
-  
-      filterId = (*InvalidableObject::count_ptr)[CWorkflowGraph::my_filename];
-      printf("output_pin ================ filterId = %d, CWorkflowGraph::my_filename = %s\n", (*InvalidableObject::count_ptr)[CWorkflowGraph::my_filename], CWorkflowGraph::my_filename.c_str());
-      (*InvalidableObject::count_ptr)[CWorkflowGraph::my_filename]++;
-
-      //filterId = InvalidableObject::count;
-      //InvalidableObject::count++;
+      filterId = InvalidableObject::count;
+      InvalidableObject::count++;
     }
   }
@@ -52 +42 @@
     if (buildWorkflowGraph)
     {
-        if(CWorkflowGraph::mapFilterTimestamps_ptr==0) CWorkflowGraph::mapFilterTimestamps_ptr = new std::unordered_map<StdString, std::unordered_map <int, vector<Time> > >; 
-      if(CWorkflowGraph::timestamps_ptr==0) CWorkflowGraph::timestamps_ptr = new std::unordered_map< StdString, set<Time> >;
-      (*CWorkflowGraph::mapFilterTimestamps_ptr)[CWorkflowGraph::my_filename][this->getFilterId()].push_back(packet->timestamp);
-      (*CWorkflowGraph::timestamps_ptr)[CWorkflowGraph::my_filename].insert(packet->timestamp);
+        if(CWorkflowGraph::mapFilterTimestamps_ptr==0) CWorkflowGraph::mapFilterTimestamps_ptr = new std::unordered_map <int, vector<Time> >;
+      if(CWorkflowGraph::timestamps_ptr==0) CWorkflowGraph::timestamps_ptr = new set<Time>;
+      (*CWorkflowGraph::mapFilterTimestamps_ptr)[this->getFilterId()].push_back(packet->timestamp);
+        CWorkflowGraph::timestamps_ptr->insert(packet->timestamp);
     }
 

XIOS/dev/dev_trunk_omp/src/filter/spatial_transform_filter.cpp

@@ -56 +56 @@
         if (buildWorkflowGraph)
         {
-          if(CWorkflowGraph::mapFilters_ptr==0) CWorkflowGraph::mapFilters_ptr = new std::unordered_map< StdString, std::unordered_map <int, StdString> >;
-          if(CWorkflowGraph::mapFieldToFilters_ptr==0) CWorkflowGraph::mapFieldToFilters_ptr = new std::unordered_map< StdString, std::unordered_map <StdString, vector <int> > >;
+          if(CWorkflowGraph::mapFilters_ptr==0) CWorkflowGraph::mapFilters_ptr = new std::unordered_map <int, StdString>;
+          if(CWorkflowGraph::mapFieldToFilters_ptr==0) CWorkflowGraph::mapFieldToFilters_ptr = new std::unordered_map <StdString, vector <int> >;
           int filterOut = (std::static_pointer_cast<COutputPin>(filter))->getFilterId();
           int filterIn = (std::static_pointer_cast<COutputPin>(firstFilter))->getFilterId();
           // PASS field's id here
-          (*CWorkflowGraph::mapFieldToFilters_ptr)[CWorkflowGraph::my_filename]["XXX"].push_back(filterOut);
-          (*CWorkflowGraph::mapFieldToFilters_ptr)[CWorkflowGraph::my_filename]["XXX"].push_back(filterIn);
-          (*CWorkflowGraph::mapFilters_ptr)[CWorkflowGraph::my_filename][filterOut] = "Spatial transform filter";
-          (*CWorkflowGraph::mapFilters_ptr)[CWorkflowGraph::my_filename][filterIn] = "Spatial transform filter";
-          //std::cout<<"CSpatialTransformFilter::CSpatialTransformFilter CWorkflowGraph::mapFieldToFilters_ptr->size = "<<CWorkflowGraph::mapFieldToFilters_ptr->size()<<std::endl;
+          (*CWorkflowGraph::mapFieldToFilters_ptr)["XXX"].push_back(filterOut);
+          (*CWorkflowGraph::mapFieldToFilters_ptr)["XXX"].push_back(filterIn);
+          (*CWorkflowGraph::mapFilters_ptr)[filterOut] = "Spatial transform filter";
+          (*CWorkflowGraph::mapFilters_ptr)[filterIn] = "Spatial transform filter";
+          std::cout<<"CSpatialTransformFilter::CSpatialTransformFilter CWorkflowGraph::mapFieldToFilters_ptr->size = "<<CWorkflowGraph::mapFieldToFilters_ptr->size()<<std::endl;
         }
       }