From: Garrett C. <yab...@us...> - 2009-07-29 15:26:59
|
Update of /cvsroot/ltp/ltp/testcases/kernel/syscalls/mbind In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23267/testcases/kernel/syscalls/mbind Modified Files: Tag: makefile_infra_rework mbind01.c Makefile Log Message: Repeat work last night on NUMA support for mbind. This should be the last item that needs NUMA fixing... Index: Makefile =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/mbind/Makefile,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Makefile 19 Jul 2009 18:24:01 -0000 1.1.2.1 --- Makefile 29 Jul 2009 15:26:49 -0000 1.1.2.2 *************** *** 21,28 **** include $(top_srcdir)/include/mk/testcases.mk ! ifeq ($(HAS_NUMA),yes) ! $(eval $(generic_leaf_target)) ! else ! all clean install: ! @echo "Numa support disabled; skipping." endif --- 21,34 ---- include $(top_srcdir)/include/mk/testcases.mk ! # ! # gcc complains about unused functions / variables when HAS_NUMA_H isn't ! # defined, so let's just skip the warning. It's nothing more than a few extra ! # variables and functions allocated on the stack, so meh... no harm, no foul. ! # ! ifeq ($(NUMA_LIBS),) ! CPPFLAGS += -Wno-unused endif + + CPPFLAGS += -I$(srcdir)/../utils/ + + $(eval $(generic_leaf_target)) Index: mbind01.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/mbind/mbind01.c,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** mbind01.c 15 Jun 2009 18:36:14 -0000 1.1 --- mbind01.c 29 Jul 2009 15:26:48 -0000 1.1.2.1 *************** *** 56,60 **** #include <stdio.h> #include <unistd.h> ! #include "numaif.h" #include "include_j_h.h" --- 56,62 ---- #include <stdio.h> #include <unistd.h> ! #if HAS_NUMAIF_H ! #include <numaif.h> ! #endif #include "include_j_h.h" *************** *** 175,178 **** --- 177,181 ---- */ + #if HAS_NUMA_H static struct test_case tcase[] = { { // case00 *************** *** 245,248 **** --- 248,254 ---- }, }; + #else + static struct test_case tcase[] = { }; + #endif #define MEM_LENGTH (4 * 1024 * 1024) *************** *** 256,259 **** --- 262,266 ---- static int do_test(struct test_case *tc) { + #if HAS_NUMA_H int sys_ret; int sys_errno; *************** *** 270,273 **** --- 277,281 ---- nodemask_zero(&getnodemask); + /* * mmap memory *************** *** 321,324 **** --- 329,335 ---- PRINT_RESULT_CMP(0, tc->ret, tc->err, sys_ret, sys_errno, cmp_ok); return result; + #else + return -1; + #endif } *************** *** 341,346 **** int main(int ac, char **av) { - int result = 0; - int lc, i; /* loop counter */ char *msg; /* message returned from parse_opts */ --- 352,355 ---- *************** *** 362,365 **** --- 371,378 ---- progname = (progname ? progname + 1 : av[0]); + #if HAS_NUMA_H + int result = 0; + int lc, i; /* loop counter */ + /* Check looping state if -i option given */ for (lc = 0; TEST_LOOPING(lc); ++lc) { *************** *** 409,415 **** } ! } cleanup(); tst_exit(); } - --- 422,430 ---- } ! } ! #else ! tst_resm(TCONF, "NUMA support not provided."); ! #endif cleanup(); tst_exit(); } |