diff --git a/test/mng_mod/issues/898_928/CT_001.c b/test/mng_mod/issues/898_928/CT_001.c index 9692e6a4..b4356d86 100644 --- a/test/mng_mod/issues/898_928/CT_001.c +++ b/test/mng_mod/issues/898_928/CT_001.c @@ -4,9 +4,9 @@ #include #include #include +#include "util.h" -#define MCK_DIR "/home/satoken/ppos" -static char prefix[256] = MCK_DIR; +static char prefix[256] = QUOTE(MCK_DIR); static char test_name[64] = "CT_001"; @@ -39,8 +39,8 @@ int main(int argc, char** argv) { char fn[256]; char kargs[256]; - int cpus[4] = {6, 7, 8, 9}; - int num_cpus = 4; + int cpus[2] = {1, 2}; + int num_cpus = 2; struct ihk_mem_chunk mem_chunks[4]; int num_mem_chunks; @@ -53,7 +53,7 @@ int main(int argc, char** argv) { status = system(cmd); // ihk_os_destroy_pseudofs - ret_ihklib = ihk_os_destroy_pseudofs(0); + ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; @@ -81,21 +81,21 @@ int main(int argc, char** argv) { ret_ihklib = ihk_os_assign_cpu(0, cpus, num_cpus); //OKNG(ret_ihklib == 0, "ihk_os_assign_cpu\n"); - // reserve mem 128m@0,128m@1 + // reserve mem 128m@0,128m@0 num_mem_chunks = 2; mem_chunks[0].size = 128*1024*1024ULL; mem_chunks[0].numa_node_number = 0; mem_chunks[1].size = 128*1024*1024ULL; - mem_chunks[1].numa_node_number = 1; + mem_chunks[1].numa_node_number = 0; ret_ihklib = ihk_reserve_mem(0, mem_chunks, num_mem_chunks); //OKNG(ret_ihklib == 0, "ihk_reserve_mem (2)\n"); - // assign mem 128m@0,128m@1 + // assign mem 128m@0,128m@0 num_mem_chunks = 2; mem_chunks[0].size = 128*1024*1024ULL; mem_chunks[0].numa_node_number = 0; mem_chunks[1].size = 128*1024*1024ULL; - mem_chunks[1].numa_node_number = 1; + mem_chunks[1].numa_node_number = 0; ret_ihklib = ihk_os_assign_mem(0, mem_chunks, num_mem_chunks); //OKNG(ret_ihklib == 0, "ihk_os_assign_mem (2)\n"); @@ -123,7 +123,7 @@ goto shutdown; usleep(100*1000); // create pseudofs - ret_ihklib = ihk_os_create_pseudofs(0); + ret_ihklib = ihk_os_create_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; @@ -157,7 +157,7 @@ destroy: status = system(cmd); // destroy pseudofs - ret_ihklib = ihk_os_destroy_pseudofs(0); + ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; diff --git a/test/mng_mod/issues/898_928/CT_002.c b/test/mng_mod/issues/898_928/CT_002.c index bdc9292d..06d630b9 100644 --- a/test/mng_mod/issues/898_928/CT_002.c +++ b/test/mng_mod/issues/898_928/CT_002.c @@ -4,9 +4,9 @@ #include #include #include +#include "util.h" -#define MCK_DIR "/home/satoken/ppos" -static char prefix[256] = MCK_DIR; +static char prefix[256] = QUOTE(MCK_DIR); static char test_name[64] = "CT_002"; @@ -39,8 +39,8 @@ int main(int argc, char** argv) { char fn[256]; char kargs[256]; - int cpus[4] = {6, 7, 8, 9}; - int num_cpus = 4; + int cpus[2] = {1, 2}; + int num_cpus = 2; struct ihk_mem_chunk mem_chunks[4]; int num_mem_chunks; @@ -53,7 +53,7 @@ int main(int argc, char** argv) { status = system(cmd); // ihk_os_destroy_pseudofs - ret_ihklib = ihk_os_destroy_pseudofs(0); + ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; @@ -81,21 +81,21 @@ int main(int argc, char** argv) { ret_ihklib = ihk_os_assign_cpu(0, cpus, num_cpus); //OKNG(ret_ihklib == 0, "ihk_os_assign_cpu\n"); - // reserve mem 128m@0,128m@1 + // reserve mem 128m@0,128m@0 num_mem_chunks = 2; mem_chunks[0].size = 128*1024*1024ULL; mem_chunks[0].numa_node_number = 0; mem_chunks[1].size = 128*1024*1024ULL; - mem_chunks[1].numa_node_number = 1; + mem_chunks[1].numa_node_number = 0; ret_ihklib = ihk_reserve_mem(0, mem_chunks, num_mem_chunks); //OKNG(ret_ihklib == 0, "ihk_reserve_mem (2)\n"); - // assign mem 128m@0,128m@1 + // assign mem 128m@0,128m@0 num_mem_chunks = 2; mem_chunks[0].size = 128*1024*1024ULL; mem_chunks[0].numa_node_number = 0; mem_chunks[1].size = 128*1024*1024ULL; - mem_chunks[1].numa_node_number = 1; + mem_chunks[1].numa_node_number = 0; ret_ihklib = ihk_os_assign_mem(0, mem_chunks, num_mem_chunks); //OKNG(ret_ihklib == 0, "ihk_os_assign_mem (2)\n"); @@ -123,7 +123,7 @@ goto destroy; usleep(100*1000); // create pseudofs - ret_ihklib = ihk_os_create_pseudofs(0); + ret_ihklib = ihk_os_create_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; @@ -157,7 +157,7 @@ destroy: status = system(cmd); // destroy pseudofs - ret_ihklib = ihk_os_destroy_pseudofs(0); + ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; diff --git a/test/mng_mod/issues/898_928/CT_003.c b/test/mng_mod/issues/898_928/CT_003.c index 43c653c3..7ec62cfb 100644 --- a/test/mng_mod/issues/898_928/CT_003.c +++ b/test/mng_mod/issues/898_928/CT_003.c @@ -4,9 +4,9 @@ #include #include #include +#include "util.h" -#define MCK_DIR "/home/satoken/ppos" -static char prefix[256] = MCK_DIR; +static char prefix[256] = QUOTE(MCK_DIR); static char test_name[64] = "CT_003"; @@ -39,8 +39,8 @@ int main(int argc, char** argv) { char fn[256]; char kargs[256]; - int cpus[4] = {6, 7, 8, 9}; - int num_cpus = 4; + int cpus[2] = {1, 2}; + int num_cpus = 2; struct ihk_mem_chunk mem_chunks[4]; int num_mem_chunks; @@ -53,7 +53,7 @@ int main(int argc, char** argv) { status = system(cmd); // ihk_os_destroy_pseudofs - ret_ihklib = ihk_os_destroy_pseudofs(0); + ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; @@ -81,21 +81,21 @@ int main(int argc, char** argv) { ret_ihklib = ihk_os_assign_cpu(0, cpus, num_cpus); //OKNG(ret_ihklib == 0, "ihk_os_assign_cpu\n"); - // reserve mem 128m@0,128m@1 + // reserve mem 128m@0,128m@0 num_mem_chunks = 2; mem_chunks[0].size = 128*1024*1024ULL; mem_chunks[0].numa_node_number = 0; mem_chunks[1].size = 128*1024*1024ULL; - mem_chunks[1].numa_node_number = 1; + mem_chunks[1].numa_node_number = 0; ret_ihklib = ihk_reserve_mem(0, mem_chunks, num_mem_chunks); //OKNG(ret_ihklib == 0, "ihk_reserve_mem (2)\n"); - // assign mem 128m@0,128m@1 + // assign mem 128m@0,128m@0 num_mem_chunks = 2; mem_chunks[0].size = 128*1024*1024ULL; mem_chunks[0].numa_node_number = 0; mem_chunks[1].size = 128*1024*1024ULL; - mem_chunks[1].numa_node_number = 1; + mem_chunks[1].numa_node_number = 0; ret_ihklib = ihk_os_assign_mem(0, mem_chunks, num_mem_chunks); //OKNG(ret_ihklib == 0, "ihk_os_assign_mem (2)\n"); @@ -122,7 +122,7 @@ int main(int argc, char** argv) { usleep(100*1000); // create pseudofs - ret_ihklib = ihk_os_create_pseudofs(0); + ret_ihklib = ihk_os_create_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; @@ -156,7 +156,7 @@ destroy: status = system(cmd); // destroy pseudofs - ret_ihklib = ihk_os_destroy_pseudofs(0); + ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; diff --git a/test/mng_mod/issues/898_928/CT_004.c b/test/mng_mod/issues/898_928/CT_004.c index 8ae94d67..171ae596 100644 --- a/test/mng_mod/issues/898_928/CT_004.c +++ b/test/mng_mod/issues/898_928/CT_004.c @@ -4,9 +4,9 @@ #include #include #include +#include "util.h" -#define MCK_DIR "/home/satoken/ppos" -static char prefix[256] = MCK_DIR; +static char prefix[256] = QUOTE(MCK_DIR); static char test_name[64] = "CT_004"; @@ -39,8 +39,8 @@ int main(int argc, char** argv) { char fn[256]; char kargs[256]; - int cpus[4] = {6, 7, 8, 9}; - int num_cpus = 4; + int cpus[2] = {1, 2}; + int num_cpus = 2; struct ihk_mem_chunk mem_chunks[4]; int num_mem_chunks; @@ -53,7 +53,7 @@ int main(int argc, char** argv) { status = system(cmd); // ihk_os_destroy_pseudofs - ret_ihklib = ihk_os_destroy_pseudofs(0); + ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; @@ -81,21 +81,21 @@ int main(int argc, char** argv) { ret_ihklib = ihk_os_assign_cpu(0, cpus, num_cpus); //OKNG(ret_ihklib == 0, "ihk_os_assign_cpu\n"); - // reserve mem 128m@0,128m@1 + // reserve mem 128m@0,128m@0 num_mem_chunks = 2; mem_chunks[0].size = 128*1024*1024ULL; mem_chunks[0].numa_node_number = 0; mem_chunks[1].size = 128*1024*1024ULL; - mem_chunks[1].numa_node_number = 1; + mem_chunks[1].numa_node_number = 0; ret_ihklib = ihk_reserve_mem(0, mem_chunks, num_mem_chunks); //OKNG(ret_ihklib == 0, "ihk_reserve_mem (2)\n"); - // assign mem 128m@0,128m@1 + // assign mem 128m@0,128m@0 num_mem_chunks = 2; mem_chunks[0].size = 128*1024*1024ULL; mem_chunks[0].numa_node_number = 0; mem_chunks[1].size = 128*1024*1024ULL; - mem_chunks[1].numa_node_number = 1; + mem_chunks[1].numa_node_number = 0; ret_ihklib = ihk_os_assign_mem(0, mem_chunks, num_mem_chunks); //OKNG(ret_ihklib == 0, "ihk_os_assign_mem (2)\n"); @@ -122,7 +122,7 @@ int main(int argc, char** argv) { usleep(100*1000); // create pseudofs - ret_ihklib = ihk_os_create_pseudofs(0); + ret_ihklib = ihk_os_create_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; @@ -157,7 +157,7 @@ destroy: status = system(cmd); // destroy pseudofs - ret_ihklib = ihk_os_destroy_pseudofs(0); + ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; diff --git a/test/mng_mod/issues/898_928/CT_005.c b/test/mng_mod/issues/898_928/CT_005.c index 104c5b81..39617d1b 100644 --- a/test/mng_mod/issues/898_928/CT_005.c +++ b/test/mng_mod/issues/898_928/CT_005.c @@ -4,9 +4,9 @@ #include #include #include +#include "util.h" -#define MCK_DIR "/home/satoken/ppos" -static char prefix[256] = MCK_DIR; +static char prefix[256] = QUOTE(MCK_DIR); static char test_name[64] = "CT_005"; @@ -81,14 +81,14 @@ int main(int argc, char** argv) { ret_ihklib = ihk_os_assign_cpu(0, cpus, num_cpus); //OKNG(ret_ihklib == 0, "ihk_os_assign_cpu\n"); - // reserve mem 128m@0,128m@1 + // reserve mem 128m@0,128m@0 num_mem_chunks = 1; mem_chunks[0].size = 128*1024*1024ULL; mem_chunks[0].numa_node_number = 0; ret_ihklib = ihk_reserve_mem(0, mem_chunks, num_mem_chunks); //OKNG(ret_ihklib == 0, "ihk_reserve_mem (2)\n"); - // assign mem 128m@0,128m@1 + // assign mem 128m@0,128m@0 num_mem_chunks = 1; mem_chunks[0].size = 128*1024*1024ULL; mem_chunks[0].numa_node_number = 0; diff --git a/test/mng_mod/issues/898_928/CT_006.c b/test/mng_mod/issues/898_928/CT_006.c index 04b39611..c5b4cb53 100644 --- a/test/mng_mod/issues/898_928/CT_006.c +++ b/test/mng_mod/issues/898_928/CT_006.c @@ -4,9 +4,9 @@ #include #include #include +#include "util.h" -#define MCK_DIR "/home/satoken/ppos" -static char prefix[256] = MCK_DIR; +static char prefix[256] = QUOTE(MCK_DIR); static char test_name[64] = "CT_006"; @@ -39,8 +39,8 @@ int main(int argc, char** argv) { char fn[256]; char kargs[256]; - int cpus[4] = {6, 7, 8, 9}; - int num_cpus = 4; + int cpus[2] = {1, 2}; + int num_cpus = 2; struct ihk_mem_chunk mem_chunks[4]; int num_mem_chunks; @@ -53,7 +53,7 @@ int main(int argc, char** argv) { status = system(cmd); // ihk_os_destroy_pseudofs - ret_ihklib = ihk_os_destroy_pseudofs(0); + ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; @@ -81,21 +81,21 @@ int main(int argc, char** argv) { ret_ihklib = ihk_os_assign_cpu(0, cpus, num_cpus); //OKNG(ret_ihklib == 0, "ihk_os_assign_cpu\n"); - // reserve mem 128m@0,128m@1 + // reserve mem 128m@0,128m@0 num_mem_chunks = 2; mem_chunks[0].size = 128*1024*1024ULL; mem_chunks[0].numa_node_number = 0; mem_chunks[1].size = 128*1024*1024ULL; - mem_chunks[1].numa_node_number = 1; + mem_chunks[1].numa_node_number = 0; ret_ihklib = ihk_reserve_mem(0, mem_chunks, num_mem_chunks); //OKNG(ret_ihklib == 0, "ihk_reserve_mem (2)\n"); - // assign mem 128m@0,128m@1 + // assign mem 128m@0,128m@0 num_mem_chunks = 2; mem_chunks[0].size = 128*1024*1024ULL; mem_chunks[0].numa_node_number = 0; mem_chunks[1].size = 128*1024*1024ULL; - mem_chunks[1].numa_node_number = 1; + mem_chunks[1].numa_node_number = 0; ret_ihklib = ihk_os_assign_mem(0, mem_chunks, num_mem_chunks); //OKNG(ret_ihklib == 0, "ihk_os_assign_mem (2)\n"); @@ -122,7 +122,7 @@ int main(int argc, char** argv) { usleep(100*1000); // create pseudofs - ret_ihklib = ihk_os_create_pseudofs(0); + ret_ihklib = ihk_os_create_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; @@ -166,7 +166,7 @@ destroy: status = system(cmd); // destroy pseudofs - ret_ihklib = ihk_os_destroy_pseudofs(0); + ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; diff --git a/test/mng_mod/issues/898_928/CT_007.c b/test/mng_mod/issues/898_928/CT_007.c index 8abbedb3..287f9bd1 100644 --- a/test/mng_mod/issues/898_928/CT_007.c +++ b/test/mng_mod/issues/898_928/CT_007.c @@ -4,9 +4,9 @@ #include #include #include +#include "util.h" -#define MCK_DIR "/home/satoken/ppos" -static char prefix[256] = MCK_DIR; +static char prefix[256] = QUOTE(MCK_DIR); static char test_name[64] = "CT_007"; @@ -39,8 +39,8 @@ int main(int argc, char** argv) { char fn[256]; char kargs[256]; - int cpus[4] = {6, 7, 8, 9}; - int num_cpus = 4; + int cpus[2] = {1, 2}; + int num_cpus = 2; struct ihk_mem_chunk mem_chunks[4]; int num_mem_chunks; @@ -53,7 +53,7 @@ int main(int argc, char** argv) { status = system(cmd); // ihk_os_destroy_pseudofs - ret_ihklib = ihk_os_destroy_pseudofs(0); + ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; @@ -81,21 +81,21 @@ int main(int argc, char** argv) { ret_ihklib = ihk_os_assign_cpu(0, cpus, num_cpus); //OKNG(ret_ihklib == 0, "ihk_os_assign_cpu\n"); - // reserve mem 128m@0,128m@1 + // reserve mem 128m@0,128m@0 num_mem_chunks = 2; mem_chunks[0].size = 128*1024*1024ULL; mem_chunks[0].numa_node_number = 0; mem_chunks[1].size = 128*1024*1024ULL; - mem_chunks[1].numa_node_number = 1; + mem_chunks[1].numa_node_number = 0; ret_ihklib = ihk_reserve_mem(0, mem_chunks, num_mem_chunks); //OKNG(ret_ihklib == 0, "ihk_reserve_mem (2)\n"); - // assign mem 128m@0,128m@1 + // assign mem 128m@0,128m@0 num_mem_chunks = 2; mem_chunks[0].size = 128*1024*1024ULL; mem_chunks[0].numa_node_number = 0; mem_chunks[1].size = 128*1024*1024ULL; - mem_chunks[1].numa_node_number = 1; + mem_chunks[1].numa_node_number = 0; ret_ihklib = ihk_os_assign_mem(0, mem_chunks, num_mem_chunks); //OKNG(ret_ihklib == 0, "ihk_os_assign_mem (2)\n"); @@ -123,7 +123,7 @@ goto shutdown; usleep(100*1000); // create pseudofs - ret_ihklib = ihk_os_create_pseudofs(0); + ret_ihklib = ihk_os_create_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; @@ -157,7 +157,7 @@ destroy: status = system(cmd); // destroy pseudofs - ret_ihklib = ihk_os_destroy_pseudofs(0); + ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; diff --git a/test/mng_mod/issues/898_928/CT_008.c b/test/mng_mod/issues/898_928/CT_008.c index 5a0fd72d..8578cdb5 100644 --- a/test/mng_mod/issues/898_928/CT_008.c +++ b/test/mng_mod/issues/898_928/CT_008.c @@ -4,9 +4,9 @@ #include #include #include +#include "util.h" -#define MCK_DIR "/home/satoken/ppos" -static char prefix[256] = MCK_DIR; +static char prefix[256] = QUOTE(MCK_DIR); static char test_name[64] = "CT_008"; @@ -39,8 +39,8 @@ int main(int argc, char** argv) { char fn[256]; char kargs[256]; - int cpus[4] = {6, 7, 8, 9}; - int num_cpus = 4; + int cpus[2] = {1, 2}; + int num_cpus = 2; struct ihk_mem_chunk mem_chunks[4]; int num_mem_chunks; @@ -53,7 +53,7 @@ int main(int argc, char** argv) { status = system(cmd); // ihk_os_destroy_pseudofs - ret_ihklib = ihk_os_destroy_pseudofs(0); + ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; @@ -81,21 +81,21 @@ int main(int argc, char** argv) { ret_ihklib = ihk_os_assign_cpu(0, cpus, num_cpus); //OKNG(ret_ihklib == 0, "ihk_os_assign_cpu\n"); - // reserve mem 128m@0,128m@1 + // reserve mem 128m@0,128m@0 num_mem_chunks = 2; mem_chunks[0].size = 128*1024*1024ULL; mem_chunks[0].numa_node_number = 0; mem_chunks[1].size = 128*1024*1024ULL; - mem_chunks[1].numa_node_number = 1; + mem_chunks[1].numa_node_number = 0; ret_ihklib = ihk_reserve_mem(0, mem_chunks, num_mem_chunks); //OKNG(ret_ihklib == 0, "ihk_reserve_mem (2)\n"); - // assign mem 128m@0,128m@1 + // assign mem 128m@0,128m@0 num_mem_chunks = 2; mem_chunks[0].size = 128*1024*1024ULL; mem_chunks[0].numa_node_number = 0; mem_chunks[1].size = 128*1024*1024ULL; - mem_chunks[1].numa_node_number = 1; + mem_chunks[1].numa_node_number = 0; ret_ihklib = ihk_os_assign_mem(0, mem_chunks, num_mem_chunks); //OKNG(ret_ihklib == 0, "ihk_os_assign_mem (2)\n"); @@ -122,7 +122,7 @@ int main(int argc, char** argv) { usleep(100*1000); // create pseudofs - ret_ihklib = ihk_os_create_pseudofs(0); + ret_ihklib = ihk_os_create_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; @@ -150,7 +150,7 @@ shutdown: // shutdown again ret_ihklib = ihk_os_shutdown(0); - OKNG(ret_ihklib != 0, "shutdown after shutdown returned NOT 0\n"); + OKNG(ret_ihklib == 0, "shutdown after shutdown returned NOT 0\n"); destroy: ret_ihklib = ihk_destroy_os(0, 0); @@ -160,7 +160,7 @@ destroy: status = system(cmd); // destroy pseudofs - ret_ihklib = ihk_os_destroy_pseudofs(0); + ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; diff --git a/test/mng_mod/issues/898_928/CT_009.c b/test/mng_mod/issues/898_928/CT_009.c index 38022a8c..e595e5bd 100644 --- a/test/mng_mod/issues/898_928/CT_009.c +++ b/test/mng_mod/issues/898_928/CT_009.c @@ -4,9 +4,9 @@ #include #include #include +#include "util.h" -#define MCK_DIR "/home/satoken/ppos" -static char prefix[256] = MCK_DIR; +static char prefix[256] = QUOTE(MCK_DIR); static char test_name[64] = "CT_009"; @@ -39,8 +39,8 @@ int main(int argc, char** argv) { char fn[256]; char kargs[256]; - int cpus[4] = {6, 7, 8, 9}; - int num_cpus = 4; + int cpus[2] = {1, 2}; + int num_cpus = 2; struct ihk_mem_chunk mem_chunks[4]; int num_mem_chunks; @@ -53,7 +53,7 @@ int main(int argc, char** argv) { status = system(cmd); // ihk_os_destroy_pseudofs - ret_ihklib = ihk_os_destroy_pseudofs(0); + ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; @@ -81,21 +81,21 @@ int main(int argc, char** argv) { ret_ihklib = ihk_os_assign_cpu(0, cpus, num_cpus); //OKNG(ret_ihklib == 0, "ihk_os_assign_cpu\n"); - // reserve mem 128m@0,128m@1 + // reserve mem 128m@0,128m@0 num_mem_chunks = 2; mem_chunks[0].size = 128*1024*1024ULL; mem_chunks[0].numa_node_number = 0; mem_chunks[1].size = 128*1024*1024ULL; - mem_chunks[1].numa_node_number = 1; + mem_chunks[1].numa_node_number = 0; ret_ihklib = ihk_reserve_mem(0, mem_chunks, num_mem_chunks); //OKNG(ret_ihklib == 0, "ihk_reserve_mem (2)\n"); - // assign mem 128m@0,128m@1 + // assign mem 128m@0,128m@0 num_mem_chunks = 2; mem_chunks[0].size = 128*1024*1024ULL; mem_chunks[0].numa_node_number = 0; mem_chunks[1].size = 128*1024*1024ULL; - mem_chunks[1].numa_node_number = 1; + mem_chunks[1].numa_node_number = 0; ret_ihklib = ihk_os_assign_mem(0, mem_chunks, num_mem_chunks); //OKNG(ret_ihklib == 0, "ihk_os_assign_mem (2)\n"); @@ -123,7 +123,7 @@ goto shutdown; usleep(100*1000); // create pseudofs - ret_ihklib = ihk_os_create_pseudofs(0); + ret_ihklib = ihk_os_create_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; @@ -157,7 +157,7 @@ destroy: status = system(cmd); // destroy pseudofs - ret_ihklib = ihk_os_destroy_pseudofs(0); + ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0); fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r"); nread = fread(buf, 1, sizeof(buf), fp); buf[nread] = 0; diff --git a/test/mng_mod/issues/898_928/Makefile b/test/mng_mod/issues/898_928/Makefile index 01ae4ba2..648b4e73 100644 --- a/test/mng_mod/issues/898_928/Makefile +++ b/test/mng_mod/issues/898_928/Makefile @@ -1,8 +1,9 @@ +include $(HOME)/.mck_test_config.mk + CC = gcc -MCK_DIR=/home/satoken/ppos TARGET=CT_001 CT_002 CT_003 CT_004 CT_005 CT_006 CT_007 CT_008 CT_009 -CPPFLAGS = -I$(MCK_DIR)/include +CPPFLAGS = -I$(MCK_DIR)/include -DMCK_DIR=$(MCK_DIR) LDFLAGS = -L$(MCK_DIR)/lib -lihk -Wl,-rpath -Wl,$(MCK_DIR)/lib -lbfd all: $(TARGET) diff --git a/test/mng_mod/issues/898_928/README b/test/mng_mod/issues/898_928/README index 59ec74a9..da3113ce 100644 --- a/test/mng_mod/issues/898_928/README +++ b/test/mng_mod/issues/898_928/README @@ -23,9 +23,8 @@ McKernelの状態と、終了処理(shutdown, destroy)の組み合わせで、 (2) テストの実行方法 以下の手順でテストを実行する - 1. Makefileの変数MCK_DIRの内容を、McKernelがインストールされているディレクトリに変更する - 2. CT_xxx.c の定数MCK_DIRの内容を、McKernelがインストールされているディレクトリに変更する - 3. sh make test を実行する + 1. ~/.mck_test_config.mkの変数MCK_DIRの内容を、McKernelがインストールされているディレクトリに変更する + 2. sh make test を実行する (3) テスト項目 以下の条件でMcKernelの起動/終了が正常に行われることを確認する @@ -76,7 +75,7 @@ CT_008: 3. McKernelプロセスの実行終了直後にMcKernelを終了(ihk_os_shutdown)する 4. ihk_os_get_status がSHUTDOWNまたは、INACTIVEを返すことを確認する 5. 終了したMcKernelに対して、再度終了(ihk_os_shutdown)する - ⇒ ihk_os_shutdownが0以外を返す + ⇒ ihk_os_shutdownが0を返す CT_009: 前提：force_shutdown.patch を適用してMcKernelをビルドする diff --git a/test/mng_mod/issues/898_928/util.h b/test/mng_mod/issues/898_928/util.h new file mode 100644 index 00000000..d3f35ee7 --- /dev/null +++ b/test/mng_mod/issues/898_928/util.h @@ -0,0 +1,7 @@ +#ifndef __UTIL_H_INCLUDED__ +#define __UTIL_H_INCLUDED__ + +#define Q(x) #x +#define QUOTE(x) Q(x) + +#endif