From 99b9ab367bc330969fa055e504da1f2652ac4e70 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 24 Mar 2008 18:02:39 -0500 Subject: [PATCH] Move priority code to io.launcher --- extra/io/launcher/launcher-docs.factor | 11 +++++++++++ extra/io/launcher/launcher.factor | 9 ++++++++- extra/io/process/process.factor | 17 ----------------- extra/io/unix/launcher/launcher.factor | 19 +++++++++++++++++-- extra/io/unix/process/process.factor | 19 ------------------- extra/io/windows/process/process.factor | 8 -------- extra/unix/process/process.factor | 5 ++++- 7 files changed, 40 insertions(+), 48 deletions(-) delete mode 100644 extra/io/process/process.factor delete mode 100644 extra/io/unix/process/process.factor delete mode 100644 extra/io/windows/process/process.factor diff --git a/extra/io/launcher/launcher-docs.factor b/extra/io/launcher/launcher-docs.factor index 7fdd22c8a5..640801234b 100755 --- a/extra/io/launcher/launcher-docs.factor +++ b/extra/io/launcher/launcher-docs.factor @@ -33,6 +33,17 @@ $nl { "a file stream or a socket - the stream is connected to the given Factor stream, which cannot be used again from within Factor and must be closed after the process has been started" } } ; +ARTICLE: "io.launcher.priority" "Setting process priority" +"The priority of the child process can be set by storing one of the below symbols in the " { $snippet "priority" } " slot of a " { $link process } " tuple:" +{ $list + { $link +lowest-priority+ } + { $link +low-priority+ } + { $link +normal-priority+ } + { $link +high-priority+ } + { $link +highest-priority+ } +} +"The default value is " { $link f } ", which denotes that the child process should inherit the current process priority." ; + HELP: +closed+ { $description "Possible value for the " { $snippet "stdin" } ", " { $snippet "stdout" } ", and " { $snippet "stderr" } " slots of a " { $link process } "." } ; diff --git a/extra/io/launcher/launcher.factor b/extra/io/launcher/launcher.factor index 9c7d64934e..ac8dc15661 100755 --- a/extra/io/launcher/launcher.factor +++ b/extra/io/launcher/launcher.factor @@ -6,7 +6,6 @@ init threads continuations math io.encodings io.streams.duplex io.nonblocking accessors ; IN: io.launcher - TUPLE: process command @@ -19,6 +18,8 @@ stdin stdout stderr +priority + timeout handle status @@ -32,6 +33,12 @@ SYMBOL: +prepend-environment+ SYMBOL: +replace-environment+ SYMBOL: +append-environment+ +SYMBOL: +lowest-priority+ +SYMBOL: +low-priority+ +SYMBOL: +normal-priority+ +SYMBOL: +high-priority+ +SYMBOL: +highest-priority+ + : ( -- process ) process construct-empty H{ } clone >>environment diff --git a/extra/io/process/process.factor b/extra/io/process/process.factor deleted file mode 100644 index 8a7c5b1a11..0000000000 --- a/extra/io/process/process.factor +++ /dev/null @@ -1,17 +0,0 @@ -USING: io.backend kernel ; -IN: io.priority - -SYMBOL: +lowest-priority+ -SYMBOL: +low-priority+ -SYMBOL: +normal-priority+ -SYMBOL: +high-priority+ -SYMBOL: +highest-priority+ - -HOOK: current-priority io-backend ( -- symbol ) -HOOK: set-current-priority io-backend ( symbol -- ) -HOOK: priority-values ( -- assoc ) - -: lookup-priority ( symbol -- n ) - priority-values at ; - -HOOK: get-process-list io-backend ( -- assoc ) diff --git a/extra/io/unix/launcher/launcher.factor b/extra/io/unix/launcher/launcher.factor index 8ed1c957af..e16ecde6fa 100755 --- a/extra/io/unix/launcher/launcher.factor +++ b/extra/io/unix/launcher/launcher.factor @@ -16,6 +16,17 @@ USE: unix : assoc>env ( assoc -- env ) [ "=" swap 3append ] { } assoc>map ; +: setup-priority ( process -- process ) + dup priority>> [ + H{ + { +lowest-priority+ 20 } + { +low-priority+ 10 } + { +normal-priority+ 0 } + { +high-priority+ -10 } + { +highest-priority+ -20 } + } at set-priority + ] when* ; + : redirect-fd ( oldfd fd -- ) 2dup = [ 2drop ] [ dupd dup2 io-error close ] if ; @@ -47,11 +58,15 @@ USE: unix : setup-redirection ( process -- process ) dup stdin>> ?closed read-flags 0 redirect dup stdout>> ?closed write-flags 1 redirect - dup stderr>> dup +stdout+ eq? - [ drop 1 2 dup2 io-error ] [ ?closed write-flags 2 redirect ] if ; + dup stderr>> dup +stdout+ eq? [ + drop 1 2 dup2 io-error + ] [ + ?closed write-flags 2 redirect + ] if ; : spawn-process ( process -- * ) [ + setup-priority setup-redirection dup pass-environment? [ dup get-environment set-os-envs diff --git a/extra/io/unix/process/process.factor b/extra/io/unix/process/process.factor deleted file mode 100644 index 00df6b6f52..0000000000 --- a/extra/io/unix/process/process.factor +++ /dev/null @@ -1,19 +0,0 @@ -USING: alien.syntax kernel io.process io.unix.backend -unix ; -IN: io.unix.process - -M: unix-io current-priority ( -- n ) - clear_err_no - 0 0 getpriority dup -1 = [ check-errno ] when ; - -M: unix-io set-current-priority ( n -- ) - 0 0 rot setpriority io-error ; - -M: unix-io priority-values ( -- assoc ) - { - { +lowest-priority+ 20 } - { +low-priority+ 10 } - { +normal-priority+ 0 } - { +high-priority+ -10 } - { +highest-priority+ -20 } - } ; diff --git a/extra/io/windows/process/process.factor b/extra/io/windows/process/process.factor deleted file mode 100644 index f0ca04fd8a..0000000000 --- a/extra/io/windows/process/process.factor +++ /dev/null @@ -1,8 +0,0 @@ -USING: kernel ; -IN: io.windows.process - -M: windows-io current-priority ( -- n ) - ; - -M: windows-io set-current-priority ( n -- ) - ; diff --git a/extra/unix/process/process.factor b/extra/unix/process/process.factor index 6fdc8e358b..c9612c4384 100755 --- a/extra/unix/process/process.factor +++ b/extra/unix/process/process.factor @@ -33,4 +33,7 @@ IN: unix.process fork dup io-error dup zero? -roll swap curry if ; inline : wait-for-pid ( pid -- status ) - 0 [ 0 waitpid drop ] keep *int WEXITSTATUS ; \ No newline at end of file + 0 [ 0 waitpid drop ] keep *int WEXITSTATUS ; + +: set-priority ( n -- ) + 0 0 rot setpriority io-error ; \ No newline at end of file