Drop psyco support

At best it gave 1-2% improvement now, its 32 bit x86 only and isn't
supported after python 2.6.

PyPy is probably a better option now.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/bin/bitbake b/bin/bitbake
index 1ed46d9b53d91da4c6b1dbb2f177138f358b90d4..922a0532f8796435bdaf39aabaca571742a11b93 100755 (executable)
--- a/bin/bitbake
+++ b/bin/bitbake
@@ -139,9 +139,6 @@ Default BBFILES are the .bb files in the current directory.""")
     parser.add_option("-p", "--parse-only", help = "quit after parsing the BB files (developers only)",
                action = "store_true", dest = "parse_only", default = False)
 
-    parser.add_option("-d", "--disable-psyco", help = "disable using the psyco just-in-time compiler (not recommended)",
-               action = "store_true", dest = "disable_psyco", default = False)
-
     parser.add_option("-s", "--show-versions", help = "show current and preferred versions of all packages",
                action = "store_true", dest = "show_versions", default = False)
 

diff --git a/doc/bitbake.1 b/doc/bitbake.1
index 036402e8acb085f915aa428276fc62ed979d32f4..aa096203e47fd12af4ea4840d6c659fe0740e001 100644 (file)
--- a/doc/bitbake.1
+++ b/doc/bitbake.1
@@ -85,9 +85,6 @@ don't execute, just go through the motions
 .B \-p, \-\-parse-only
 quit after parsing the BB files (developers only)
 .TP
-.B \-d, \-\-disable-psyco
-disable using the psyco just-in-time compiler (not recommended)
-.TP
 .B \-s, \-\-show-versions
 show current and preferred versions of all packages
 .TP

diff --git a/doc/manual/usermanual.xml b/doc/manual/usermanual.xml
index a3e85e14f92908a8d92f54b890b023ec07f8b22b..2ebdf32162938641132378a0bd2e828b3b056e39 100644 (file)
--- a/doc/manual/usermanual.xml
+++ b/doc/manual/usermanual.xml
@@ -417,8 +417,6 @@ options:
                         than once.
   -n, --dry-run         don't execute, just go through the motions
   -p, --parse-only      quit after parsing the BB files (developers only)
-  -d, --disable-psyco   disable using the psyco just-in-time compiler (not
-                        recommended)
   -s, --show-versions   show current and preferred versions of all packages
   -e, --environment     show the global or per-package environment (this is
                         what used to be bbread)

diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 86cdd953856788455d89fcd8ead2167ca593fd44..27ca330e408c7e08e6f6af33cccbd160130b89c1 100644 (file)
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -900,19 +900,6 @@ class BBCooker:
         if self.state != state.parsing:
             self.parseConfiguration ()
 
-            # Import Psyco if available and not disabled
-            import platform
-            if platform.machine() in ['i386', 'i486', 'i586', 'i686']:
-                if not self.configuration.disable_psyco:
-                    try:
-                        import psyco
-                    except ImportError:
-                        collectlog.info("Psyco JIT Compiler (http://psyco.sf.net) not available. Install it to increase performance.")
-                    else:
-                        psyco.bind( CookerParser.parse_next )
-                else:
-                    collectlog.info("You have disabled Psyco. This decreases performance.")
-
             self.status = bb.cache.CacheData(self.caches_array)
 
             ignore = bb.data.getVar("ASSUME_PROVIDED", self.configuration.data, 1) or ""