diff options
| author | Clark Williams <williams@redhat.com> | 2012-03-23 09:34:30 -0500 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-03-23 09:34:30 -0500 |
| commit | 95f284274540252a8ca6b1c58816f82aa956c0d0 (patch) | |
| tree | 46f0a3154510c7544cf3bf3b7c5b7a208404dea1 | |
| parent | 192a3adcd407fd0f6928333de6d4dd947796410a (diff) | |
| download | cyclictest-95f284274540252a8ca6b1c58816f82aa956c0d0.tar.gz | |
Revert "cyclictest problem/bug as non-root"
This reverts commit 64e635bc513a3a114729f86de7a87780b2737605.
moving to the check-return-and-exit strategy
Signed-off-by: Clark Williams <williams@redhat.com>
| -rw-r--r-- | src/cyclictest/cyclictest.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c index 6a61a9c..c0cde4a 100644 --- a/src/cyclictest/cyclictest.c +++ b/src/cyclictest/cyclictest.c @@ -33,7 +33,6 @@ #include <sys/time.h> #include <sys/utsname.h> #include <sys/mman.h> -#include <sys/resource.h> #include "rt_numa.h" #include "rt-utils.h" @@ -643,10 +642,7 @@ void *timerthread(void *param) memset(&schedp, 0, sizeof(schedp)); schedp.sched_priority = par->prio; - if(sched_setscheduler(0, par->policy, &schedp) == -1){ - fprintf(stderr,"sched_setscheduler prio %d failed\n",par->prio); - par->prio=0; - } + sched_setscheduler(0, par->policy, &schedp); /* Get current time */ clock_gettime(par->clock, &now); @@ -949,7 +945,6 @@ static void process_options (int argc, char *argv[]) { int error = 0; int max_cpus = sysconf(_SC_NPROCESSORS_CONF); - struct rlimit rlim; for (;;) { int option_index = 0; @@ -1160,15 +1155,6 @@ static void process_options (int argc, char *argv[]) policy = SCHED_FIFO; } - /* check against rlimit see /etc/security/limits.conf */ - getrlimit(RLIMIT_RTPRIO, &rlim); - if ( priority > rlim.rlim_max){ - fprintf(stderr, "defaulting realtime priority to %d\n", - (int) rlim.rlim_max); - priority = rlim.rlim_max; - } - - if ((policy == SCHED_FIFO || policy == SCHED_RR) && priority == 0) { fprintf(stderr, "defaulting realtime priority to %d\n", num_threads+1); |