Rev 6: Start benching the impact of decorators. in file:///home/robertc/source/baz/plugins/piss/trunk/

[Robert Collins]

At file:///home/robertc/source/baz/plugins/piss/trunk/

------------------------------------------------------------
revno: 6
revision-id: robertc at robertcollins.net-20070503051846-ye6016zuffkelvk2
parent: robertc at robertcollins.net-20070503030034-bo7e3cf476sfouqy
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Thu 2007-05-03 15:18:46 +1000
message:
  Start benching the impact of decorators.
modified:
  benchmarks/bench_import.py     bench_import.py-20070501062416-23ztx65da4ul4oxv-7
  creator.py                     creator.py-20070501064357-lwoaimjvnf8252jd-1
  tests/test_creator.py          test_creator.py-20070501064357-lwoaimjvnf8252jd-4
=== modified file 'benchmarks/bench_import.py'
--- a/benchmarks/bench_import.py	2007-05-03 03:00:34 +0000
+++ b/benchmarks/bench_import.py	2007-05-03 05:18:46 +0000
@@ -31,10 +31,11 @@
         TestCaseWithTransport.setUp(self)
         self.creator = _mod_creator.Creator()
 
-    def time_importing_module(self, num_functions):
+    def time_importing_module(self, num_functions, decorated=False):
         self.add_cwd_to_path()
         # import once to generate a .pyc - the common case.
-        self.creator.build_module('tiny_piss')
+        self.creator.build_module('tiny_piss', num_functions=num_functions,
+            decorated=decorated)
         self.import_and_forget('tiny_piss')
         self.time(self.import_and_forget, 'tiny_piss')
 
@@ -53,6 +54,18 @@
     def test_import_10000_functions(self):
         self.time_importing_module(10000)
 
+    def test_import_10_decorated_functions(self):
+        self.time_importing_module(10, True)
+
+    def test_import_100_decorated_functions(self):
+        self.time_importing_module(100, True)
+
+    def test_import_1000_decorated_functions(self):
+        self.time_importing_module(1000, True)
+
+    def test_import_10000_decorated_functions(self):
+        self.time_importing_module(10000, True)
+
     def test_import_tiny_package(self):
         self.add_cwd_to_path()
         # import once to generate a .pyc - the common case.

=== modified file 'creator.py'
--- a/creator.py	2007-05-03 02:37:34 +0000
+++ b/creator.py	2007-05-03 05:18:46 +0000
@@ -23,17 +23,23 @@
 class Creator(object):
     """A creator of python modules/packages."""
 
-    def build_module(self, name, num_functions=0):
+    def build_module(self, name, num_functions=0, decorated=False):
         """Build a module in cwd called name.
         
         :param num_functions: the number of functions to create. Each function
             gets a name like fun_X where X is the serial of the function.
+        :param decorated: Decorate functions with
+            bzrlib.decorators.needs_read_lock.
         """
         path = name + '.py'
         output = file(path, 'wt+')
         try:
             try:
+                if decorated:
+                    output.write('from bzrlib.decorators import needs_read_lock\n')
                 for fn_index in range(num_functions):
+                    if decorated:
+                        output.write('@needs_read_lock\n')
                     output.write('def fun_%d():pass\n' % fn_index)
                 output.write('')
             finally:

=== modified file 'tests/test_creator.py'
--- a/tests/test_creator.py	2007-05-03 02:37:34 +0000
+++ b/tests/test_creator.py	2007-05-03 05:18:46 +0000
@@ -58,6 +58,18 @@
         for fn_index in range(100):
             self.assertTrue(callable(getattr(mod_foo, 'fun_%d' % fn_index)))
 
+    def test_build_module_decorated_count(self):
+        # building a module with 100 decorated functions should
+        # have a module of the decorator function.
+        creator = _mod_creator.Creator()
+        creator.build_module('foo', num_functions=100, decorated=True)
+        self.add_cwd_to_path()
+        mod_foo = self.import_and_forget('foo')
+        for fn_index in range(100):
+            self.assertEqual('bzrlib.decorators',
+                getattr(mod_foo, 'fun_%d' % fn_index).__module__)
+
+
     def test_build_package(self):
         # building a package called 'foo' should make a foo/__init__.py
         creator = _mod_creator.Creator()