Menu
▾
▴
Re: [LTP] [PATCH] Fix & Integrate Hyperthreading tests to default LTP run
|
From: Subrata M. <su...@li...> - 2008-12-19 08:50:07
|
On Thu, 2008-12-18 at 15:35 +0530, Subrata Modak wrote:
> Resending as i committed mistake in the mail-is ;-)
>
> Regards--
> Subrata
>
> -------- Forwarded Message --------
> From: Subrata Modak <su...@li...>
> Reply-To: su...@li...
> To: ltp-list <ltp...@li...>
> Subject: [PATCH] Fix & Integrate Hyperthreading tests to default LTP run
> Date: Thu, 18 Dec 2008 14:56:06 +0530
>
> Hi,
>
> The attached patch fixes and then integrates the Hyperthreading tests to
> default LTP run.
>
> Signed-Off-By: Subrata Modak <su...@li...>,
Merged This.
Regards--
Subrata
> --
> --- ltp-intermediate-20081218/runltp.orig 2008-12-18 14:40:33.000000000 +0530
> +++ ltp-intermediate-20081218/runltp 2008-12-18 14:24:53.000000000 +0530
> @@ -539,7 +539,8 @@ main()
> ${LTPROOT}/runtest/power_management_tests \
> ${LTPROOT}/runtest/numa \
> ${LTPROOT}/runtest/hugetlb \
> - ${LTPROOT}/runtest/commands
> + ${LTPROOT}/runtest/commands \
> + ${LTPROOT}/runtest/hyperthreading
> do
> [ -e "$SCENFILES" ] || \
> {
> diff -uprN ltp-intermediate-20081218/testcases/kernel/sched.orig/hyperthreading/ht_affinity/HTaffinity.c ltp-intermediate-20081218/testcases/kernel/sched/hyperthreading/ht_affinity/HTaffinity.c
> --- ltp-intermediate-20081218/testcases/kernel/sched.orig/hyperthreading/ht_affinity/HTaffinity.c 2008-12-18 14:41:43.000000000 +0530
> +++ ltp-intermediate-20081218/testcases/kernel/sched/hyperthreading/ht_affinity/HTaffinity.c 2008-12-18 14:05:26.000000000 +0530
> @@ -47,7 +47,7 @@ len - length in bytes of the bitmask poi
>
> int HT_SetAffinity()
> {
> - unsigned long mask;
> + unsigned mask;
> pid_t pid;
> int result=1;
> int cpu_count, i, j, k, cpuid;
> diff -uprN ltp-intermediate-20081218/testcases/kernel/sched.orig/hyperthreading/ht_affinity/HTutils.c ltp-intermediate-20081218/testcases/kernel/sched/hyperthreading/ht_affinity/HTutils.c
> --- ltp-intermediate-20081218/testcases/kernel/sched.orig/hyperthreading/ht_affinity/HTutils.c 2008-12-18 14:41:43.000000000 +0530
> +++ ltp-intermediate-20081218/testcases/kernel/sched/hyperthreading/ht_affinity/HTutils.c 2008-12-18 14:06:43.000000000 +0530
> @@ -21,7 +21,6 @@ char buffer[BUFF_SIZE];
> int is_cmdline_para(const char *para)
> {
> FILE *fp;
> - int i;
>
> if((fp=fopen("/proc/cmdline","r"))!=NULL && para!=NULL)
> {
> @@ -42,7 +41,6 @@ int is_cmdline_para(const char *para)
> int is_ht_kernel()
> {
> FILE *fp;
> - int i;
>
> if((fp=fopen("/proc/cpuinfo","r"))!=NULL)
> {
> diff -uprN ltp-intermediate-20081218/testcases/kernel/sched.orig/hyperthreading/ht_affinity/Makefile ltp-intermediate-20081218/testcases/kernel/sched/hyperthreading/ht_affinity/Makefile
> --- ltp-intermediate-20081218/testcases/kernel/sched.orig/hyperthreading/ht_affinity/Makefile 2008-12-18 14:41:43.000000000 +0530
> +++ ltp-intermediate-20081218/testcases/kernel/sched/hyperthreading/ht_affinity/Makefile 2008-12-18 14:20:44.000000000 +0530
> @@ -1,16 +1,18 @@
> # Check that the definitions below are correct for your system
>
> CFLAGS += -I../../../../../include -Wall
> -LDLFLAGS += -L../../../../../lib
> -LDLIBS += -lltp
> +LOADLIBES += -L../../../../../lib -lltp
> TARGETS := ht_affinity
>
> all: $(TARGETS)
>
> -ht_affinity: HTaffinity.o HTutils.o
> +#ht_affinity: HTaffinity.o HTutils.o
> +# gcc -o ht_affinity HTaffinity.o HTutils.o $(CFLAGS) $(LOADLIBES)
> +ht_affinity:
> + gcc -o ht_affinity HTaffinity.c HTutils.c $(CFLAGS) $(LOADLIBES)
>
> install:
> - @set -e; for i in $(TARGETS) ; do ln -f $$i ../../../bin/$$i ; done
> + @set -e; for i in $(TARGETS) ; do ln -f $$i ../../../../bin/$$i ; done
>
> clean:
> - rm -f $(TARGETS) *.o
> + rm -f $(TARGETS)
> diff -uprN ltp-intermediate-20081218/testcases/kernel/sched.orig/hyperthreading/ht_enabled/Makefile ltp-intermediate-20081218/testcases/kernel/sched/hyperthreading/ht_enabled/Makefile
> --- ltp-intermediate-20081218/testcases/kernel/sched.orig/hyperthreading/ht_enabled/Makefile 2008-12-18 14:41:42.000000000 +0530
> +++ ltp-intermediate-20081218/testcases/kernel/sched/hyperthreading/ht_enabled/Makefile 2008-12-18 14:20:58.000000000 +0530
> @@ -1,8 +1,8 @@
> # Check that the definitions below are correct for your system
>
> -CFLAGS+= -I../../../../../include
> +CFLAGS += -I../../../../../include
> LOADLIBES+= -L../../../../../lib -lltp
> -TARGETS = ht_enabled
> +TARGETS := ht_enabled
>
> all: $(TARGETS)
>
> @@ -10,7 +10,7 @@ ht_enabled:
> gcc -o ht_enabled HTenabled.c HTutils.c $(CFLAGS) $(LOADLIBES)
>
> install:
> - @set -e; for i in $(TARGETS) ; do ln -f $$i ../../../bin/$$i ; done
> + @set -e; for i in $(TARGETS) ; do ln -f $$i ../../../../bin/$$i ; done
>
> clean:
> rm -f $(TARGETS)
> diff -uprN ltp-intermediate-20081218/testcases/kernel/sched.orig/hyperthreading/ht_interrupt/Makefile ltp-intermediate-20081218/testcases/kernel/sched/hyperthreading/ht_interrupt/Makefile
> --- ltp-intermediate-20081218/testcases/kernel/sched.orig/hyperthreading/ht_interrupt/Makefile 2008-12-18 14:41:43.000000000 +0530
> +++ ltp-intermediate-20081218/testcases/kernel/sched/hyperthreading/ht_interrupt/Makefile 2008-12-18 14:21:10.000000000 +0530
> @@ -10,7 +10,7 @@ ht_interrupt:
> gcc -o ht_interrupt HTinterrupt.c HTutils.c $(CFLAGS) $(LOADLIBES)
>
> install:
> - @set -e; for i in $(TARGETS) ; do ln -f $$i ../../../bin/$$i ; done
> + @set -e; for i in $(TARGETS) ; do ln -f $$i ../../../../bin/$$i ; done
>
> clean:
> rm -f $(TARGETS)
> diff -uprN ltp-intermediate-20081218/testcases/kernel/sched.orig/Makefile ltp-intermediate-20081218/testcases/kernel/sched/Makefile
> --- ltp-intermediate-20081218/testcases/kernel/sched.orig/Makefile 2008-12-18 14:41:40.000000000 +0530
> +++ ltp-intermediate-20081218/testcases/kernel/sched/Makefile 2008-12-18 14:09:10.000000000 +0530
> @@ -1,4 +1,4 @@
> -SUBDIRS = clisrv nptl pthreads process_stress sched_stress tool cfs-scheduler
> +SUBDIRS = cfs-scheduler clisrv hyperthreading nptl process_stress pthreads sched_stress tool
>
> all:
> @set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i ; done
>
>
>
> Regards--
> Subrata
>
> ------------------------------------------------------------------------------
> SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
> The future of the web can't happen without you. Join us at MIX09 to help
> pave the way to the Next Web now. Learn more and register at
> http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
> _______________________________________________ Ltp-list mailing list Ltp...@li... https://lists.sourceforge.net/lists/listinfo/ltp-list
|