Dizzy... I want mommy.

Ram Rachum · Ram Rachum · commit 9eb995a26b27 · 2009-08-16T16:33:07.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-*.pyc
+*.pyc
+*.wpu
diff --git a/garlicsim.wpr b/garlicsim.wpr
@@ -0,0 +1,13 @@
+#!wing
+#!version=3.0
+##################################################################
+# Wing IDE project file                                          #
+##################################################################
+[project attributes]
+proj.directory-list = [{'dirloc': loc('.'),
+                        'excludes': (),
+                        'filter': '*',
+                        'include_hidden': False,
+                        'recursive': True,
+                        'watch_for_changes': True}]
+proj.file-type = 'shared'
diff --git a/src/garlicsim/project.py b/src/garlicsim/project.py
@@ -23,6 +23,8 @@
 from misc.dumpqueue import dump_queue
 from misc.infinity import Infinity # Same as Infinity=float("inf")
 
+PreferredCruncher = CruncherProcess
+
 
 class Project(object):
     """
@@ -47,8 +49,14 @@ class Project(object):
     def __init__(self,simulation_package):
 
         self.init_simulation_package(simulation_package)
+
         self.tree=state.Tree()
 
+        if self.history_looker:
+            self.Cruncher = CruncherThread
+        else:
+            self.Cruncher = PreferredCruncher
+
         self.workers={}
         """
         A dict that maps edges that should be worked on to workers.
@@ -152,7 +160,6 @@ def sync_workers(self,temp_infinity_node=None):
         Returns the total amount of nodes that were added to the tree.
         """
 
-        Cruncher = CruncherThread#random.choice([CruncherThread, CruncherProcess])
 
         my_edges_to_crunch=self.edges_to_crunch.copy()
 
@@ -224,7 +231,7 @@ def sync_workers(self,temp_infinity_node=None):
             else:
                 # Create worker
                 if edge.still_in_editing==False:
-                    worker=self.workers[edge]=Cruncher(edge.state,step_function=self.simulation_package.step)
+                    worker=self.workers[edge]=self.Cruncher(edge.state,step_function=self.simulation_package.step)
                     worker.start()
                 if edge==temp_infinity_node:
                     continuation_of_temp_infinity_node=edge
diff --git a/src/garlicsimwx/applicationwindow.py b/src/garlicsimwx/applicationwindow.py
@@ -122,6 +122,7 @@ def background_stuff(self, e=None):
         A function that calls `sync_workers` for all the
         open GuiProjects.
         """
+        print("bg")
         for gui_project in self.gui_projects:
             gui_project.sync_workers()
 
diff --git a/src/garlicsimwx/junk/prespawnmultiprocessing.py b/src/garlicsimwx/junk/prespawnmultiprocessing.py
@@ -0,0 +1,34 @@
+import multiprocessing
+
+BUFFER = 3
+"""
+This is the minimum number of idle processes that should always be available.
+"""
+
+class Process(multiprocessing.Process):
+    def start(self):
+
+        multiprocessing.Process.start(self)
+
+class xProcess(object):
+    def __init__(self):
+        pass
+
+    def start(self):
+        self.process = recruit_process()
+
+
+def f():
+    print("working...")
+    for i in xrange(10**8):
+        pass
+    print("done.")
+
+def main():
+    Proc = Process #multiprocessing.Process # Process
+    p = Proc(target = f)
+    p.start()
+    p.join()
+    print("process joined")
+
+if __name__=="__main__": main()
diff --git a/src/garlicsimwx/simulationpackages/historytest/historytest.py b/src/garlicsimwx/simulationpackages/historytest/historytest.py
@@ -19,7 +19,7 @@ def make_random_state(*args,**kwargs):
     return state
 
 
-def step(history_browser,*args,**kwargs):
+def history_step(history_browser,*args,**kwargs):
 
     new_state=garlicsim.state.State()
 
@@ -31,5 +31,3 @@ def step(history_browser,*args,**kwargs):
     else:
         new_state.number=888
     return new_state
-
-step.history_looker=True
