Commit a6969bf9 authored by Simon Marlow's avatar Simon Marlow
Browse files

setNumCapabilities: don't barf() if it isn't supported, just print an error

parent 77e78896
......@@ -61,10 +61,6 @@ extern Capability MainCapability;
// Change the number of capabilities (only supports increasing the
// current value at the moment).
//
#if defined(THREADED_RTS)
extern void setNumCapabilities (nat new);
#else
extern void setNumCapabilities (nat new) GNU_ATTRIBUTE(__noreturn__);
#endif
#endif /* RTS_THREADS_H */
......@@ -1924,9 +1924,15 @@ void
setNumCapabilities (nat new_n_capabilities USED_IF_THREADS)
{
#if !defined(THREADED_RTS)
barf("setNumCapabilities: not supported in the non-threaded RTS");
if (new_n_capabilities != 1) {
errorBelch("setNumCapabilities: not supported in the non-threaded RTS");
}
return;
#elif defined(NOSMP)
if (new_n_capabilities != 1) {
errorBelch("setNumCapabilities: not supported on this platform");
}
return;
#else
Task *task;
Capability *cap;
......
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