diff --git a/debug/sysctl.c b/debug/sysctl.c index 6d4084e..b4c45b9 100644 --- a/debug/sysctl.c +++ b/debug/sysctl.c @@ -5,7 +5,6 @@ #include int mib[CTL_MAXNAME]; -//int mib[2]; size_t len; char *p; @@ -16,73 +15,27 @@ int i; u_int32_t *tI; + int *sI; mib[0] = 1; - mib[1] = 1; - - sysctl(mib, 2, NULL, &len, NULL, 0); - p = malloc(len); - sysctl(mib, 2, p, &len, NULL, 0); - - printf("[%s]\n", p); - - mib[0] = 1; - mib[1] = 10; - - sysctl(mib, 2, NULL, &len, NULL, 0); - p = malloc(len); - sysctl(mib, 2, p, &len, NULL, 0); - - printf("[%s]\n", p); - - mib[0] = 1; - mib[1] = 2; - - sysctl(mib, 2, NULL, &len, NULL, 0); - p = malloc(len); - sysctl(mib, 2, p, &len, NULL, 0); - - printf("[%s]\n", p); - - mib[0] = 1; - mib[1] = 4; + mib[1] = 18; sysctl(mib, 2, NULL, &len, NULL, 0); p = malloc(len); sysctl(mib, 2, p, &len, NULL, 0); printf("[len: %i]\n", len); - printf("[%s]\n", p); + if (len == 4) { + sI = p; + printf("[%i]\n", sI[0]); + } + else + printf("[%s]\n", p); - mib[0] = 2;//1;//6; - mib[1] = 12;//37;//2147482988;//1; - - printf("2:12\n"); - sysctl(mib, 2, NULL, &len, NULL, 0); - p = malloc(len); - sysctl(mib, 2, p, &len, NULL, 0); - - //printf("[%s]\n", p); - printf("[len: %i]\n", len); - tI = p; - for (i=0;i<(len/4);i++) - printf("Val: [0x%X], Add: [0x%X][0x%X]\n", tI[i], p, p + (4 * i)); - - printf("\nEND\n"); - size_t j; - - char test[4]; - - test[0] = 'a'; - test[1] = 'a'; - test[2] = 'a'; - test[3] = 'a'; - - j = name2oid(&test, mib); - // j = name2oid("vm.overcommit", mib); + j = name2oid("kern.ngroups", mib); //j = name2oid("hw.pagesizes", mib); printf("j:[%i]\n", j); diff --git a/sys/arch/i386/fork.c b/sys/arch/i386/fork.c index 5396d26..a61ff8e 100644 --- a/sys/arch/i386/fork.c +++ b/sys/arch/i386/fork.c @@ -62,19 +62,13 @@ for (int i = 3; i < 64; i++) if (td->o_files[i]) { newProcess->td.o_files[i] = (struct file *)kmalloc(sizeof(struct file)); -kprintf("A1.%i", i); memcpy(newProcess->td.o_files[i], td->o_files[i], sizeof(struct file)); -kprintf("A2"); if (((struct file *)td->o_files[i])->fd) { ((struct file *)newProcess->td.o_files[i])->fd = kmalloc(sizeof(fileDescriptor_t)); -kprintf("B1"); memcpy( ((struct file *)newProcess->td.o_files[i])->fd, ((struct file *)td->o_files[i])->fd, sizeof(fileDescriptor_t)); -kprintf("B2"); if (((struct file *)td->o_files[i])->fd->buffer) { ((struct file *)newProcess->td.o_files[i])->fd->buffer = kmalloc(4096); -kprintf("C1"); memcpy(((struct file *)newProcess->td.o_files[i])->fd->buffer, ((struct file *)td->o_files[i])->fd->buffer, 4096); -kprintf("C2"); } } } diff --git a/sys/kernel/gen_calls.c b/sys/kernel/gen_calls.c index 0ac6ade..5d3f329 100644 --- a/sys/kernel/gen_calls.c +++ b/sys/kernel/gen_calls.c @@ -187,7 +187,7 @@ void **segbase = 0x0; uint32_t base_addr = 0x0; if (args->op == 10) { - kprintf("SETGSBASE: 0x%X:0x%X", args->parms, args->parms[0]); + //kprintf("SETGSBASE: 0x%X:0x%X", args->parms, args->parms[0]); segbase = args->parms; kprintf("SGS: [0x%X:0x%X]", segbase[0], segbase[1]); base_addr = (uint32_t) segbase[0]; @@ -372,4 +372,3 @@ return (error); } -} diff --git a/sys/kernel/kern_sysctl.c b/sys/kernel/kern_sysctl.c index 1fed190..b475ab8 100644 --- a/sys/kernel/kern_sysctl.c +++ b/sys/kernel/kern_sysctl.c @@ -49,6 +49,7 @@ static void def_ctls() { int name[CTL_MAXNAME], name_len; uint32_t page_val = 0x1000; + int32_t usPage_val = 0x0; name[0] = 6; name[1] = 7; name_len = 2; @@ -130,6 +131,11 @@ page_val = 0; sysctl_add(name, name_len, "vm.overcommit", &page_val, sizeof(u_int32_t)); + name[0] = 1; + name[1] = 18; + usPage_val = 1023; + sysctl_add(name, name_len, "kern.ngroups", &page_val, sizeof(int32_t)); + } int sysctl_init() { diff --git a/sys/kernel/vfs_calls.c b/sys/kernel/vfs_calls.c index 470fadd..9c4ed05 100644 --- a/sys/kernel/vfs_calls.c +++ b/sys/kernel/vfs_calls.c @@ -60,7 +60,7 @@ td->td_retval[0] = fd; } - kprintf("sO: 0x%X:%s:%i", args->mode, args->path, td->td_retval[0]); + //kprintf("sO: 0x%X:%s:%i", args->mode, args->path, td->td_retval[0]); return (error); } @@ -114,7 +114,7 @@ td->td_retval[0] = fd; } - kprintf("[sOA: 0x%X:%s:%s:%i]", args->flag, args->mode, args->path, td->td_retval[0]); + //kprintf("[sOA: 0x%X:%s:%s:%i]", args->flag, args->mode, args->path, td->td_retval[0]); return (error); }