michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(emacs/lean-server): async task queue holds type of cmds as well

Browse source
This commit is contained in:
Soonho Kong 2014-09-11 04:09:21 -07:00
parent 565402f3d6
commit 4b556a41ed
1 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/emacs/lean-server.el
View file

@ -309,8 +309,11 @@ If it's not the same with file-name (default: buffer-file-name), send VISIT cmd.
(process-send-string proc string-to-send) (process-send-string proc string-to-send)
(lean-server-after-send-cmd cmd))) (lean-server-after-send-cmd cmd)))
(defun lean-server-process-message-with-cont (body type cont) (defun lean-server-process-message-with-cont (body type cont cmd-type)
"Process the message from lean-server and call continuation" "Process the message from lean-server and call continuation"
(lean-server-debug "process-message-with-cont: type = %S, cmd-type = %S"
type cmd-type)
(lean-server-debug "process-message-with-cont: body\n-----\n%s\n-----\n" body)
(cl-case type (cl-case type
(INFO (INFO
(lean-server-debug "Process: INFO") (lean-server-debug "Process: INFO")
@ -367,8 +370,9 @@ If it's not the same with file-name (default: buffer-file-name), send VISIT cmd.
(defun lean-server-async-task-queue-len () (defun lean-server-async-task-queue-len ()
(length lean-global-async-task-queue)) (length lean-global-async-task-queue))
(defun lean-server-async-task-queue-push-back (cont) (defun lean-server-async-task-queue-push-back (cont cmd-type)
(setq lean-global-async-task-queue (-snoc lean-global-async-task-queue cont))) (setq lean-global-async-task-queue (-snoc lean-global-async-task-queue
`(,cont . ,cmd-type))))
(defun lean-server-async-task-queue-peek-front () (defun lean-server-async-task-queue-peek-front ()
(car lean-global-async-task-queue)) (car lean-global-async-task-queue))
@ -382,7 +386,7 @@ If it's not the same with file-name (default: buffer-file-name), send VISIT cmd.
(lean-server-debug "send-cmd-async: queue len = %d" (lean-server-async-task-queue-len)) (lean-server-debug "send-cmd-async: queue len = %d" (lean-server-async-task-queue-len))
(lean-server-send-cmd cmd) (lean-server-send-cmd cmd)
(when cont (when cont
(lean-server-async-task-queue-push-back cont) (lean-server-async-task-queue-push-back cont (lean-cmd-type cmd))
(lean-server-debug "send-cmd-async: added to %s the queue, queue size = %d" (lean-server-debug "send-cmd-async: added to %s the queue, queue size = %d"
(lean-cmd-type cmd) (lean-cmd-type cmd)
(lean-server-async-task-queue-len)) (lean-server-async-task-queue-len))
@ -394,12 +398,22 @@ If it's not the same with file-name (default: buffer-file-name), send VISIT cmd.
(lean-server-async-task-queue-len)) (lean-server-async-task-queue-len))
(while lean-global-async-task-queue (while lean-global-async-task-queue
(accept-process-output (lean-server-get-process) 0 50 t) (accept-process-output (lean-server-get-process) 0 50 t)
(let* ((cont (lean-server-async-task-queue-peek-front)) (let* ((front-item (lean-server-async-task-queue-peek-front))
(result (lean-server-check-and-process-buffer-with-cont cont))) (cont (car front-item))
(cmd-type (cdr front-item))
(result (lean-server-check-and-process-buffer-with-cont cont
cmd-type)))
(pcase result (pcase result
(`(PROCESSED ,ret) (`(PROCESSED ,ret)
(lean-server-async-task-queue-pop-front) (lean-server-async-task-queue-pop-front)
(lean-server-debug "lean-server-consume-all-sync-tasks: processed. queue size = %d" (lean-server-debug "lean-server-consume-all-sync-tasks: processed. queue size = %d"
(lean-server-async-task-queue-len)))
(`(NOTREADY)
(lean-server-debug "lean-server-consume-all-sync-tasks: not ready. queue size = %d"
(lean-server-async-task-queue-len)))
(t
(lean-server-async-task-queue-pop-front)
(lean-server-debug "lean-server-consume-all-sync-tasks: either error or quit happend. queue size = %d"
(lean-server-async-task-queue-len)))))) (lean-server-async-task-queue-len))))))
(lean-server-debug "lean-server-consume-all-async-tasks: over. queue size = %d" (lean-server-debug "lean-server-consume-all-async-tasks: over. queue size = %d"
(lean-server-async-task-queue-len))) (lean-server-async-task-queue-len)))
@ -502,8 +516,11 @@ If it's successful, take it out from the queue.
Otherwise, set an idle-timer to call the handler again" Otherwise, set an idle-timer to call the handler again"
(lean-server-cancel-retry-timer) (lean-server-cancel-retry-timer)
(when (eq major-mode 'lean-mode) (when (eq major-mode 'lean-mode)
(let* ((cont (lean-server-async-task-queue-peek-front)) (let* ((front-item (lean-server-async-task-queue-peek-front))
(result (lean-server-check-and-process-buffer-with-cont cont))) (cont (car front-item))
(cmd-type (cdr front-item))
(result (lean-server-check-and-process-buffer-with-cont cont
cmd-type)))
(pcase result (pcase result
(`(PROCESSED ,ret) (`(PROCESSED ,ret)
(lean-server-async-task-queue-pop-front) (lean-server-async-task-queue-pop-front)