tests/test-turnover.py @@ -30,3 +30,6 @@ Keiji Costantini Richard Boulton * Initial patch for filtering Python access. + +marc + * Report on Context turnover causing segfaults. THANKS @@ -344,10 +344,6 @@ Context_new(PyTypeObject* type, PyObject* args, PyObject* kwargs) * garbage collection from happening on either side of the * bridge. * - * To make sure that the context stays alive we'll add a - * reference to the Context* anytime we wrap a Python - * object for use in JS. - * */ JS_SetContextPrivate(self->cx, self); spidermonkey/context.c @@ -34,6 +34,7 @@ finalize(JSContext* jscx, JSObject* jsobj) if(pycx == NULL) { fprintf(stderr, "*** NO PYTHON CONTEXT ***\n"); + JS_EndRequest(jscx); return; } spidermonkey/pyiter.c @@ -224,12 +224,6 @@ js_finalize(JSContext* jscx, JSObject* jsobj) JS_EndRequest(jscx); Py_DECREF(pyobj); - - // Technically, this could turn out to be nasty. If - // this is the last object keeping the python cx - // alive, then this call could be deleting the cx - // we're about to return to. - Py_DECREF(pycx); } PyObject* @@ -493,12 +487,6 @@ py2js_object(Context* cx, PyObject* pyobj) goto error; } - /* - As noted in Context_new, here we must ref the Python context - to make sure it stays alive while a Python object may be - referenced in the JS VM. - */ - Py_INCREF(cx); ret = OBJECT_TO_JSVAL(jsobj); goto success; spidermonkey/pyobject.c @@ -20,12 +20,17 @@ Runtime_new(PyTypeObject* type, PyObject* args, PyObject* kwargs) if(self == NULL) goto error; self->rt = JS_NewRuntime(stacksize); - if(self->rt == NULL) goto error; + if(self->rt == NULL) + { + PyErr_SetString(JSError, "Failed to allocate new JSRuntime."); + goto error; + } goto success; error: Py_XDECREF(self); + self = NULL; success: return (PyObject*) self; spidermonkey/runtime.c @@ -46,7 +46,7 @@ def test_exceed_time(cx): script = """ var time = function() {return (new Date()).getTime();}; var start = time(); - while((time() - start) < 2000) {} + while((time() - start) < 100000) {} """ cx.max_time(1) t.raises(SystemError, cx.execute, script) tests/test-context.py 38872a8e736002095794a745e013dee66be25bd4 Paul J. Davis paul.joseph.davis@gmail.com http://github.com/davisp/python-spidermonkey/commit/6d5e357f9cd4ae3cfaaf25aafbf6c121cf519ac2 6d5e357f9cd4ae3cfaaf25aafbf6c121cf519ac2 2009-06-26T16:45:51-07:00 2009-06-26T16:45:51-07:00 Fix segfaults when large numbers of contexts. Turns out that I had an error in my logic about how to reference count the python context object. I removed references to it from Python objects that are wrapped in the JavaScript VM. I'm more than 50% certain that this is correct as when the Python context dies, it'll destroy the JSContext* and along with it all references to Python objects that need refernces to the Context. [#21 state:resolved] f70696ccfc31719d988d2f65425db9725bb2401f Paul J. Davis paul.joseph.davis@gmail.com