pass args from main to webworker function.

hartsantler · hartsantler · commit 4b519dee166e · 2014-05-22T11:01:44.000-07:00
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -2160,7 +2160,8 @@ def visit_FunctionDef(self, node):
 					writer.write('def onmessage(e):')
 					writer.push()
 					writer.write(  'print("got message from parent")' )
-					writer.write(  'if e.data.type=="execute": %s.call(self, e.data.args, {}); self.postMessage({"type":"terminate"})' %node.name )
+					#writer.write(  'if e.data.type=="execute": %s.call(self, e.data.args, {}); self.postMessage({"type":"terminate"})' %node.name )
+					writer.write(  'if e.data.type=="execute": %s.apply(self, e.data.args); self.postMessage({"type":"terminate"})' %node.name )
 					writer.write(  'elif e.data.type=="append": __shared_list.push(e.data.value)' )
 					writer.write(  'elif e.data.type=="setitem": __shared_list.insert(e.data.index, e.data.value)' )
 					writer.pull()
@@ -2444,7 +2445,7 @@ def visit_FunctionDef(self, node):
 		for i in range(timeouts):
 			writer.pull()
 			## workerjs for nodejs requires at least 100ms to initalize onmessage/postMessage
-			writer.write('setTimeout(__callback%s, 500)' %i)
+			writer.write('setTimeout(__callback%s, 100)' %i)
 
 		if self._return_type:       ## check if a return type was caught
 			if return_type:
diff --git a/regtests/run.py b/regtests/run.py
@@ -297,11 +297,14 @@ def translate_js(filename, javascript=False, dart=False, coffee=False, lua=False
         if multioutput:
             d = json.loads( stdout )
             stdout = d.pop('main')
-
+            builtins = read(os.path.join("../pythonjs", "pythonjs.js"))
             for jsfile in d:
                 if not jsfile.startswith('/'):
                     stdout = stdout.replace('"%s"' %jsfile, '"/tmp/%s"' %jsfile)
-                write( os.path.join('/tmp', jsfile), d[jsfile] )
+                write(
+                    os.path.join('/tmp', jsfile), 
+                    '\n'.join( [builtins, d[jsfile]] ) 
+                )
 
         if dart:
 
@@ -518,7 +521,7 @@ def display(function):
         display(run_pythonjs_test_on_node)
 
     if '--no-javascript-mode' not in sys.argv:
-        js = translate_js(filename, javascript=True)
+        js = translate_js(filename, javascript=True, multioutput=filename.startswith('./threads/'))
         if rhino_runnable:
             display(run_pythonjsjs_test_on)
         if node_runnable:
diff --git a/regtests/threads/args.py b/regtests/threads/args.py
@@ -0,0 +1,32 @@
+"""simple thread"""
+
+import threading
+
+def webworker(a):
+	## In CPython this decorator does nothing.
+	## In PythonJS this decorator name is special,
+	## and triggers special code injected into the
+	## header of the function, and saves the worker
+	## function in a file "xxx.js" and in the main
+	## script the function is changed to a string
+	return lambda f : f
+
+@webworker( 'xxx.js' )
+def mythread(a,b):
+	print(a)
+	print(b)
+	threading.shared_list.append( a )
+	threading.shared_list.append( b )
+
+def main():
+	if PYTHON != "PYTHONJS":
+		threading.start_new_thread = threading._start_new_thread
+		threading.shared_list = list()
+
+	t = threading.start_new_thread( mythread, ('hello', 'worker') )
+	ticks = 0
+	while len(threading.shared_list) < 2:
+		ticks += 1
+
+	TestError( threading.shared_list[0] == 'hello' )
+	TestError( threading.shared_list[1] == 'worker' )
