Changeset 1671 for XIOS/dev/dev_trunk_omp/src/filter/output_pin.cpp

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.

File:

• XIOS/dev/dev_trunk_omp/src/filter/output_pin.cpp (modified) (2 diffs)

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);
     }