Changeset 62025 in vbox for trunk

Timestamp:

Jul 5, 2016 1:50:26 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

108487

Message:

ValidationKit,common: Wrapped shutil.copyfile in common/utils.py as copyFileSimple, applying the buffer hack before calling it.

Location:

trunk/src/VBox/ValidationKit

Files:

• common/utils.py (modified) (3 diffs)
• common/webutils.py (modified) (2 diffs)
• tests/unittests/tdUnitTest1.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/common/utils.py

@@ -378 +378 @@
              time.strftime('%Y-%m-%d %H:%M', time.localtime(oStat.st_mtime)), );
 
+## Good buffer for file operations.
+g_cbGoodBufferSize = 256*1024;
+
+## The original shutil.copyfileobj.
+g_fnOriginalShCopyFileObj = None;
+
+def __myshutilcopyfileobj(fsrc, fdst, length = g_cbGoodBufferSize):
+    """ shutil.copyfileobj with different length default value (16384 is slow with python 2.7 on windows). """
+    return g_fnOriginalShCopyFileObj(fsrc, fdst, length);
+
+def __installShUtilHacks(shutil):
+    """ Installs the shutil buffer size hacks. """
+    global g_fnOriginalShCopyFileObj;
+    if g_fnOriginalShCopyFileObj is None:
+        g_fnOriginalShCopyFileObj = shutil.copyfileobj;
+        shutil.copyfileobj = __myshutilcopyfileobj;
+    return True;
+
+
+def copyFileSimple(sFileSrc, sFileDst):
+    """
+    Wrapper around shutil.copyfile that simply copies the data of a regular file.
+    Raises exception on failure.
+    Return True for show.
+    """
+    import shutil;
+    __installShUtilHacks(shutil);
+    return shutil.copyfile(sFileSrc, sFileDst);
 
 #
@@ -1559 +1587 @@
 
 
-## Good buffer for file operations.
-g_cbGoodBufferSize = 256*1024;
-
-## The original shutil.copyfileobj.
-g_fnOriginalShCopyFileObj = None;
-
-def __myshutilcopyfileobj(fsrc, fdst, length = g_cbGoodBufferSize):
-    """ shutil.copyfileobj with different length default value (16384 is slow with python 2.7 on windows). """
-    return g_fnOriginalShCopyFileObj(fsrc, fdst, length);
-
 ## Set if we've replaced tarfile.copyfileobj with __mytarfilecopyfileobj already.
 g_fTarCopyFileObjOverriddend = False;
@@ -1608 +1626 @@
     #
     if True is True:
-        global g_fnOriginalShCopyFileObj;
-        if g_fnOriginalShCopyFileObj is None:
-            g_fnOriginalShCopyFileObj = shutil.copyfileobj;
-            shutil.copyfileobj = __myshutilcopyfileobj;
+        __installShUtilHacks(shutil);
         global g_fTarCopyFileObjOverriddend;
         if g_fTarCopyFileObjOverriddend is False:

trunk/src/VBox/ValidationKit/common/webutils.py

@@ -31 +31 @@
 # Standard Python imports.
 import os;
-import shutil;
 import sys;
 import unittest;
@@ -177 +176 @@
         fnLog('Copying "%s" to "%s"...' % (sSrcPath, sDstFile));
         try:
-            shutil.copyfile(sSrcPath, sDstFile);
+            utils.copyFileSimple(sSrcPath, sDstFile);
         except Exception, oXcpt:
             fnError('Error copying "%s" to "%s": %s' % (sSrcPath, sDstFile, oXcpt));

trunk/src/VBox/ValidationKit/tests/unittests/tdUnitTest1.py

@@ -36 +36 @@
 import re
 import subprocess
-import shutil
 
 
@@ -515 +514 @@
         reporter.log('_hardenedCopyFile: %s -> %s (mode: %o)' % (sSrc, sDst, iMode,));
         if utils.getHostOs() in [ 'win', 'os2' ]:
-            shutil.copyfile(sSrc, sDst);
+            utils.copyFileSimple(sSrc, sDst);
             os.chmod(sDst, iMode);
         else: