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

refactor(emacs/lean-server): restructure async queue handling routine

Browse source
This commit is contained in:
Soonho Kong 2014-09-05 15:22:59 -07:00
parent a72df90022
commit a1e00bb216
2 changed files with 27 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/emacs/lean-info.el
View file

@ -555,9 +555,9 @@ Take out \"BEGININFO\" and \"ENDINFO\" and Use \"ACK\" as a delim."
(lean-server-check-current-file file-name) (lean-server-check-current-file file-name)
(lean-server-send-cmd-async (lean-cmd-info line-number) (lean-server-send-cmd-async (lean-cmd-info line-number)
(lambda (info-record) (lambda (info-record)
(if (lean-info-record-nay info-record) (cond ((lean-info-record-nay info-record)
(lean-get-info-record-at-point cont) (lean-get-info-record-at-point cont))
(funcall cont info-record)))))) (t (funcall cont info-record)))))))
(defun lean-get-full-name-at-point-cont (info-record) (defun lean-get-full-name-at-point-cont (info-record)
"Continuation of lean-get-full-name-at-point" "Continuation of lean-get-full-name-at-point"

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

@ -41,9 +41,7 @@
(defun lean-server-trace (format-string &rest args) (defun lean-server-trace (format-string &rest args)
"Display a message at the bottom of the *lean-server* buffer." "Display a message at the bottom of the *lean-server* buffer."
(message "?\n")
(when lean-server-trace-mode (when lean-server-trace-mode
(message "!\n")
(when lean-global-server-last-time-sent (when lean-global-server-last-time-sent
(let ((time-diff (- (float-time) lean-global-server-last-time-sent))) (let ((time-diff (- (float-time) lean-global-server-last-time-sent)))
(lean-server-output-to-buffer lean-server-trace-buffer-name (lean-server-output-to-buffer lean-server-trace-buffer-name
@ -56,10 +54,11 @@
(defun lean-server-debug (format-string &rest args) (defun lean-server-debug (format-string &rest args)
"Display a message at the bottom of the *lean-server-debug* buffer." "Display a message at the bottom of the *lean-server-debug* buffer."
(when lean-server-debug-mode (when lean-server-debug-mode
(lean-server-output-to-buffer lean-server-debug-buffer-name (let ((time-str (format-time-string "%H:%M:%S.%3N" (current-time))))
(concat "%s -- " format-string "\n") (lean-server-output-to-buffer lean-server-debug-buffer-name
(cons (format-time-string "%H:%M:%S:%3N" (current-time)) (concat "%s -- " format-string "\n")
args)))) (cons (propertize time-str 'face 'font-lock-keyword-face)
args)))))
(defun lean-server-turn-on-debug-mode () (defun lean-server-turn-on-debug-mode ()
(interactive) (interactive)
@ -147,6 +146,12 @@
;; How to create an async process ;; How to create an async process
;; ============================== ;; ==============================
(defun lean-server-cancel-retry-timer ()
(when (timerp lean-global-retry-timer)
(cancel-timer lean-global-retry-timer))
(setq lean-global-retry-timer nil))
(defun lean-server-initialize-global-vars () (defun lean-server-initialize-global-vars ()
"Initialize lean-server related global variables" "Initialize lean-server related global variables"
(setq lean-global-server-buffer nil) (setq lean-global-server-buffer nil)
@ -154,9 +159,7 @@
(setq lean-global-server-message-to-process nil) (setq lean-global-server-message-to-process nil)
(setq lean-global-server-last-time-sent nil) (setq lean-global-server-last-time-sent nil)
(setq lean-global-async-task-queue nil) (setq lean-global-async-task-queue nil)
(when (timerp lean-global-retry-timer) (lean-server-cancel-retry-timer))
(cancel-timer lean-global-retry-timer))
(setq lean-global-retry-timer nil))
(defun lean-server-create-process () (defun lean-server-create-process ()
"Create lean-server process." "Create lean-server process."
@ -327,16 +330,10 @@ If it's not the same with file-name (default: buffer-file-name), send VISIT cmd.
(lean-server-send-cmd cmd) (lean-server-send-cmd cmd)
(when cont (when cont
(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))
(lean-server-cancel-retry-timer)
(lean-server-debug "send-cmd-async: added to the queue = %S" (lean-server-debug "send-cmd-async: added to the queue = %S"
(length lean-global-async-task-queue)) (length lean-global-async-task-queue))
(lean-server-debug "send-cmd-async: call handler") (lean-server-debug "send-cmd-async: call handler")
(lean-server-event-handler))) (lean-server-set-timer-for-event-handler)))
(defun lean-server-cancel-retry-timer ()
(when (timerp lean-global-retry-timer)
(cancel-timer lean-global-retry-timer)
(setq lean-global-retry-timer nil)))
(defun lean-server-consume-all-async-tasks () (defun lean-server-consume-all-async-tasks ()
(while lean-global-async-task-queue (while lean-global-async-task-queue
@ -415,17 +412,17 @@ If it's not the same with file-name (default: buffer-file-name), send VISIT cmd.
(defun lean-server-event-handler () (defun lean-server-event-handler ()
"Process an item from async-task-queue. "Process an item from async-task-queue.
If it's successful, take it out from the queue. Otherwise, set an If it's successful, take it out from the queue.
idle-timer to call the handler again" Otherwise, set an idle-timer to call the handler again"
(setq lean-global-retry-timer nil) (lean-server-cancel-retry-timer)
(let* ((cont (car lean-global-async-task-queue)) (when (eq major-mode 'lean-mode)
(result (lean-server-check-and-process-buffer-with-cont cont))) (let* ((cont (car lean-global-async-task-queue))
(pcase result (result (lean-server-check-and-process-buffer-with-cont cont)))
(`(PROCESSED ,ret) (pcase result
(!cdr lean-global-async-task-queue) (`(PROCESSED ,ret)
ret))) (!cdr lean-global-async-task-queue)
(when lean-global-async-task-queue ret)))
(lean-server-set-timer-for-event-handler))) (if lean-global-async-task-queue (lean-server-set-timer-for-event-handler))))
(defadvice save-buffers-kill-emacs (defadvice save-buffers-kill-emacs
(before lean-server-kill-before-kill-emacs activate) (before lean-server-kill-before-kill-emacs activate)