Commit 6a217ed6 authored by Simon Marlow's avatar Simon Marlow Committed by pcapriotti
Browse files

Refer to Control.Concurrent instead of GHC.Conc

Modified version of a patch by shelarcy <shelarcy@gmail.com>

MERGED from commit 7d7809de
parent 83c23b58
...@@ -2114,7 +2114,7 @@ f "2" = 2 ...@@ -2114,7 +2114,7 @@ f "2" = 2
<para>There are two ways to run a program on multiple <para>There are two ways to run a program on multiple
processors: processors:
call <literal>GHC.Conc.setNumCapabilities</literal> from your call <literal>Control.Concurrent.setNumCapabilities</literal> from your
program, or use the RTS <option>-N</option> option.</para> program, or use the RTS <option>-N</option> option.</para>
<variablelist> <variablelist>
...@@ -2150,13 +2150,13 @@ f "2" = 2 ...@@ -2150,13 +2150,13 @@ f "2" = 2
<para>The current value of the <option>-N</option> option <para>The current value of the <option>-N</option> option
is available to the Haskell program is available to the Haskell program
via <literal>GHC.Conc.getNumCapabilities</literal>, and via <literal>Control.Concurrent.getNumCapabilities</literal>, and
it may be changed while the program is running by it may be changed while the program is running by
calling <literal>GHC.Conc.setNumCapabilities</literal>. calling <literal>Control.Concurrent.setNumCapabilities</literal>.
Note: in the current implementation, Note: in the current implementation,
the <option>-N</option> value may only the <option>-N</option> value may only
be <emphasis>increased</emphasis>, not decreased, by be <emphasis>increased</emphasis>, not decreased, by
calling <literal>GHC.Conc.setNumCapabilities</literal>.</para> calling <literal>Control.Concurrent.setNumCapabilities</literal>.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
...@@ -2192,7 +2192,7 @@ f "2" = 2 ...@@ -2192,7 +2192,7 @@ f "2" = 2
<para> <para>
This option is probably only of use for concurrent This option is probably only of use for concurrent
programs that explicitly schedule threads onto CPUs programs that explicitly schedule threads onto CPUs
with <literal>GHC.Conc.forkOnIO</literal>. with <literal>Control.Concurrent.forkOn</literal>.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment