From 98496311e2ffbccb6d48c99c582fa8cfccb28a87 Mon Sep 17 00:00:00 2001 From: Attila Lendvai Date: Mon, 5 May 2008 09:39:49 +0200 Subject: [PATCH] small changes to the reverser test --- net.sockets.cc/classes.lisp | 1 + tests/net.sockets.cc/reverser.lisp | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/net.sockets.cc/classes.lisp b/net.sockets.cc/classes.lisp index ec2d1ed..92d3c48 100644 --- a/net.sockets.cc/classes.lisp +++ b/net.sockets.cc/classes.lisp @@ -54,6 +54,7 @@ :initarg :fd-multiplexer-type :accessor fd-multiplexer-type-of))) +;; TODO use progn combination (defgeneric startup-connection-multiplexer (multiplexer &key &allow-other-keys)) (defgeneric shutdown-connection-multiplexer (multiplexer &key force)) diff --git a/tests/net.sockets.cc/reverser.lisp b/tests/net.sockets.cc/reverser.lisp index 1249055..92ca6b0 100644 --- a/tests/net.sockets.cc/reverser.lisp +++ b/tests/net.sockets.cc/reverser.lisp @@ -25,22 +25,22 @@ (in-suite test) -(defparameter *external-format* (babel:ensure-external-format '(:utf-8 :eol-style :crlf))) +(defparameter *reverser-external-format* (babel:ensure-external-format '(:utf-8 :eol-style :crlf))) (defun start-reverser-server (&key (address +loopback+) (port 4242) (worker-count 4) - (external-format *external-format*)) - (bind ((acceptor (make-connection-acceptor "reverser server" 'reverser-connection-handler + (external-format *reverser-external-format*)) + (bind ((acceptor (make-connection-acceptor "reverser server" + 'reverser-connection-handler :worker-count worker-count :external-format external-format))) - (finishes - (unwind-protect - (progn - (startup-acceptor acceptor :address address :port port) - ;; TODO until epoll based multiplexing is added - (break "Server started, continue to shut it down") - ;;(sockets/cc::busy-loop-hack acceptor) - ) - (shutdown-acceptor acceptor)))) + (unwind-protect + (progn + (startup-acceptor acceptor :address address :port port) + ;; TODO until epoll based multiplexing is added + (break "Server started, continue to shut it down") + ;;(sockets/cc::busy-loop-hack acceptor) + ) + (shutdown-acceptor acceptor))) (values)) (defun/cc reverser-connection-handler (connection) @@ -56,7 +56,7 @@ (format *debug-io* "SERVER: written, looping~%" line)))) (defun start-reverser-client (&key (address +loopback+) (port 4242) (worker-count 0) - (external-format *external-format*)) + (external-format *reverser-external-format*)) (if (zerop worker-count) (with-open-socket (stream :remote-host address :remote-port port :external-format external-format) (loop @@ -69,7 +69,7 @@ (error "TODO not yet"))) #+nil(defun start-reverser-client (&key (address +loopback+) (port 4242) ;; (worker-count 4) - (external-format *external-format*)) + (external-format *reverser-external-format*)) (bind ((multiplexer (make-connection-multiplexer "reverser client")) (connection (make-client-connection address :port port :external-format external-format -- 2.11.4.GIT