From: Spencer Baugh <sbaugh@catern.com>
To: emacs-devel@gnu.org
Cc: Spencer Baugh <sbaugh@catern.com>
Subject: [PATCH 2/5] server.el: accept FDs from emacsclient
Date: Mon, 6 Jun 2016 21:25:03 -0400 [thread overview]
Message-ID: <1465262706-5229-3-git-send-email-sbaugh@catern.com> (raw)
In-Reply-To: <1465262706-5229-1-git-send-email-sbaugh@catern.com>
The emacs server passes :ancillary t to make-network-process, and stores
any file descriptors it receives from a client.
---
lisp/server.el | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 55 insertions(+), 3 deletions(-)
diff --git a/lisp/server.el b/lisp/server.el
index e4cf431..894f8ac 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -352,6 +352,9 @@ server-delete-client
(when (and terminal (eq (terminal-live-p terminal) t))
(delete-terminal terminal))))
+ ;; Delete associated processes using this client's fds
+ (mapc #'delete-process (process-get proc :pipelines))
+
;; Delete the client's process.
(if (eq (process-status proc) 'open)
(delete-process proc))
@@ -670,6 +673,7 @@ server-start
:plist '(:authenticated nil))
(list :family 'local
:service server-file
+ :ancillary-data t
:plist '(:authenticated t)))))
(unless server-process (error "Could not start server process"))
(process-put server-process :server-file server-file)
@@ -915,7 +919,7 @@ server-execute-continuation
(process-put proc 'continuation nil)
(if continuation (ignore-errors (funcall continuation)))))
-(cl-defun server-process-filter (proc string)
+(cl-defun server-process-filter (proc string &optional ancillary)
"Process a request from the server to edit some files.
PROC is the server process. STRING consists of a sequence of
commands prefixed by a dash. Some commands have arguments;
@@ -1015,6 +1019,9 @@ server-execute-continuation
Suspend this terminal, i.e., stop the client process.
Sent when the user presses C-z."
(server-log (concat "Received " string) proc)
+ (when ancillary
+ (server-log (format "Received fds %s" ancillary) proc)
+ (process-put proc :fds ancillary))
;; First things first: let's check the authentication
(unless (process-get proc :authenticated)
(if (and (string-match "-auth \\([!-~]+\\)\n?" string)
@@ -1262,6 +1269,50 @@ server-execute-continuation
;; condition-case
(error (server-return-error proc err))))
+(defvar server-emacsclient-proc nil
+ "Non-nil if running commands for a client of our server.
+If we are currently evaluating Lisp in response to client commands,
+this variable contains the process for communicating with that
+client.")
+
+(defun server-pager-sentinel (proc event)
+ (internal-default-process-sentinel proc event)
+ (when (equal event "finished\n")
+ (let ((emacsclient (process-get proc :emacsclient)))
+ (setf (process-get emacsclient :pipelines)
+ (delq proc (process-get emacsclient :pipelines)))
+ (server-delete-client emacsclient))))
+
+(defun server-pager ()
+ "Start a process reading from FDs passed in by the current client.
+This function will start a process which will begin reading from the
+FDs passed in by the current client and copying their input to a
+*pager* buffer.
+
+This function should only be run by passing --eval to an emacsclient
+that also has the -l or --pipeline option, like so:
+ echo some data | emacsclient -l --eval '(server-pager)'"
+ ;; we remove two fds from the emacsclient process, and add ourselves
+ ;; in for later deletion when the emacsclient quits
+ (if (null server-emacsclient-proc)
+ (error "Cannot be run out of emacsclient --eval context")
+ (let ((buf (get-buffer "*pager*")))
+ (when buf (kill-buffer buf)))
+ (let* ((infd (pop (process-get server-emacsclient-proc :fds)))
+ (outfd (pop (process-get server-emacsclient-proc :fds)))
+ (buffer (generate-new-buffer "*pager*"))
+ (proc (make-fd-process :name "pager-proc"
+ :buffer buffer
+ :noquery t
+ :sentinel #'server-pager-sentinel
+ :infd infd
+ :outfd outfd
+ :plist (list :emacsclient server-emacsclient-proc))))
+ (push proc (process-get server-emacsclient-proc :pipelines))
+ (pop-to-buffer buffer)
+ proc)))
+
+
(defun server-execute (proc files nowait commands dontkill frame tty-name)
;; This is run from timers and process-filters, i.e. "asynchronously".
;; But w.r.t the user, this is not really asynchronous since the timer
@@ -1272,7 +1323,8 @@ server-execute
;; including code that needs to wait.
(with-local-quit
(condition-case err
- (let ((buffers (server-visit-files files proc nowait)))
+ (let ((buffers (server-visit-files files proc nowait))
+ (server-emacsclient-proc proc))
(mapc 'funcall (nreverse commands))
;; If we were told only to open a new client, obey
@@ -1294,7 +1346,7 @@ server-execute
;; Client requested nowait; return immediately.
(server-log "Close nowait client" proc)
(server-delete-client proc))
- ((and (not dontkill) (null buffers))
+ ((and (not dontkill) (null buffers) (null (process-get proc :pipelines)))
;; This client is empty; get rid of it immediately.
(server-log "Close empty client" proc)
(server-delete-client proc)))
--
2.8.2
next prev parent reply other threads:[~2016-06-07 1:25 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-07 1:25 Teaching emacsclient to act as a pager, and more Spencer Baugh
2016-06-07 1:25 ` [PATCH 1/5] process: add features for direct use of FDs Spencer Baugh
2016-06-07 1:25 ` Spencer Baugh [this message]
2016-06-07 1:25 ` [PATCH 3/5] emacsclient: support passing stdin/out/err to emacs Spencer Baugh
2016-06-07 1:25 ` [PATCH 4/5] server: add pager tapping and show-active Spencer Baugh
2016-06-07 1:25 ` [PATCH 5/5] emacsclient: add extra-quiet mode Spencer Baugh
2016-06-08 15:51 ` Teaching emacsclient to act as a pager, and more Tassilo Horn
2016-06-08 16:13 ` Anders Lindgren
2016-06-08 17:30 ` Tassilo Horn
2016-06-09 0:25 ` raman
2016-06-09 11:31 ` H. Dieter Wilhelm
2016-06-27 22:42 ` Ole JørgenBrønner
2016-07-24 18:22 ` sbaugh
2016-09-09 13:42 ` Noam Postavsky
2016-09-09 14:14 ` sbaugh
2016-09-09 14:59 ` Stefan Monnier
2016-09-09 15:58 ` sbaugh
2016-09-09 19:26 ` Stefan Monnier
2016-09-09 19:42 ` Eli Zaretskii
2016-09-09 21:13 ` sbaugh
2016-09-10 6:37 ` Using file descriptors in Emacs (was: Teaching emacsclient to act as a pager, and more) Eli Zaretskii
2016-09-10 20:15 ` Teaching emacsclient to act as a pager, and more sbaugh
2016-09-11 2:11 ` Leo Liu
2018-02-16 23:14 ` Kaushal Modi
2018-02-17 15:46 ` Göktuğ Kayaalp
2016-09-09 15:53 ` Eli Zaretskii
2016-09-09 17:16 ` sbaugh
2016-09-09 18:50 ` Eli Zaretskii
2016-09-09 19:03 ` sbaugh
2016-09-09 19:26 ` Eli Zaretskii
2016-09-09 20:38 ` sbaugh
2016-09-10 7:12 ` Using file descriptors in Emacs Eli Zaretskii
2016-09-10 14:28 ` sbaugh
2016-09-11 15:28 ` Eli Zaretskii
2016-09-11 16:00 ` sbaugh
2016-09-11 16:39 ` Eli Zaretskii
2016-09-11 16:57 ` sbaugh
2016-09-11 17:13 ` Eli Zaretskii
2016-09-12 15:40 ` Davis Herring
2016-09-09 13:27 ` Teaching emacsclient to act as a pager, and more sbaugh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465262706-5229-3-git-send-email-sbaugh@catern.com \
--to=sbaugh@catern.com \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.