Changeset 471 for CMT

Timestamp:

Nov 1, 2008, 5:52:16 PM (16 years ago)

Author:

rybkin

Message:

See C.L. 372

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_project.cxx (modified) (6 diffs)
• source/cmt_project.h (modified) (3 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2008-11-01    <rybkin@lal.in2p3.fr> 372
+        
+        * source/cmt_project.h: Optimise performance of the previous change. In
+        class Project, change method ordered_projects to return ProjectPtrVector,
+        add method visit (int&, ProjectPtrVector&), add member m_order
+        * source/cmt_project.cxx: Implement method visit (int&, ProjectPtrVector&),
+        make use of it to re-implement method Project::ordered_projects, use the
+        latter in Project::fill_cmtpaths
+        
 2008-10-30    <rybkin@lal.in2p3.fr> 371
         

CMT/HEAD/source/cmt_project.cxx

@@ -901 +901 @@
 
 //----------------------------------------------------------
-Project::ProjectVector& Project::ordered_projects ()
-{
-  static ProjectVector OrderedProjects;
-  if (0 != OrderedProjects.size ()) return (OrderedProjects);
-
-  cmt_string s = Symbol::get_env_value ("CMTPATH");
-  CmtSystem::cmt_string_vector path_vector;
-  CmtSystem::split (s, CmtSystem::path_separator (), path_vector);
-
-  for (int i = 0; i < path_vector.size (); i++)
-    {
-      const cmt_string& path = path_vector[i];
-      Project* p = Project::find_by_cmtpath (path);
-      if (0 != p)
-        {
-          OrderedProjects.push_back (*p);
-        }
-      else
+Project::ProjectPtrVector Project::ordered_projects ()
+{
+  static ProjectPtrVector OrderedProjects;
+  if (0 != OrderedProjects.size ()) return OrderedProjects;
+
+  Project::ProjectVector& Projects = Project::projects ();
+  int size = Projects.size ();
+  
+  for (int i = 0; i < size; i++)
+    {
+      Project& p = Projects[i];
+      //    p.m_visited = false;
+      p.m_order = -1;
+      p.m_visits = 0;
+    }
+
+  Project* p = get_current ();
+
+  if (p == 0)
+    {
+      if (0 == size) return OrderedProjects;
+
+      p = &(Projects[0]);
+    }
+
+  ProjectPtrVector projs;
+
+  int order (-1);
+  p->m_order = ++order;
+  p->m_visits++;
+  projs.push_back (p);
+
+  visit (order, projs);
+
+  OrderedProjects.resize (order + 1);
+  for (int i = 0; i < size; i++)
+    {
+      Project* p = &(Projects[i]);
+      int j = p->m_order;
+      if (-1 == j)
         {
           if (CmtMessage::active (Verbose))
-            CmtMessage::warning ("No project for CMTPATH entry `" + path + "'");
-        }
-    }
-
-  return (OrderedProjects);
+            CmtMessage::warning ("Not ordered project " + p->get_name () +
+                                 " in path " + p->get_cmtpath_pwd () +
+                                 " from " + p->get_cmtpath_source ());
+          continue;
+        }
+      OrderedProjects[j] = p;
+    }
+
+  return OrderedProjects;
 }
 
@@ -1088 +1114 @@
 void Project::broadcast (IProjectAction& action)
 {
-  //  static ProjectVector& Projects = projects ();
-  static ProjectVector& Projects = ordered_projects ();
+  static ProjectPtrVector Projects = Project::ordered_projects ();
 
   for (int i = 0; i < Projects.size (); i++)
     {
+      const Project* project = Projects[i];
+
+      if (!action.run (*project)) break;
+    }
+  /*
+  static ProjectVector& Projects = projects ();
+
+  for (int i = 0; i < Projects.size (); i++)
+    {
       const Project& project = Projects[i];
 
       if (!action.run (project)) break;
     }
+  */
 }
 
@@ -1102 +1137 @@
 void Project::reverse_broadcast (IProjectAction& action)
 {
-  //  static ProjectVector& Projects = projects ();
-  static ProjectVector& Projects = ordered_projects ();
+  static ProjectPtrVector Projects = Project::ordered_projects ();
 
   for (int i = (Projects.size () - 1); i >= 0; i--)
     {
+      const Project* project = Projects[i];
+
+      if (!action.run (*project)) break;
+    }
+  /*
+  static ProjectVector& Projects = projects ();
+
+  for (int i = (Projects.size () - 1); i >= 0; i--)
+    {
       const Project& project = Projects[i];
 
       if (!action.run (project)) break;
     }
+  */
 }
 
@@ -1257 +1301 @@
 
 //----------------------------------------------------------
+/**
+ *  Visit the projects tree and order the projects.
+ *  Order is the projects upon which the project depends directly,
+ *  then the direct dependencies of the of the first dependency, of the second
+ *  dependency and so on. That is first left to right, then downwards.
+ *  @param order the order of the last project visited
+ *  @param projs vector of projects to visit and order
+ */
+void Project::visit (int& order, ProjectPtrVector& projs)
+{
+  int size = projs.size ();
+  if (0 == size) return;
+  static ProjectVector& all = Project::projects ();
+
+  ProjectPtrVector children;
+  for (int j = 0; j < size; j++)
+    {
+      Project* p = projs[j];
+      // Avoid looping in case of circular project dependencies
+      if (100 <= p->m_visits)
+        continue;
+      for (int i = 0; i < p->get_children_size (); i++)
+        {
+          Project* child = p->get_child (i);
+          const int chorder = child->m_order;
+          if (-1 == chorder) // not ordered yet, i.e. visited for the first time
+            child->m_order = ++order;
+          else
+            { // ordered already, want to put it last in the order
+              for (int k = 0; k < all.size (); k++)
+                {
+                  Project& q = all[k];
+                  if (q.m_order == chorder)
+                    q.m_order = order;
+                  else if (q.m_order > chorder)
+                    q.m_order--;
+                }
+            }
+          child->m_visits++;
+          children.push_back (child);
+        }
+    }
+
+  visit (order, children);
+}
+
+//----------------------------------------------------------
 void Project::start_visit (IProjectVisitor& visitor)
 {
@@ -1282 +1373 @@
   visitor.in (p);
   p->m_visits++;
-  ProjectPtrVector projects;
-  projects.push_back (p);
-  visit (visitor, projects);
+  ProjectPtrVector projs;
+  projs.push_back (p);
+  visit (visitor, projs);
 }
 
@@ -1363 +1454 @@
   */
 
+  /*
   VisitorForFillCMTPATH visitor (buffer);
 
   start_visit (visitor);
+  */
+  const ProjectPtrVector Ordered = Project::ordered_projects ();
+
+  buffer = "path CMTPATH \"\" \n";
+  for (int i = 0; i < Ordered.size (); i++)
+    {
+      const Project* p = Ordered[i];
+      const cmt_string& w = p->get_cmtpath_pwd ();
+      const cmt_string& s = p->get_cmtpath_source ();
+      
+      if (s == "default path") continue;
+      
+      if (CmtSystem::test_directory (w))
+        {
+          buffer += "path_append CMTPATH \"";
+          buffer += w;
+          buffer += "\" \n";
+        }
+    }
 }
 

CMT/HEAD/source/cmt_project.h

@@ -109 +109 @@
 
   static ProjectVector& projects ();
-  static ProjectVector& ordered_projects ();
+  static ProjectPtrVector ordered_projects ();
   static void clear_all ();
   static void show_all ();
@@ -192 +192 @@
   void   visit (IProjectVisitor& visitor);
   static  void   visit (IProjectVisitor& visitor, ProjectPtrVector& projects);
+  static  void   visit (int& order, ProjectPtrVector& projects);
   
   // Use
@@ -214 +215 @@
   bool m_visited;
   int m_visits;
+  int m_order;
 
   cmt_string m_cmtpath;