1

f9/src/app.rs

@@ -50,7 +50,6 @@ pub struct App {
     im_work_msgs: Rc::<RefCell::<r9::ListHead::<IMMsgNode>>>,
     im_mutex: Mutex<i32>,
     http_handlers: HashMap<String, Box::<dyn FnMut (&mut HttpContext)>>,
-    //http_handlers: HashMap<String, Box::<dyn Fn (&HttpContext)>>,
     webapp_state: Arc::<AppState>,
 }
 
@@ -152,16 +151,17 @@ impl App {
     }
 
     pub fn uninit() {
-        //.user_app.as_ref().unwrap().borrow_mut().uninit();
+        let user_app = App::instance().borrow_mut().user_app.clone();
+        user_app.as_ref().unwrap().borrow_mut().uninit();
         crate::Timer::instance().borrow_mut().uninit();
     }
 
     pub fn run() {
         loop {
             crate::Timer::update();
+            App::dispatch_immsg();
+            App::dispatch_httprequest();
             std::thread::sleep(Duration::from_millis(1));
-            //self.dispatch_immsg();
-            //self.dispatch_httprequest();
         }
     }
 
@@ -213,16 +213,11 @@ impl App {
         r9::ListHead::add_tail(&self.im_msgs, &node.entry);
     }
 
-    fn dispatch_immsg(&mut self) {
-        {
-            let _ = self.im_mutex.lock();
-            if !self.im_msgs.borrow().empty() {
-                r9::ListHead::replace_init(&self.im_msgs, &self.im_work_msgs);
-            }
-        }
-        while !self.im_work_msgs.borrow().empty() {
+    fn dispatch_immsg() {
+        let im_work_msgs = App::instance().borrow_mut().fetch_immsg();
+        while !im_work_msgs.borrow().empty() {
             {
-                let node = &self.im_work_msgs.borrow().first_entry();
+                let node = &im_work_msgs.borrow().first_entry();
                 match &mut node.upgrade().unwrap().borrow_mut().cb {
                     Some(v) => {
                         (*v)(&node.upgrade().unwrap().borrow_mut().args);
@@ -235,35 +230,60 @@ impl App {
         }
     }
 
-    fn dispatch_httprequest(&mut self) {
+    fn fetch_immsg(&mut self) -> Rc::<RefCell::<r9::ListHead::<IMMsgNode>>> {
+        r9::ListHead::replace_init(&self.im_msgs, &self.im_work_msgs);
+        return self.im_work_msgs.clone();
+    }
+
+    fn dispatch_httprequest() {
         #[derive(Deserialize)]
         struct Ca {
             c: String,
             a: String
         }
-        {
-            let pending_list = &mut self.webapp_state.request.lock().unwrap();
-            while pending_list.len() > 0 {
-                match pending_list.pop() {
-                    Some(v) => {
-                        let ctx = &mut v.lock().unwrap();
-                        let req = web::Query::<Ca>::from_query(&ctx.query_str).unwrap();
-                        let key = format!("{}${}", &req.c, &req.a);
-                        match self.http_handlers.get_mut(&key) {
-                            Some(v1) => {
-                                (v1)(ctx);
-                                ctx.handled = true;
-                            }
-                            None => {
-                                //ctx.handled = true;
-                            }
+        let pending_list = App::instance().borrow_mut().fetch_request();
+        match pending_list {
+            Some(list) => {
+                for req in list {
+                    let ctx = &mut req.lock().unwrap();
+                    let ca = web::Query::<Ca>::from_query(&ctx.query_str).unwrap();
+                    let key = format!("{}${}", &ca.c, &ca.a);
+                    match &mut App::instance().borrow_mut().get_http_handle(&key) {
+                        Some(handle) => {
+                            (handle)(ctx);
+                            ctx.handled = true;
+                        }
+                        None => {
+                            //ctx.handled = true;
                         }
                     }
-                    None => {
-
-                    }
                 }
             }
+            None => {
+
+            }
+        }
+    }
+
+    fn fetch_request(&mut self) -> Option<Vec<Arc<Mutex<HttpContext>>>> {
+        let pending_list = &mut self.webapp_state.request.lock().unwrap();
+        if pending_list.len() <= 0 {
+            return None;
+        }
+        let result = pending_list.clone();
+        pending_list.clear();
+        return Some(result);
+    }
+
+    fn get_http_handle(&mut self, key: &String) ->
+        Option<&mut Box::<dyn FnMut (&mut HttpContext)>> {
+        match self.http_handlers.get_mut(key) {
+            Some(v) => {
+                return Some(v);
+            }
+            None => {
+                return None;
+            }
         }
     }
 
@@ -278,7 +298,8 @@ impl App {
         });
     }
 
-    pub fn add_http_handler(&mut self, key: String, cb: Box::<dyn FnMut (&mut HttpContext)>) {
+    pub fn add_http_handler(&mut self, key: String,
+                            cb: Box::<dyn FnMut (&mut HttpContext)>) {
         self.http_handlers.insert(key, cb);
     }