Change exception types for resource exhaustion.

Out of memory is now signaled by a MemoryError
Too much CPU time is reported as a SystemError

I'm going to punt on the issue with specifying memory usage limits on contexts
when it really refernces the runtime. I don't see a good way to implement it
without quite a bit of work. It'll never be specifiable per context, only the
api might change to avoid confusion.

[#12 state:resolved]

Author: Paul Davis

spidermonkey/context.c

@@ -197,6 +197,7 @@ branch_cb(JSContext* jscx, JSScript* script)
         JS_GC(jscx);
         if(jscx->runtime->gcBytes > pycx->max_heap)
         {
+            PyErr_NoMemory();
             return JS_FALSE;
         }
     }
@@ -207,6 +208,7 @@ branch_cb(JSContext* jscx, JSScript* script)
         && pycx->max_time < now - pycx->start_time
     )
     {
+        PyErr_SetNone(PyExc_SystemError);
         return JS_FALSE;
     }
 

tests/test-context.py

@@ -39,7 +39,7 @@ def test_get_set_limits(cx):
 @t.cx()
 def test_exceed_time(cx):
     cx.max_time(1)
-    t.raises(RuntimeError, cx.execute, "while(true) {}")
+    t.raises(SystemError, cx.execute, "while(true) {}")
 
 @t.cx()
 def test_does_not_exceed_time(cx):
@@ -56,12 +56,12 @@ def test_does_not_exceed_time(cx):
 def test_exceed_memory(cx):
     cx.max_memory(10000)
     script = "var f = []; var b = 1000000; while(b-- > 0) f[f.length] = b*0.9;"
-    t.raises(Exception, cx.execute, script)
+    t.raises(MemoryError, cx.execute, script)
 
 @t.cx()
 def test_small_limit(cx):
     cx.max_memory(1)
-    t.raises(Exception, cx.execute, "far f = 0.3; f;");
+    t.raises(MemoryError, cx.execute, "var f = []; while(true) f.push(2.3);");
 
 @t.cx()
 def test_does_not_exceed_memory(cx):