OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

os-unix.c: Include <sched.h>. 

* runtime/os-unix.c [__sun__ && __svr4__]: Include <sched.h>.
	(__cilkrts_hardware_cpu_count) [__sun__ && __svr4__]: Use sysconf.
	(__cilkrts_yield) [__sun__ && __svr4__]: Use sched_yield.

From-SVN: r204347
This commit is contained in:
Rainer Orth 2013-11-04 10:13:55 +00:00 committed by Rainer Orth
parent 7405bd1806
commit 2546da0b1d
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcilkrts/ChangeLog
View File

@ -1,3 +1,9 @@
2013-11-04 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* runtime/os-unix.c [__sun__ && __svr4__]: Include <sched.h>.
(__cilkrts_hardware_cpu_count) [__sun__ && __svr4__]: Use sysconf.
(__cilkrts_yield) [__sun__ && __svr4__]: Use sched_yield.
2013-10-31 Balaji V. Iyer <balaji.v.iyer@intel.com>
PR other/58925

11
libcilkrts/runtime/os-unix.c
View File

@ -62,6 +62,9 @@
# include <vxWorks.h>
# include <vxCpuLib.h>
# include <taskLib.h>
// Solaris
#elif defined __sun__ && defined __svr4__
# include <sched.h>
#else
# error "Unsupported OS"
#endif
@ -346,7 +349,7 @@ static int linux_get_affinity_count (int tid)
COMMON_SYSDEP int __cilkrts_hardware_cpu_count(void)
{
#if defined ANDROID
#if defined ANDROID || (defined(__sun__) && defined(__svr4__))
return sysconf (_SC_NPROCESSORS_ONLN);
#elif defined __MIC__
/// HACK: Usually, the 3rd and 4th hyperthreads are not beneficial
@ -401,9 +404,9 @@ COMMON_SYSDEP void __cilkrts_yield(void)
// giving up the processor and latency starting up when work becomes
// available
_mm_delay_32(1024);
#elif defined(ANDROID)
// On Android, call sched_yield to yield quantum. I'm not sure why we
// don't do this on Linux also.
#elif defined(ANDROID) || (defined(__sun__) && defined(__svr4__))
// On Android and Solaris, call sched_yield to yield quantum. I'm not
// sure why we don't do this on Linux also.
sched_yield();
#else
// On Linux, call pthread_yield (which in turn will call sched_yield)