Changeset 437 for CMT

Timestamp:

Feb 2, 2008, 7:39:21 AM (16 years ago)

Author:

rybkin

Message:

See C.L. 342

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_project.cxx (modified) (12 diffs)
• source/cmt_project.h (modified) (3 diffs)
• source/cmt_use.cxx (modified) (2 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2008-02-02    <rybkin@lal.in2p3.fr> 342
+
+        * source/cmt_project.h: Optimise the use of realpath_
+        * source/cmt_project.cxx: idem
+        * source/cmt_use.cxx: idem
+        
 2008-01-31    <rybkin@lal.in2p3.fr> 341
 

CMT/HEAD/source/cmt_project.cxx

@@ -272 +272 @@
   // In case there are symlinks
   cmt_string here_real, pwd_real;
+  //cerr << "realpath_: create_project" << endl;
   if (CmtSystem::realpath_ (here, here_real) && CmtSystem::realpath_ (pwd, pwd_real))
     {
@@ -560 +561 @@
 
   project->set_cmtpath (compressed_path);
+  project->set_cmtpath_real (pwd_real);
   project->set_cmtpath_pwd (pwd);
   project->set_cmtpath_source (source);
@@ -778 +780 @@
 
       if (p.m_cmtpath == compressed_path) return (&p);
+      if (p.m_cmtpath_real == compressed_path) return (&p);
       if (p.m_cmtpath_pwd == compressed_path) return (&p);
     }
@@ -801 +804 @@
       Project& p = Projects[i];
 
-      if (here.find (p.m_cmtpath_pwd) == 0) 
-        {
-          result = &p;
-        }
-
-      // In case there are symlinks
-      //      if (here.find (p.m_cmtpath) == 0) 
-      cmt_string p_real;
-      CmtSystem::realpath_ (p.m_cmtpath, p_real);
-      if (here_real.find (p_real) == 0) 
+//       if (here.find (p.m_cmtpath_pwd) == 0) 
+//      {
+//        result = &p;
+//      }
+
+//      if (here.find (p.m_cmtpath) == 0) 
+      if (here_real.find (p.m_cmtpath_real) == 0) 
         {
           result = &p;
@@ -1072 +1072 @@
   const cmt_string pwd = CmtSystem::pwd ();
 
+  // In case there are symlinks
+  cmt_string path_real;
+  //cerr << "realpath_: find_in_cmt_paths" << endl;
+  CmtSystem::realpath_ (path, path_real);
+
   static ProjectVector& Projects = projects ();
 
@@ -1079 +1084 @@
 
       const cmt_string& p = project.m_cmtpath;
+      const cmt_string& p_real = project.m_cmtpath_real;
       const cmt_string& w = project.m_cmtpath_pwd;
       const cmt_string& s = project.m_cmtpath_source;
@@ -1091 +1097 @@
 //          }
 
-          // In case there are symlinks
-          cmt_string p_real, path_real;
-          if (CmtSystem::realpath_ (p, p_real) && CmtSystem::realpath_ (path, path_real))
-            {
-              if (path_real.find (p_real) != cmt_string::npos) return (p);
+          if (path_real.find (p_real) != cmt_string::npos)
+            {
+              return (p);
             }
 
@@ -1268 +1272 @@
 
 //----------------------------------------------------------
+const cmt_string& Project::get_cmtpath_real () const
+{
+  return (m_cmtpath_real);
+}
+
+//----------------------------------------------------------
 const cmt_string& Project::get_cmtpath_pwd () const
 {
@@ -1330 +1340 @@
 
 //----------------------------------------------------------
+void Project::set_cmtpath_real (const cmt_string& path)
+{
+  m_cmtpath_real = path;
+}
+
+//----------------------------------------------------------
 void Project::set_cmtpath_pwd (const cmt_string& path)
 {
@@ -1347 +1363 @@
   m_release = "";
   m_cmtpath = "";
+  m_cmtpath_real = "";
   m_cmtpath_pwd    = "";
   m_cmtpath_source = "";
@@ -1718 +1735 @@
   m_name = other.m_name;
   m_cmtpath = other.m_cmtpath;
+  m_cmtpath_real = other.m_cmtpath_real;
   m_cmtpath_pwd = other.m_cmtpath_pwd;
   m_cmtpath_source = other.m_cmtpath_source;
@@ -1743 +1761 @@
   bool is_current = false;
 
-  cmt_string here = CmtSystem::pwd ();
-
-  if (here.find (m_cmtpath) == 0) 
+  //  cmt_string here = CmtSystem::pwd ();
+  // In case there are symlinks
+  cmt_string here_real;
+  CmtSystem::realpath_ (CmtSystem::pwd (), here_real);
+
+  //  if (here.find (m_cmtpath) == 0) 
+  if (here_real.find (m_cmtpath_real) == 0) 
     {
       if (m_cmtpath_source != "default path")

CMT/HEAD/source/cmt_project.h

@@ -136 +136 @@
   const cmt_string& get_container_version () const;
   const cmt_string& get_cmtpath () const;
+  const cmt_string& get_cmtpath_real () const;
   const cmt_string& get_cmtpath_pwd () const;
   const cmt_string& get_cmtpath_source () const;
@@ -151 +152 @@
   void set_container_version (const cmt_string& version);
   void set_cmtpath (const cmt_string& path);
+  void set_cmtpath_real (const cmt_string& path);
   void set_cmtpath_pwd (const cmt_string& path);
   void set_cmtpath_source (const cmt_string& source);
@@ -210 +212 @@
 
   cmt_string m_cmtpath;
+  cmt_string m_cmtpath_real;
   cmt_string m_cmtpath_pwd;
   cmt_string m_cmtpath_source;

CMT/HEAD/source/cmt_use.cxx

@@ -2902 +2902 @@
 
   cmtpath = Project::find_in_cmt_paths (real_path);
-
-  if (cmtpath != "")
+  Project* p = Project::find_by_cmtpath (cmtpath);
+
+  //  if (cmtpath != "")
+  if (p != 0)
     {
       CmtSystem::compress_path (cmtpath);
@@ -2913 +2915 @@
       //      offset = real_path;
       //      offset.replace (cmtpath, empty_string);
+      //cerr << "realpath_: get_cmtpath_and_offset" << endl;
       CmtSystem::realpath_ (real_path, offset);
-      cmt_string cmtpath_real;
-      CmtSystem::realpath_ (cmtpath, cmtpath_real);
-      offset.replace (cmtpath_real, empty_string);
+      offset.replace (p->get_cmtpath_real (), empty_string);
 
       /**