Move Request handling into Runtime (fixes #259).

src/rust.rs

@@ -31,7 +31,7 @@ use jsapi::{MutableHandleValue, HandleValue, HandleObject, HandleBase};
 use jsapi::AutoObjectVector;
 use jsapi::{ToBooleanSlow, ToNumberSlow, ToStringSlow};
 use jsapi::{ToInt32Slow, ToUint32Slow, ToUint16Slow, ToInt64Slow, ToUint64Slow};
-use jsapi::{JSAutoRequest, JS_BeginRequest, JS_EndRequest};
+use jsapi::{JS_BeginRequest, JS_EndRequest};
 use jsapi::{JSAutoCompartment, JS_EnterCompartment, JS_LeaveCompartment};
 use jsapi::{JSJitMethodCallArgs, JSJitGetterCallArgs, JSJitSetterCallArgs, CallArgs};
 use jsapi::{NullHandleValue, UndefinedHandleValue, JSID_VOID};
@@ -146,6 +146,8 @@ impl Runtime {
         (*contextopts).set_autoJSAPIOwnsErrorReporting_(true);
         JS_SetErrorReporter(js_runtime, Some(reportError));
 
+        JS_BeginRequest(js_context);
+
         Runtime {
             rt: js_runtime,
             cx: js_context,
@@ -176,7 +178,6 @@ impl Runtime {
             (script_utf16.as_ptr(), script_utf16.len() as c_uint)
         };
         assert!(!ptr.is_null());
-        let _ar = JSAutoRequest::new(self.cx());
         let _ac = JSAutoCompartment::new(self.cx(), glob.get());
         let options = CompileOptionsWrapper::new(self.cx(), filename_cstr.as_ptr(), line_num);
 
@@ -197,6 +198,7 @@ impl Runtime {
 impl Drop for Runtime {
     fn drop(&mut self) {
         unsafe {
+            JS_EndRequest(self.cx);
             JS_DestroyContext(self.cx);
             JS_DestroyRuntime(self.rt);
         }
@@ -559,24 +561,6 @@ impl<T: GCMethods<T> + Copy> Drop for Heap<T> {
 // ___________________________________________________________________________
 // Implementations for various things in jsapi.rs
 
-impl JSAutoRequest {
-    pub fn new(cx: *mut JSContext) -> JSAutoRequest {
-        unsafe { JS_BeginRequest(cx); }
-        JSAutoRequest {
-            mContext: cx
-        }
-    }
-}
-
-impl Drop for JSAutoRequest {
-    fn drop(&mut self) {
-        if self.mContext as usize == mem::POST_DROP_USIZE {
-            return;
-        }
-        unsafe { JS_EndRequest(self.mContext); }
-    }
-}
-
 impl JSAutoCompartment {
     pub fn new(cx: *mut JSContext, target: *mut JSObject) -> JSAutoCompartment {
         JSAutoCompartment {

tests/callback.rs

@@ -8,7 +8,6 @@ extern crate libc;
 use js::jsapi::CallArgs;
 use js::jsapi::CompartmentOptions;
 use js::jsapi::JSAutoCompartment;
-use js::jsapi::JSAutoRequest;
 use js::jsapi::JSContext;
 use js::jsapi::JS_DefineFunction;
 use js::jsapi::JS_EncodeStringToUTF8;
@@ -36,7 +35,6 @@ fn callback() {
 
         let h_option = OnNewGlobalHookOption::FireOnNewGlobalHook;
         let c_option = CompartmentOptions::default();
-        let _ar = JSAutoRequest::new(context);
         let global = JS_NewGlobalObject(context, &SIMPLE_GLOBAL_CLASS, ptr::null_mut(), h_option, &c_option);
         let global_root = Rooted::new(context, global);
         let global = global_root.handle();

tests/evaluate.rs

@@ -6,7 +6,6 @@ extern crate js;
 extern crate libc;
 
 use js::jsapi::CompartmentOptions;
-use js::jsapi::JSAutoRequest;
 use js::jsapi::JS_Init;
 use js::jsapi::JS_NewGlobalObject;
 use js::jsapi::OnNewGlobalHookOption;
@@ -23,7 +22,6 @@ fn evaluate() {
         assert!(JS_Init());
         let rt = Runtime::new();
         let cx = rt.cx();
-        let _ar = JSAutoRequest::new(cx);
 
         let global = RootedObject::new(cx,
             JS_NewGlobalObject(cx, &SIMPLE_GLOBAL_CLASS, ptr::null_mut(),

tests/stack_limit.rs

@@ -5,7 +5,6 @@
 extern crate js;
 
 use js::jsapi::CompartmentOptions;
-use js::jsapi::JSAutoRequest;
 use js::jsapi::JS_Init;
 use js::jsapi::JS_NewGlobalObject;
 use js::jsapi::OnNewGlobalHookOption;
@@ -23,7 +22,6 @@ fn stack_limit() {
 
         let rt = Runtime::new();
         let cx = rt.cx();
-        let _ar = JSAutoRequest::new(cx);
 
         let h_option = OnNewGlobalHookOption::FireOnNewGlobalHook;
         let c_option = CompartmentOptions::default();

tests/vec_conversion.rs

@@ -9,7 +9,6 @@ use js::conversions::FromJSValConvertible;
 use js::conversions::ToJSValConvertible;
 use js::jsapi::CompartmentOptions;
 use js::jsapi::JSAutoCompartment;
-use js::jsapi::JSAutoRequest;
 use js::jsapi::JS_Init;
 use js::jsapi::JS_NewGlobalObject;
 use js::jsapi::OnNewGlobalHookOption;
@@ -27,7 +26,6 @@ fn vec_conversion() {
 
         let rt = Runtime::new();
         let cx = rt.cx();
-        let _ar = JSAutoRequest::new(cx);
 
         let h_option = OnNewGlobalHookOption::FireOnNewGlobalHook;
         let c_option = CompartmentOptions::default();