Changeset 429

Timestamp:

Nov 22, 2007, 4:43:10 PM (17 years ago)

Author:

rybkin

Message:

See C.L. 335

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/fragments/constituent_lock (added)
• mgr/fragments/nmake/constituent_lock (added)
• mgr/lockfile.bat (added)
• mgr/lockfile.sh (added)
• mgr/requirements (modified) (2 diffs)
• source/cmt_generators.cxx (modified) (5 diffs)
• source/cmt_generators.h (modified) (1 diff)
• source/cmt_lock.cxx (modified) (4 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2007-11-22    <rybkin@lal.in2p3.fr> 335
+
+        * source/cmt_generators.h: idem
+        * source/cmt_generators.cxx: idem
+        * source/cmt_lock.cxx: idem
+        * mgr/fragments/constituent_lock: idem
+        * mgr/fragments/nmake/constituent_lock: idem
+        * mgr/requirements: Implement a locking mechanism to allow simultaneous/parallel
+        builds for multiple binary tags. Used suggestions from Pere, Stefan, and Andrea
+        * mgr/lockfile.bat: Basic semaphore-file creator for Windows
+        * mgr/lockfile.sh: Basic semaphore-file creator for Unix
+        
 2007-10-31    <rybkin@lal.in2p3.fr> 334
 

CMT/HEAD/mgr/requirements

@@ -445 +445 @@
 macro library_suffix ""
 
-macro lock_command "chmod -R a-w ../*" \   
-      VisualC      "attrib /S /D +R ..\*"
-
-macro unlock_command "chmod -R g+w ../*" \   
-      VisualC      "attrib /S /D -R ..\*"
+macro lock_command "" \
+      Linux        "lockfile " \
+      Darwin       "lockfile " \
+      VisualC      "%CMTROOT%\mgr\lockfile.bat "
+
+macro unlock_command "rm -rf " \   
+      VisualC        "rmdir "
+
+macro lock_name "cmt"
+macro lock_suffix ".lock"
+macro lock_file "${lock_name}${lock_suffix}"
 
 macro preprocessor_command "" \
@@ -554 +560 @@
 make_fragment group
 make_fragment constituent
+make_fragment constituent_lock
 make_fragment constituents_trailer
 

CMT/HEAD/source/cmt_generators.cxx

@@ -2404 +2404 @@
   group_fragment.set ("group");
   constituent_fragment.set ("constituent");
+  constituent_lock_fragment.set ("constituent_lock");
   check_application_header_fragment.set ("check_application_header");
 }
@@ -2414 +2415 @@
   group_fragment.reset ();
   constituent_fragment.reset ();
+  constituent_lock_fragment.reset ();
   check_application_header_fragment.reset ();
 }
@@ -2452 +2454 @@
 
   cmt_string save_file_name = file_name;
-  save_file_name += "sav";
+  save_file_name += "cmtsave";
 
   if (CmtSystem::test_file (file_name))
@@ -2487 +2489 @@
         }
       
+      bool lock = false;
+      Symbol* lock_command_macro = Symbol::find ("lock_command");
+      if (lock_command_macro != 0)
+        {
+          cmt_string lock_command = lock_command_macro->resolve_macro_value ();
+          if (lock_command != "")
+            {
+              Symbol* unlock_command_macro = Symbol::find ("unlock_command");
+              if (unlock_command_macro != 0)
+                {
+                  cmt_string unlock_command = unlock_command_macro->resolve_macro_value ();
+                  if (unlock_command != "")
+                    {
+                      lock = true;
+                    }
+                }
+            }
+        }
       for (number = 0; number < constituents.size (); number++)
         {
@@ -2505 +2525 @@
             }
 
-          constituent_fragment.copy (m_output_file, constituent.variables, 5, 
-                                     &m_PACKAGE,
-                                     &m_CONSTITUENT, 
-                                     &m_CONSTITUENTSUFFIX,
-                                     &m_LINE,
-                                     &m_HASTARGETTAG);
+          if (constituent.type == Document && lock == true)
+            {
+              constituent_lock_fragment.copy (m_output_file, constituent.variables,
+                                              5,
+                                              &m_PACKAGE,
+                                              &m_CONSTITUENT, 
+                                              &m_CONSTITUENTSUFFIX,
+                                              &m_LINE,
+                                              &m_HASTARGETTAG);
+            }
+          else
+            {
+              constituent_fragment.copy (m_output_file, constituent.variables,
+                                         5,
+                                         &m_PACKAGE,
+                                         &m_CONSTITUENT, 
+                                         &m_CONSTITUENTSUFFIX,
+                                         &m_LINE,
+                                         &m_HASTARGETTAG);
+            }
 
           if (constituent.need_check)

CMT/HEAD/source/cmt_generators.h

@@ -208 +208 @@
   FragmentHandle group_fragment;
   FragmentHandle constituent_fragment;
+  FragmentHandle constituent_lock_fragment;
   FragmentHandle check_application_header_fragment;
 };

CMT/HEAD/source/cmt_lock.cxx

@@ -14 +14 @@
 CmtLock::status CmtLock::lock ()
 {
-  status s = check ();
+//   status s = check ();
 
-  switch (s)
+//   switch (s)
+//     {
+//     case locked_by_user:
+//       cerr << "Package already locked by you" << endl;
+//       return (s);
+//     case locked_by_another_user:
+//       CmtError::set (CmtError::cannot_lock, "lock> Package already locked by another user");
+//       return (s);
+//     case not_locked:
+//       break;
+//     }
+
+//   cmt_string text = "locked by ";
+//   text += CmtSystem::user ();
+//   text += " date ";
+//   text += CmtSystem::now ();
+
+//   if (!text.write ("lock.cmt"))
+//     {
+//       CmtError::set (CmtError::cannot_write_lock, "lock>");
+//       return (still_unlocked);
+//     }
+
+//  cmt_string command = lock_command->build_macro_value ();
+
+  cmt_string lock_command;
+  Symbol* lock_command_macro = Symbol::find ("lock_command");
+  if (lock_command_macro != 0)
     {
-    case locked_by_user:
-      cerr << "Package already locked by you" << endl;
-      return (s);
-    case locked_by_another_user:
-      CmtError::set (CmtError::cannot_lock, "lock> Package already locked by another user");
-      return (s);
-    case not_locked:
-      break;
+      lock_command = lock_command_macro->resolve_macro_value ();
     }
-
-  cmt_string text = "locked by ";
-  text += CmtSystem::user ();
-  text += " date ";
-  text += CmtSystem::now ();
-
-  if (!text.write ("lock.cmt"))
+  if (lock_command == "")
     {
       CmtError::set (CmtError::cannot_write_lock, "lock>");
@@ -39 +53 @@
     }
 
-  Symbol* lock_command = Symbol::find ("lock_command");
-  if (lock_command != 0)
+  cmt_string lock_file;
+  Symbol* lock_file_macro = Symbol::find ("lock_file");
+  if (lock_file_macro != 0)
     {
-      cmt_string command = lock_command->build_macro_value ();
+      lock_file = lock_file_macro->resolve_macro_value ();
+    }
+  if (lock_file == "")
+    {
+      CmtError::set (CmtError::cannot_write_lock, "lock>");
+      return (still_unlocked);
+    }
 
-      if (command != "")
-        {
-          if (CmtSystem::execute (command) != 0)
-            {
-              CmtError::set (CmtError::cannot_run_lock_command, "lock>");
-              return (still_unlocked);
-            }
-        }
+  cmt_string command = lock_command + " " + lock_file;
+
+  if (CmtSystem::execute (command) != 0)
+    {
+      CmtError::set (CmtError::cannot_run_lock_command, "lock>");
+      return (still_unlocked);
     }
 
@@ -72 +91 @@
       return (s);
     case not_locked:
-      cerr << "The package was not locked" << endl;
+      cerr << "Package not locked" << endl;
       return (s);
     }
 
-  Symbol* unlock_command = Symbol::find ("unlock_command");
-  if (unlock_command != 0)
+//   Symbol* unlock_command = Symbol::find ("unlock_command");
+//   if (unlock_command != 0)
+//     {
+//       cmt_string command = unlock_command->build_macro_value ();
+
+//       if (command != "")
+//      {
+//        if (CmtSystem::execute (command) != 0)
+//          {
+//            CmtError::set (CmtError::cannot_run_unlock_command, "unlock>");
+//            return (still_locked);
+//          }
+//      }
+//     }
+
+//   if (!CmtSystem::remove_file ("lock.cmt"))
+//     {
+//       CmtError::set (CmtError::cannot_remove_lock, "unlock>");
+//       return (still_locked);
+//     }
+
+  cmt_string unlock_command;
+  Symbol* unlock_command_macro = Symbol::find ("unlock_command");
+  if (unlock_command_macro != 0)
     {
-      cmt_string command = unlock_command->build_macro_value ();
-
-      if (command != "")
-        {
-          if (CmtSystem::execute (command) != 0)
-            {
-              CmtError::set (CmtError::cannot_run_unlock_command, "unlock>");
-              return (still_locked);
-            }
-        }
+      unlock_command = unlock_command_macro->resolve_macro_value ();
+    }
+  if (unlock_command == "")
+    {
+      CmtError::set (CmtError::cannot_remove_lock, "unlock>");
+      return (still_locked);
     }
 
-  if (!CmtSystem::remove_file ("lock.cmt"))
+  cmt_string lock_file;
+  Symbol* lock_file_macro = Symbol::find ("lock_file");
+  if (lock_file_macro != 0)
+    {
+      lock_file = lock_file_macro->resolve_macro_value ();
+    }
+  if (lock_file == "")
     {
       CmtError::set (CmtError::cannot_remove_lock, "unlock>");
+      return (still_locked);
+    }
+
+  cmt_string command = unlock_command + " " + lock_file;
+
+  if (CmtSystem::execute (command) != 0)
+    {
+      CmtError::set (CmtError::cannot_run_unlock_command, "unlock>");
       return (still_locked);
     }
@@ -105 +156 @@
 CmtLock::status CmtLock::check ()
 {
-  cmt_string me = CmtSystem::user ();
-  cmt_string text;
+//   cmt_string me = CmtSystem::user ();
+//   cmt_string text;
 
-  if (text.read ("lock.cmt"))
+//   if (text.read ("lock.cmt"))
+//     {
+//       CmtSystem::cmt_string_vector words;
+
+//       CmtSystem::split (text, " ", words);
+
+//       if (words.size () >= 3)
+//      {
+//        if (words[2] == me)
+//          {
+//            return (locked_by_user);
+//          }
+//        else
+//          {
+//            return (locked_by_another_user);
+//          }
+//      }
+//     }
+  cmt_string lock_file;
+  Symbol* lock_file_macro = Symbol::find ("lock_file");
+  if (lock_file_macro != 0)
     {
-      CmtSystem::cmt_string_vector words;
+      lock_file = lock_file_macro->resolve_macro_value ();
+    }
 
-      CmtSystem::split (text, " ", words);
-
-      if (words.size () >= 3)
-        {
-          if (words[2] == me)
-            {
-              return (locked_by_user);
-            }
-          else
-            {
-              return (locked_by_another_user);
-            }
-        }
+  if (CmtSystem::test_file (lock_file) || CmtSystem::test_directory (lock_file))
+    {
+      return (locked_by_user);
     }