[pypy-svn] r17578 - in pypy/dist/pypy/translator: goal tool tool/pygame

[ale at codespeak.net]

Author: ale
Date: Thu Sep 15 16:09:48 2005
New Revision: 17578

Added:
   pypy/dist/pypy/translator/tool/pygame/server.py
Modified:
   pypy/dist/pypy/translator/goal/translate_pypy_new.py
   pypy/dist/pypy/translator/tool/graphserver.py
Log:
moved some code out of translate_pypy_new, concerning graphservers.

Initially I had wanted to move both "run_async_server" and "run_translator_server" aka "run_server" into graphserver.

That meant for "run_server" to be renamed to "run_translator_server", and since "run_async_server" imports pygame (no not pypy.translator.tool.pygame) I put it into pypy/translator/tool/pygame/server.py

Modified: pypy/dist/pypy/translator/goal/translate_pypy_new.py
==============================================================================
--- pypy/dist/pypy/translator/goal/translate_pypy_new.py	(original)
+++ pypy/dist/pypy/translator/goal/translate_pypy_new.py	Thu Sep 15 16:09:48 2005
@@ -107,8 +107,6 @@
         ldef = listdef.ListDef(None, annmodel.SomeString())
         inputtypes = [annmodel.SomeList(ldef)]
     
-    if listen_port:
-        run_async_server()
     if not options1.no_annotations:
         print 'Annotating...'
         print 'with policy: %s.%s' % (policy.__class__.__module__, policy.__class__.__name__) 
@@ -180,30 +178,6 @@
 
 serv_start, serv_show, serv_stop, serv_cleanup = None, None, None, None
 
-def run_async_server():
-    global serv_start, serv_show, serv_stop, serv_cleanup
-    from pypy.translator.tool import graphpage, graphserver
-    homepage = graphpage.TranslatorPage(t)
-    (serv_start, serv_show, serv_stop, serv_cleanup
-     )=graphserver.run_server(homepage, port=listen_port, background=True)
-    
-
-def run_server():
-    from pypy.translator.tool import graphpage
-    import pygame
-    from pypy.translator.tool.pygame.graphclient import get_layout
-    from pypy.translator.tool.pygame.graphdisplay import GraphDisplay    
-
-    if len(t.functions) <= options1.huge:
-        page = graphpage.TranslatorPage(t)
-    else:
-        page = graphpage.LocalizedCallGraphPage(t, entry_point)
-
-    layout = get_layout(page)
-    show, async_quit = layout.connexion.initiate_display, layout.connexion.quit
-    display = layout.get_display()
-    return display.run, show, async_quit, pygame.quit
-
 def mkexename(name):
     if sys.platform == 'win32':
         name = os.path.normpath(name + '.exe')
@@ -252,7 +226,8 @@
                 if serv_start:
                     start, show, stop, cleanup = serv_start, serv_show, serv_stop, serv_cleanup
                 else:
-                    start, show, stop, cleanup = run_server()
+                    from pypy.translator.tool.pygame.server import run_translator_server
+                    start, show, stop, cleanup = run_translator_server(t, entry_point, options1)
                 pdb_plus_show.install_show(show)
                 debugger = run_debugger_in_thread(func, args, stop)
                 debugger.start()
@@ -371,6 +346,9 @@
             # otherwise we have been loaded
             a = t.annotator
             t.frozen = False
+        if listen_port:
+            from pypy.translator.tool.graphserver import run_async_server
+            serv_start, serv_show, serv_stop, serv_cleanup = run_async_server(t, listen_port)
         try:
             standalone = analyse(t, inputtypes)
         except TyperError:

Modified: pypy/dist/pypy/translator/tool/graphserver.py
==============================================================================
--- pypy/dist/pypy/translator/tool/graphserver.py	(original)
+++ pypy/dist/pypy/translator/tool/graphserver.py	Thu Sep 15 16:09:48 2005
@@ -10,6 +10,12 @@
 send_msg = portutil.send_msg
 recv_msg = portutil.recv_msg
 
+def run_async_server(t, listen_port):
+    import graphpage
+    homepage = graphpage.TranslatorPage(t)
+    print repr(t),repr(homepage)
+    return run_server(homepage, port=listen_port, background=True)
+
 class GraphserverPort(portutil.Port):
 
     def __init__(self, s, homepage):

Added: pypy/dist/pypy/translator/tool/pygame/server.py
==============================================================================
--- (empty file)
+++ pypy/dist/pypy/translator/tool/pygame/server.py	Thu Sep 15 16:09:48 2005
@@ -0,0 +1,17 @@
+
+def run_translator_server(t, entry_point, options):
+    from pypy.translator.tool import graphpage
+    import pygame
+    from pypy.translator.tool.pygame.graphclient import get_layout
+    from pypy.translator.tool.pygame.graphdisplay import GraphDisplay
+
+    if len(t.functions) <= options.huge:
+        page = graphpage.TranslatorPage(t)
+    else:
+        page = graphpage.LocalizedCallGraphPage(t, entry_point)
+
+    layout = get_layout(page)
+    show, async_quit = layout.connexion.initiate_display, layout.connexion.quit
+    display = layout.get_display()
+    return display.run, show, async_quit, pygame.quit
+