[nio-cvs] r49 - in branches/home/psmith/restructure: . src/compat src/io src/protocol/yarpc src/statemachine src/utils
psmith at common-lisp.net
psmith at common-lisp.net
Mon Jan 22 04:12:44 UTC 2007
Author: psmith
Date: Sun Jan 21 23:12:43 2007
New Revision: 49
Added:
branches/home/psmith/restructure/src/utils/nio-utils-package.lisp
- copied, changed from r48, branches/home/psmith/restructure/src/compat/nio-compat-package.lisp
branches/home/psmith/restructure/src/utils/nio-utils.asd
- copied, changed from r44, branches/home/psmith/restructure/src/compat/nio-compat.asd
branches/home/psmith/restructure/src/utils/utils.lisp
- copied, changed from r48, branches/home/psmith/restructure/src/compat/utils.lisp
Removed:
branches/home/psmith/restructure/src/compat/utils.lisp
Modified:
branches/home/psmith/restructure/run-yarpc-client.lisp
branches/home/psmith/restructure/src/compat/nio-compat-package.lisp
branches/home/psmith/restructure/src/compat/nio-compat.asd
branches/home/psmith/restructure/src/io/nio-package.lisp
branches/home/psmith/restructure/src/io/nio.asd
branches/home/psmith/restructure/src/protocol/yarpc/nio-yarpc-package.lisp
branches/home/psmith/restructure/src/statemachine/nio-sm-package.lisp
branches/home/psmith/restructure/src/statemachine/nio-sm.asd
Log:
Moved utils to own package
Modified: branches/home/psmith/restructure/run-yarpc-client.lisp
==============================================================================
--- branches/home/psmith/restructure/run-yarpc-client.lisp (original)
+++ branches/home/psmith/restructure/run-yarpc-client.lisp Sun Jan 21 23:12:43 2007
@@ -6,7 +6,7 @@
(sb-thread:make-thread #'(lambda()(nio:start-server 'identity 'identity nil :host "127.0.0.1" :port 9897)) :name "nio-server")
(sleep 4)
(let ((sm (nio:add-connection "127.0.0.1" 16323 'nio-yarpc:yarpc-client-state-machine)))
- (format-log t "toplevel adding conn ~A~%" sm)
+ (nio-utils:format-log t "toplevel adding conn ~A~%" sm)
(loop
- (format-log t "Toplevel Submitting job~%" )
- (format-log t "Result of remote-execute ~A~%" (nio-yarpc:remote-execute sm "(nio-yarpc:test-rpc-list)"))))
+ (nio-utils:format-log t "Toplevel Submitting job~%" )
+ (nio-utils:format-log t "Result of remote-execute ~A~%" (nio-yarpc:remote-execute sm "(nio-yarpc:test-rpc-list)"))))
Modified: branches/home/psmith/restructure/src/compat/nio-compat-package.lisp
==============================================================================
--- branches/home/psmith/restructure/src/compat/nio-compat-package.lisp (original)
+++ branches/home/psmith/restructure/src/compat/nio-compat-package.lisp Sun Jan 21 23:12:43 2007
@@ -33,7 +33,4 @@
;;concurrent-queue
concurrent-queue add take
-
- ;;utils
- format-log
))
Modified: branches/home/psmith/restructure/src/compat/nio-compat.asd
==============================================================================
--- branches/home/psmith/restructure/src/compat/nio-compat.asd (original)
+++ branches/home/psmith/restructure/src/compat/nio-compat.asd Sun Jan 21 23:12:43 2007
@@ -7,7 +7,6 @@
:components ((:file "nio-compat-package")
(:file "errno" :depends-on ("nio-compat-package"))
(:file "concurrent-queue" :depends-on ("nio-compat-package"))
- (:file "utils" :depends-on ("nio-compat-package"))
)
:depends-on ())
Modified: branches/home/psmith/restructure/src/io/nio-package.lisp
==============================================================================
--- branches/home/psmith/restructure/src/io/nio-package.lisp (original)
+++ branches/home/psmith/restructure/src/io/nio-package.lisp Sun Jan 21 23:12:43 2007
@@ -24,7 +24,7 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|#
-(defpackage :nio (:use :cl :cffi :event-notification :nio-buffer :nio-compat)
+(defpackage :nio (:use :cl :cffi :nio-utils :event-notification :nio-buffer :nio-compat)
(:export
Modified: branches/home/psmith/restructure/src/io/nio.asd
==============================================================================
--- branches/home/psmith/restructure/src/io/nio.asd (original)
+++ branches/home/psmith/restructure/src/io/nio.asd Sun Jan 21 23:12:43 2007
@@ -12,5 +12,5 @@
(:file "nio-server" :depends-on ("async-socket"))
)
- :depends-on (:cffi :event-notification :nio-buffer :nio-compat))
+ :depends-on (:cffi :event-notification :nio-buffer :nio-compat :nio-utils))
Modified: branches/home/psmith/restructure/src/protocol/yarpc/nio-yarpc-package.lisp
==============================================================================
--- branches/home/psmith/restructure/src/protocol/yarpc/nio-yarpc-package.lisp (original)
+++ branches/home/psmith/restructure/src/protocol/yarpc/nio-yarpc-package.lisp Sun Jan 21 23:12:43 2007
@@ -24,7 +24,7 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|#
-(defpackage :nio-yarpc (:use :cl :nio :nio-sm :nio-buffer)
+(defpackage :nio-yarpc (:use :cl :nio :nio-sm :nio-buffer :nio-utils)
(:export
Modified: branches/home/psmith/restructure/src/statemachine/nio-sm-package.lisp
==============================================================================
--- branches/home/psmith/restructure/src/statemachine/nio-sm-package.lisp (original)
+++ branches/home/psmith/restructure/src/statemachine/nio-sm-package.lisp Sun Jan 21 23:12:43 2007
@@ -24,7 +24,7 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|#
-(defpackage :nio-sm (:use :cl :nio :nio-buffer)
+(defpackage :nio-sm (:use :cl :nio :nio-buffer :nio-utils)
(:export
Modified: branches/home/psmith/restructure/src/statemachine/nio-sm.asd
==============================================================================
--- branches/home/psmith/restructure/src/statemachine/nio-sm.asd (original)
+++ branches/home/psmith/restructure/src/statemachine/nio-sm.asd Sun Jan 21 23:12:43 2007
@@ -8,4 +8,4 @@
(:file "state-machine" :depends-on ("nio-sm-package"))
)
- :depends-on (:nio))
\ No newline at end of file
+ :depends-on (:nio :nio-utils))
\ No newline at end of file
Copied: branches/home/psmith/restructure/src/utils/nio-utils-package.lisp (from r48, branches/home/psmith/restructure/src/compat/nio-compat-package.lisp)
==============================================================================
--- branches/home/psmith/restructure/src/compat/nio-compat-package.lisp (original)
+++ branches/home/psmith/restructure/src/utils/nio-utils-package.lisp Sun Jan 21 23:12:43 2007
@@ -1,5 +1,5 @@
#|
-Copyright (c) 2006 Risto Laakso
+Copyright (c) 2007
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -24,16 +24,10 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|#
-(defpackage :nio-compat (:use :cl)
+(defpackage :nio-utils (:use :cl)
(:export
- ;; errno.lisp
- get-errno +ERRNO_EAGAIN+
-
- ;;concurrent-queue
- concurrent-queue add take
-
;;utils
format-log
))
Copied: branches/home/psmith/restructure/src/utils/nio-utils.asd (from r44, branches/home/psmith/restructure/src/compat/nio-compat.asd)
==============================================================================
--- branches/home/psmith/restructure/src/compat/nio-compat.asd (original)
+++ branches/home/psmith/restructure/src/utils/nio-utils.asd Sun Jan 21 23:12:43 2007
@@ -2,12 +2,10 @@
(in-package :asdf)
-(defsystem :nio-compat
+(defsystem :nio-utils
- :components ((:file "nio-compat-package")
- (:file "errno" :depends-on ("nio-compat-package"))
- (:file "concurrent-queue" :depends-on ("nio-compat-package"))
- (:file "utils" :depends-on ("nio-compat-package"))
+ :components ((:file "nio-utils-package")
+ (:file "utils" :depends-on ("nio-utils-package"))
)
:depends-on ())
Copied: branches/home/psmith/restructure/src/utils/utils.lisp (from r48, branches/home/psmith/restructure/src/compat/utils.lisp)
==============================================================================
--- branches/home/psmith/restructure/src/compat/utils.lisp (original)
+++ branches/home/psmith/restructure/src/utils/utils.lisp Sun Jan 21 23:12:43 2007
@@ -25,7 +25,7 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|#
-(in-package :nio-compat)
+(in-package :nio-utils)
(declaim (optimize (debug 3) (speed 3) (space 0)))
More information about the Nio-cvs
mailing list