Commits

Sebastien Binet  committed d55edca Merge

sync w/ atlasoff

  • Participants
  • Parent commits dfbcc88, 98ee489
  • Branches mob-branch, mob

Comments (0)

Files changed (4)

 9978dc06a3870d415eb12b9ecc0bdf637804c900 PyUtils-00-12-02
 46bf026d30011082caf82c6cd9e75591176bec04 PyUtils-00-12-03
 216d3b85131a009b83a086b220231dcd3d07098b PyUtils-00-12-04
+bdb483df7548f39cd1b8bbc14b3dd6bce4eed249 PyUtils-00-12-05
+2012-04-10  Sebastien Binet  <binet@cern.ch>
+
+	* tagging PyUtils-00-12-05
+	* change when forking happens to not lock in xrootd threads
+	* fixes bug #93510
+	* M python/AthFile/__init__.py
+	* M python/AthFile/impl.py
+
 2012-04-05  Graeme Andrew Stewart <graeme.andrew.stewart@cern.ch>
     * tagging PyUtils-00-12-04
     * add diffTAGFile.py script

File python/AthFile/__init__.py

     def flush_cache(self):
         return self.server.flush_cache
     
-    @property
-    def ftype(self):
-        return self.server.ftype
+    @_decos.forking
+    def ftype(self, fname):
+        return self.server.ftype(fname)
 
-    @property
-    def fname(self):
-        return self.server.fname
+    @_decos.forking
+    def fname(self, fname):
+        return self.server.fname(fname)
 
-    @property
-    def exists(self):
-        return self.server.exists
+    @_decos.forking
+    def exists(self, fname):
+        return self.server.exists(fname)
 
     @property
     def tests(self):

File python/AthFile/impl.py

 import subprocess
 import sys
 
-import PyUtils.Decorators as _decos
 import PyUtils.Helpers as H
 from PyUtils.Helpers    import ShutUp
 from .timerdecorator import timelimit, TimeoutError
         md5 = self._md5_for_file(fname)
         return md5
     
-    @_decos.forking
     @timelimit(timeout=DEFAULT_AF_TIMEOUT)
     def fname(self, fname):
         """take a file name, return the pair (protocol, 'real' file name)
         self._cache = {}
         return
 
-    @_decos.forking
     @timelimit(timeout=DEFAULT_AF_TIMEOUT)
     def ftype(self, fname):
         """
         ftype = 'pool' if _is_root_file else 'bs'
         return (ftype, fname)
 
-    @_decos.forking
     @timelimit(timeout=DEFAULT_AF_TIMEOUT)
     def exists(self, fname):
         """helper function to test if a fiven `fname` exists.