hiro/emacs-jupyter
1
0
Fork 0
mirror of https://github.com/vale981/emacs-jupyter synced 2025-03-08 16:41:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move ioloop synchronization into server conn object

Browse source
This commit is contained in:
Nathaniel Nicandro 2020-04-29 18:08:19 -05:00
parent 82e5a0fbc2
commit 9df6d01070
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
jupyter-server-kernel.el
View file

@ -76,7 +76,10 @@ Access should be done through `jupyter-available-kernelspecs'.")))
(jupyter-ioloop-alive-p ioloop)))
:send
(lambda (&rest event)
(apply #'jupyter-send ioloop event))
(apply #'jupyter-send ioloop event)
(unless (jupyter-ioloop-wait-until ioloop
(car event) #'identity)
(error "Timeout when sending server event: %s" event)))
:start
(lambda (&rest _)
(when (and ioloop (jupyter-ioloop-alive-p ioloop))
@ -215,17 +218,14 @@ Call the next method if ARGS does not contain :server."
;;; Client connection
(defun jupyter-server--connect-channels (server id)
(jupyter-send (oref server ioloop) 'connect-channels id)
(unless (jupyter-ioloop-wait-until (oref server ioloop)
'connect-channels #'identity)
(error "Timeout when connecting websocket to kernel id %s" id)))
(unless (jupyter-alive-p (oref server conn))
(jupyter-start (oref server conn)))
(jupyter--send (oref server conn) 'connect-channels id))
(defun jupyter-server--disconnect-channels (server id)
;; from the comm-remove-handler of a server
(jupyter-send (oref server ioloop) 'disconnect-channels id)
(unless (jupyter-ioloop-wait-until (oref server ioloop)
'disconnect-channels #'identity)
(error "Timeout when disconnecting websocket for kernel id %s" id)))
(unless (jupyter-alive-p (oref server conn))
(jupyter-start (oref server conn)))
(jupyter--send (oref server conn) 'disconnect-channels id))
(cl-defmethod jupyter-connection :before ((kernel jupyter-server-kernel) &rest _)
(pcase-let (((cl-struct jupyter-server-kernel server id) kernel))