gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: Fix 898 and 928

Browse Source 
1. Catch up with the interface change in
   ihk_os_destroy_pseudofs() and ihk_os_create_pseudofs()
2. Expect ihk_os_shutdown() to return zero when the OS had been shut
   down

Refs: #898
Refs: #928
Change-Id: Ic430550ebfd5cd21164eefaed155fe769adf8395
This commit is contained in:
Masamichi Takagi
2018-11-27 10:36:31 +09:00
parent 6ca5aaa1fc
commit 68c581f721
12 changed files with 106 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test/mng_mod/issues/898_928/CT_006.c
View File

@@ -4,9 +4,9 @@
#include <string.h>
#include <ihklib.h>
#include <sys/types.h>
#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;