From 2d68a49fe9d30f687da45cfe7a02b497cb91137c Mon Sep 17 00:00:00 2001 From: Stas Boukarev Date: Wed, 2 Oct 2013 03:10:21 +0400 Subject: [PATCH] Optimize sb-bsd-sockets::(get-host-by-name get-host-by-address). Add declarations to reduce SAP consing. --- contrib/sb-bsd-sockets/constants.lisp | 2 +- contrib/sb-bsd-sockets/name-service.lisp | 47 ++++++++++++++++++------------ 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/contrib/sb-bsd-sockets/constants.lisp b/contrib/sb-bsd-sockets/constants.lisp index bb5bcbb..de0e2e8 100644 --- a/contrib/sb-bsd-sockets/constants.lisp +++ b/contrib/sb-bsd-sockets/constants.lisp @@ -288,7 +288,7 @@ #-darwin (integer addrlen "size_t" "ai_addrlen") ((* sockaddr-in) addr "struct sockaddr*" "ai_addr") (c-string-pointer canonname "char *" "ai_canonname") - ((* t) next "struct addrinfo*" "ai_next"))) + ((* (struct addrinfo)) next "struct addrinfo*" "ai_next"))) #+sb-bsd-sockets-addrinfo (:function getaddrinfo ("getaddrinfo" diff --git a/contrib/sb-bsd-sockets/name-service.lisp b/contrib/sb-bsd-sockets/name-service.lisp index d148373..51c1c82 100644 --- a/contrib/sb-bsd-sockets/name-service.lisp +++ b/contrib/sb-bsd-sockets/name-service.lisp @@ -19,6 +19,7 @@ (defmethod host-ent-address ((host-ent host-ent)) (car (host-ent-addresses host-ent))) +#-sb-bsd-sockets-addrinfo (defun make-host-ent (h &optional errno) (when (sb-alien:null-alien h) (name-service-error "gethostbyname" errno)) @@ -53,6 +54,7 @@ :aliases aliases :addresses addresses))) +(declaim (inline naturalize-unsigned-byte-8-array)) (defun naturalize-unsigned-byte-8-array (array length) (let ((addr (make-array 4 :element-type '(unsigned-byte 8)))) (dotimes (i length) @@ -94,39 +96,46 @@ weird stuff - see gethostbyname(3) or getaddrinfo(3) for the details." ;;; Emulate the above two functions with getaddrinfo / getnameinfo #+sb-bsd-sockets-addrinfo +(declaim (inline get-address-info)) +#+sb-bsd-sockets-addrinfo (defun get-address-info (node) - (sb-alien:with-alien ((buf (sb-alien:array (* sockint::addrinfo) 1))) - (let* ((res (sb-alien:addr (sb-alien:deref buf 0))) - (err (sockint::getaddrinfo node nil nil res))) + (declare (optimize speed)) + (sb-alien:with-alien ((info (* sockint::addrinfo))) + (let* ((err (sockint::getaddrinfo node nil nil (sb-alien:addr info))) + (to-free info)) (if (zerop err) (let ((host-ent (make-instance 'host-ent :name node :type sockint::af-inet :aliases nil :addresses nil))) - (loop for sap = (sb-alien:deref res) then (sockint::addrinfo-next info) - until (sb-alien::null-alien sap) - for info = (sb-alien:cast sap (* sockint::addrinfo)) + (loop until (sb-alien::null-alien info) ;; Only handle AF_INET currently. - do (when (eq (sockint::addrinfo-family info) sockint::af-inet) - (let* ((sockaddr (sockint::addrinfo-addr info)) - (address (sockint::sockaddr-in-addr sockaddr))) - ;; The same effective result can be multiple time - ;; in the list, with different socktypes. Only record - ;; each address once. - (setf (slot-value host-ent 'addresses) - (adjoin (naturalize-unsigned-byte-8-array address - 4) - (host-ent-addresses host-ent) - :test 'equalp))))) - (sockint::freeaddrinfo (sb-alien:deref res)) + do + (when (eq (sockint::addrinfo-family info) sockint::af-inet) + (let* ((sockaddr (sockint::addrinfo-addr info)) + (address (sockint::sockaddr-in-addr sockaddr))) + ;; The same effective result can be multiple time + ;; in the list, with different socktypes. Only record + ;; each address once. + (setf (slot-value host-ent 'addresses) + (adjoin (naturalize-unsigned-byte-8-array address + 4) + (host-ent-addresses host-ent) + :test 'equalp)))) + (setf info (sockint::addrinfo-next info))) + (sockint::freeaddrinfo to-free) host-ent) (addrinfo-error "getaddrinfo" err))))) (defconstant ni-max-host 1025) #+sb-bsd-sockets-addrinfo +(declaim (inline get-name-info)) +#+sb-bsd-sockets-addrinfo (defun get-name-info (address) + (declare (optimize speed) + (vector address)) (assert (= (length address) 4)) (sockint::with-sockaddr-in sockaddr () (sb-alien:with-alien ((host-buf (array char #.ni-max-host))) @@ -135,7 +144,7 @@ weird stuff - see gethostbyname(3) or getaddrinfo(3) for the details." (dotimes (i 4) (setf (sb-alien:deref (sockint::sockaddr-in-addr sockaddr) i) (aref address i))) - (let ((err (sockint::getnameinfo (sb-alien:alien-sap sockaddr) + (let ((err (sockint::getnameinfo sockaddr (sb-alien:alien-size sockint::sockaddr-in :bytes) (sb-alien:cast host-buf (* char)) ni-max-host nil 0 -- 1.7.10.4