Browse Source

Further optimized handle_request

Yentl Van Tendeloo 8 years ago
parent
commit
3e2955d8c7
1 changed files with 4 additions and 18 deletions
  1. 4 18
      kernel/modelverse_kernel/request_handler.py

+ 4 - 18
kernel/modelverse_kernel/request_handler.py

@@ -97,27 +97,13 @@ class RequestHandler(object):
             # Silence pylint's warning about catching Exception.
             # pylint: disable=I0011,W0703
             try:
-                """
-                if self.has_pending_requests():
-                    try:
-                        # Try to pop a request for the modelverse state.
-                        return self.pop_requests()
-                    except KnownRequestHandled:
-                        # Carry on.
-                        pass
-
-                if not self.has_pending_requests():
-                    # Perform a single generator step.
+                while self.generator_stack[-1].finished_requests:
                     self.generator_stack[-1].step()
-                """
-                if self.has_pending_requests():
-                    try:
-                        return self.pop_requests()
-                    except KnownRequestHandled:
-                        pass
                 else:
-                    self.generator_stack[-1].step()
+                    return self.pop_requests()
 
+            except KnownRequestHandled:
+                pass
             except StopIteration:
                 # Done, so remove the generator
                 self.pop_generator()