Changeset 4903:008cf60987da

Timestamp:

06/08/07 02:17:35 (6 years ago)

Author:

William Stein <wstein@…>

Branch:

default

Message:

Twisted notebook -- implemented interrupt/restart less blocking (hence server is more robust).

Location:

sage

Files:

• interfaces/expect.py (modified) (4 diffs)
• server/notebook/cell.py (modified) (1 diff)
• server/notebook/css.py (modified) (1 diff)
• server/notebook/js.py (modified) (3 diffs)
• server/notebook/twist.py (modified) (2 diffs)
• server/notebook/worksheet.py (modified) (7 diffs)

sage/interfaces/expect.py

@@ -355 +355 @@
         raise NotImplementedError
 
-    def quit(self, verbose=False):
+    def quit(self, verbose=False, timeout=0.25):
         """
         EXAMPLES:
@@ -377 +377 @@
         try:
             E.sendline(self._quit_string())
-            self._so_far(wait=0.25)
+            self._so_far(wait=timeout)
             os.killpg(E.pid, 9)
             os.kill(E.pid, 9)
@@ -469 +469 @@
             raise KeyboardInterrupt, "Ctrl-c pressed while running %s"%self
 
-    def interrupt(self, tries=20, timeout=0.3):
+    def interrupt(self, tries=20, timeout=0.3, quit_on_fail=True):
         E = self._expect
         if E is None:
@@ -489 +489 @@
         if success:
             pass
-        else:
+        elif quit_on_fail:
             self.quit()
         return success

sage/server/notebook/cell.py

@@ -531 +531 @@
             if 'cell://%s'%F in out:
                 continue
-            url = "/w/%s/data/%s/%s"%(self.worksheet_name(), self.relative_id(), F)
+            url = "/ws/%s/data/%s/%s"%(self.worksheet_name(), self.relative_id(), F)
             if F.endswith('.png') or F.endswith('.bmp'):
                 images.append('<img src="%s?%d">'%(url, self.version()))

sage/server/notebook/css.py

@@ -597 +597 @@
 
 span.pane div.worksheet_list {
-   /*position:fixed;  */
+   position:fixed; 
    overflow:scroll;
    font-size:12px;

sage/server/notebook/js.py

@@ -1818 +1818 @@
 
 function interrupt_callback(status, response_text) {
-    if (response_text == "restart") {
-        alert("The SAGE kernel had to be restarted (your variables are no longer defined).");
-        restart_sage_callback('success', response_text);
+    if (response_text == "failed") {
+
     } else if(status == "success") {
         halt_active_cells()
@@ -1836 +1835 @@
     link.className = "interrupt_in_progress";
     link.innerHTML = "Interrupt"
-    async_request('/interrupt', interrupt_callback, 'worksheet_id='+worksheet_id);
+    async_request(worksheet_command('interrupt'), interrupt_callback);
 }
 
@@ -1902 +1901 @@
     link.className = "restart_sage_in_progress";
     link.innerHTML = "Restart";
-    async_request('/restart_sage', restart_sage_callback, 'worksheet_id='+worksheet_id);
+    async_request(worksheet_command('restart_sage'), restart_sage_callback);
 }
 

sage/server/notebook/twist.py

@@ -54 +54 @@
 class WorksheetResource:
     def __init__(self, worksheet_name):
+        self._name = worksheet_name
         self.worksheet = notebook.get_worksheet_with_name(worksheet_name)
 
@@ -205 +206 @@
 
 
-class Worksheet_plain(resource.Resource):
+class Worksheet_restart_sage(WorksheetResource, resource.Resource):
+    def render(self, ctx):
+        # TODO -- this must not block long (!)
+        self.worksheet.restart_sage()
+        return http.Response(stream='done')
+
+class Worksheet_interrupt(WorksheetResource, resource.Resource):
+    def render(self, ctx):
+        # TODO -- this must not block long (!)
+        s = self.worksheet.interrupt()
+        return http.Response(stream='ok' if s else 'failed')
+
+
+class Worksheet_plain(WorksheetResource, resource.Resource):
+    def render(self, ctx):
+        s = notebook.plain_text_worksheet_html(self._name)
+        return http.Response(stream=s)
+
+class Worksheet_print(WorksheetResource, resource.Resource):
+    def render(self, ctx):
+        s = notebook.worksheet_html(self._name)
+        return http.Response(stream=s)
+
+
+class Worksheet(resource.Resource):
+    addSlash = True
+
     def __init__(self, name):
         self._name = name
-        
-    def render(self, ctx):
-        s = notebook.plain_text_worksheet_html(self._name)
-        return http.Response(stream=s)
-
-class Worksheet_print(resource.Resource):
-    def __init__(self, name):
-        self._name = name
-        
-    def render(self, ctx):
-        s = notebook.worksheet_html(self._name)
-        return http.Response(stream=s)
-
-class Worksheet(resource.Resource):
-    addSlash = True
-
-    def __init__(self, name):
-        self._name = name
 
     def render(self, ctx):
         s = notebook.html(worksheet_id = self._name)
+        notebook.get_worksheet_with_id(self._name).sage()
         return http.Response(stream=s)
 

sage/server/notebook/worksheet.py

@@ -32 +32 @@
 from cell import Cell, TextCell
 
-INTERRUPT_TRIES = 15
+INTERRUPT_TRIES = 3
 
 INITIAL_NUM_CELLS = 1
@@ -382 +382 @@
             cmd = '__DIR__="%s/"; DIR=__DIR__;'%self.DIR()
             cmd += '_support_.init("%s", globals()); '%object_directory
-            #S.eval(cmd)
-            S._send(cmd)   # so web server doesn't lock. 
+            S._send(cmd)   # non blocking
         except Exception, msg:
             print "ERROR initializing compute process:\n"
@@ -389 +388 @@
             del self.__sage
             raise RuntimeError
-        
+        print "Done starting"
         A = self.attached_files()
         for F in A.iterkeys():
@@ -776 +775 @@
             pass
         else:
-            success = S.interrupt(INTERRUPT_TRIES, timeout=0.3)
-
+            success = S.interrupt(INTERRUPT_TRIES, timeout=0.3, quit_on_fail=False)
+
+        if success:
+            self.clear_queue()
+            
+        return success
+
+    def clear_queue(self):
         # empty the queue
         for C in self.__queue:
             C.interrupt()
-
         self.__queue = []
         self.__comp_is_running = False
 
-        return success
-
     def restart_sage(self):
         """
         Restart SAGE kernel.
         """
-        # stop the current computation in the running SAGE
-        self.interrupt()
+        print "restarting"
 
         try:
@@ -800 +801 @@
             return
 
-        alarm(3)
-        try:
-            S.quit()
+        try:
+            pid = S._expect.pid
+            os.killpg(pid, 9)
+            os.kill(pid, 9)
             S._expect = None
             del self.__sage
@@ -810 +812 @@
             print msg
             print "WARNING: Error deleting SAGE object!"
-        cancel_alarm()
 
         try:
@@ -818 +819 @@
 
         # We do this to avoid getting a stale SAGE that uses old code. 
+        self.clear_queue()
         self.__sage = initialized_sage()
         self.initialize_sage()
-        
         self._enqueue_auto_cells()
         self.start_next_comp()
-
+        
     def postprocess_output(self, out, C):
         i = out.find('\r\n')