| Message ID | 1603352029-11446-1-git-send-email-xuyang2018.jy@cn.fujitsu.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] Remove ftime and sys/timeb.h | expand |
Yang Xu <xuyang2018.jy@cn.fujitsu.com> wrote: > The two case uses ftime to get the current milliseconds and it was > used to generate random value. Using gettimeofday() to get the microseconds > can reach the same aim. > > This also fixes the travis build error[1] on Fedora:Rawhide because the <sys/timeb.h> > has been deprecated[2]. > > [1] https://travis-ci.org/github/linux-test-project/ltp/jobs/737698948 > [2] https://www.spinics.net/lists/fedora-devel/msg279545.html > > Reviewed-by: Li Wang <liwang@redhat.com> > Acked-by: Jan Stancek <jstancek@redhat.com> > Acked-by: Xiao Yang <yangx.jy@cn.fujitsu.com> > Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com> Pushed, thanks!
Hi all, > Yang Xu <xuyang2018.jy@cn.fujitsu.com> wrote: > > The two case uses ftime to get the current milliseconds and it was > > used to generate random value. Using gettimeofday() to get the microseconds > > can reach the same aim. > > This also fixes the travis build error[1] on Fedora:Rawhide because the <sys/timeb.h> > > has been deprecated[2]. > > [1] https://travis-ci.org/github/linux-test-project/ltp/jobs/737698948 > > [2] https://www.spinics.net/lists/fedora-devel/msg279545.html > > Reviewed-by: Li Wang <liwang@redhat.com> > > Acked-by: Jan Stancek <jstancek@redhat.com> > > Acked-by: Xiao Yang <yangx.jy@cn.fujitsu.com> > > Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com> > Pushed, thanks! Thanks for handling these! Kind regards, Petr
diff --git a/testcases/kernel/mem/hugetlb/lib/hugetlb.c b/testcases/kernel/mem/hugetlb/lib/hugetlb.c index 4bb2d500e..1204f21d2 100644 --- a/testcases/kernel/mem/hugetlb/lib/hugetlb.c +++ b/testcases/kernel/mem/hugetlb/lib/hugetlb.c @@ -35,7 +35,7 @@ #include <sys/types.h> #include <sys/ipc.h> #include <sys/shm.h> -#include <sys/timeb.h> +#include <sys/time.h> #include <pwd.h> #include "hugetlb.h" @@ -52,7 +52,7 @@ int getipckey(void) char *curdir = NULL; size_t size = 0; key_t ipc_key; - struct timeb time_info; + struct timeval time_info; curdir = getcwd(curdir, size); if (curdir == NULL) @@ -67,11 +67,11 @@ int getipckey(void) * project identifier is a "random character" produced by * generating a random number between 0 and 25 and then adding * that to the ascii value of 'a'. The "seed" for the random - * number is the millisecond value that is set in the timeb - * structure after calling ftime(). + * number is the microseconds value that is set in the timeval + * structure after calling gettimeofday(). */ - ftime(&time_info); - srandom((unsigned int)time_info.millitm); + gettimeofday(&time_info, NULL); + srandom((unsigned int)time_info.tv_usec); ipc_key = ftok(curdir, ascii_a + random() % 26); if (ipc_key == -1) diff --git a/testcases/kernel/sched/tool/trace_sched.c b/testcases/kernel/sched/tool/trace_sched.c index 71caf239a..85c4b23ad 100644 --- a/testcases/kernel/sched/tool/trace_sched.c +++ b/testcases/kernel/sched/tool/trace_sched.c @@ -52,7 +52,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/wait.h> -#include <sys/timeb.h> +#include <sys/time.h> #include <unistd.h> #include <string.h> @@ -199,7 +199,7 @@ void *thread_func(void *args) static int sched_policy; /* scheduling policy as set by user/default */ struct sched_param ssp; /* set schedule priority. */ struct sched_param gsp; /* gsp schedule priority. */ - struct timeb tptr; /* tptr.millitm will be used to seed srand. */ + struct timeval tptr; /* tptr.tv_usec will be used to seed srand. */ thread_sched_t *locargptr = /* local ptr to the arguments. */ (thread_sched_t *) args; @@ -215,8 +215,8 @@ void *thread_func(void *args) ssp.sched_priority = 0; else { /* Set a random value between max_priority and min_priority */ - ftime(&tptr); - srand((tptr.millitm) % 1000); + gettimeofday(&tptr, NULL); + srand((unsigned int)tptr.tv_usec); set_priority = (min_priority + (int)((float)max_priority * rand() / (RAND_MAX + 1.0)));