From feb8c6149a8a74b9094493078dd7667287eacc11 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Tue, 8 Nov 2011 11:54:54 -0800 Subject: [PATCH] io.backend: start signal thread after io-backend The c-io-backend can't handle input-ports and raises an error during bootstrap. --- basis/io/backend/unix/linux/linux.factor | 4 +++- basis/io/backend/unix/macosx/macosx.factor | 4 +++- basis/io/backend/unix/unix.factor | 4 +--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/basis/io/backend/unix/linux/linux.factor b/basis/io/backend/unix/linux/linux.factor index 54b20d1b44..fa0ab2054f 100644 --- a/basis/io/backend/unix/linux/linux.factor +++ b/basis/io/backend/unix/linux/linux.factor @@ -2,10 +2,12 @@ ! See http://factorcode.org/license.txt for BSD license. USING: kernel system namespaces io.files.unix io.backend io.backend.unix io.backend.unix.multiplexers -io.backend.unix.multiplexers.epoll ; +io.backend.unix.multiplexers.epoll init ; IN: io.backend.unix.linux M: linux init-io ( -- ) mx set-global ; linux set-io-backend + +[ start-signal-pipe-thread ] "io.backend.unix:signal-pipe-thread" add-startup-hook diff --git a/basis/io/backend/unix/macosx/macosx.factor b/basis/io/backend/unix/macosx/macosx.factor index d348c49ce1..6149ce7928 100644 --- a/basis/io/backend/unix/macosx/macosx.factor +++ b/basis/io/backend/unix/macosx/macosx.factor @@ -3,7 +3,7 @@ USING: io.backend system namespaces io.backend.unix.multiplexers io.backend.unix.multiplexers.run-loop kernel accessors assocs continuations unix io.backend.unix -io.backend.unix.multiplexers.kqueue io.files.unix ; +io.backend.unix.multiplexers.kqueue io.files.unix init ; IN: io.backend.unix.macosx SINGLETON: macosx-kqueue @@ -15,3 +15,5 @@ M: macosx init-io ( -- ) mx set-global ; macosx set-io-backend + +[ start-signal-pipe-thread ] "io.backend.unix:signal-pipe-thread" add-startup-hook diff --git a/basis/io/backend/unix/unix.factor b/basis/io/backend/unix/unix.factor index 8c01479574..9f5c4328d8 100755 --- a/basis/io/backend/unix/unix.factor +++ b/basis/io/backend/unix/unix.factor @@ -7,7 +7,7 @@ io.encodings math.parser continuations system libc namespaces make io.timeouts io.encodings.utf8 destructors destructors.private accessors summary combinators locals unix.time unix.types fry io.backend.unix.multiplexers -classes.struct init ; +classes.struct ; QUALIFIED: io IN: io.backend.unix @@ -226,5 +226,3 @@ TUPLE: mx-port < port mx ; :: ?flag ( n mask symbol -- n ) n mask bitand 0 > [ symbol , ] when n ; - -[ start-signal-pipe-thread ] "io.backend.unix:signal-pipe-thread" add-startup-hook