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

remove osnum from mckernel kargs. refs #338

Browse Source
This commit is contained in:
Ken Sato
2017-09-12 14:53:44 +09:00
parent 4eed36f124
commit 43db8e2d65
3 changed files with 16 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
kernel/init.c
View File

@ -50,8 +50,6 @@
#define DUMP_LEVEL_USER_UNUSED_EXCLUDE 24
int osnum = 0;
extern struct ihk_kmsg_buf kmsg_buf;
extern unsigned long ihk_mc_get_ns_per_tsc(void);
extern long syscall(int, ihk_mc_user_context_t *);
@ -129,23 +127,23 @@ char *find_command_line(char *name)
static void parse_kargs(void)
{
char *ptr;
char *key_dump_level = "dump_level=";
unsigned int dump_level = DUMP_LEVEL_USER_UNUSED_EXCLUDE;
kprintf("KCommand Line: %s\n", ihk_get_kargs());
if (1) {
char *key = "osnum=";
char *p;
p = find_command_line(key);
if (p != NULL) {
p += strlen(key);
osnum = 0;
while (('0' <= *p) && (*p <= '9')) {
osnum *= 10;
osnum += *p++ - '0';
}
kprintf("osnum: %d\n", osnum);
/* parse dump_level option */
ptr = find_command_line(key_dump_level);
if (ptr) {
ptr += strlen(key_dump_level);
dump_level = 0;
while (('0' <= *ptr) && (*ptr <= '9')) {
dump_level *= 10;
dump_level += *ptr++ - '0';
}
}
ihk_mc_set_dump_level(dump_level);
}
void pc_init(void)
@ -428,8 +426,6 @@ int main(void)
{
char *ptr;
int mode = 0;
char *key_dump_level = "dump_level=";
unsigned int dump_level = DUMP_LEVEL_USER_UNUSED_EXCLUDE;
ptr = find_command_line("ksyslogd=");
if (ptr) {
@ -437,17 +433,6 @@ int main(void)
if (mode < 0 || mode > 2) mode = 0;
}
ptr = find_command_line(key_dump_level);
if (ptr) {
ptr += strlen(key_dump_level);
dump_level = 0;
while (('0' <= *ptr) && (*ptr <= '9')) {
dump_level *= 10;
dump_level += *ptr++ - '0';
}
}
ihk_mc_set_dump_level(dump_level);
kmsg_init(mode);
kputs("IHK/McKernel started.\n");

5
kernel/procfs.c
View File

@ -40,8 +40,6 @@ extern int sprintf(char * buf, const char *fmt, ...);
extern int sscanf(const char * buf, const char * fmt, ...);
extern int scnprintf(char * buf, size_t size, const char *fmt, ...);
extern int osnum;
static void
procfs_thread_ctl(struct thread *thread, int msg)
{
@ -52,7 +50,7 @@ procfs_thread_ctl(struct thread *thread, int msg)
memset(&packet, '\0', sizeof packet);
packet.arg = thread->tid;
packet.msg = msg;
packet.osnum = osnum;
packet.osnum = ihk_mc_get_osnum();
packet.ref = thread->cpu_id;
packet.pid = thread->proc->pid;
packet.err = 0;
@ -86,6 +84,7 @@ void process_procfs_request(struct ikc_scd_packet *rpacket)
struct process_vm *vm = NULL;
struct procfs_read *r;
struct ikc_scd_packet packet;
int osnum = ihk_mc_get_osnum();
int rosnum, ret, pid, tid, ans = -EIO, eof = 0;
char *buf, *p;
struct ihk_ikc_channel_desc *syscall_channel;

1
lib/include/ihk/cpu.h
View File

@ -61,6 +61,7 @@ int ihk_mc_get_hardware_processor_id(void);
int ihk_mc_get_numa_id(void);
int ihk_mc_get_nr_cores();
int ihk_mc_get_nr_linux_cores();
int ihk_mc_get_osnum();
int ihk_mc_get_core(int id, unsigned long *linux_core_id, unsigned long *apic_id,
int *numa_id);
int ihk_mc_get_ikc_cpu(int id);