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

Modify spacing

Browse Source
This commit is contained in:
Masamichi Takagi
2014-09-23 11:12:27 +09:00
committed by Tomoki Shirasawa
parent da17625be9
commit 658b88fd7b
6 changed files with 191 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/cpu.c
View File

@@ -448,8 +448,6 @@ void handle_interrupt(int vector, struct x86_regs *regs)
check_signal(0, regs); check_signal(0, regs);
check_need_resched(); check_need_resched();
//kprintf("handle_interrupt,exit\n");
//schedule();
} }
void gpe_handler(struct x86_regs *regs) void gpe_handler(struct x86_regs *regs)

6
arch/x86/kernel/syscall.c
View File

@@ -351,7 +351,8 @@ do_signal(unsigned long rc, void *regs0, struct process *proc, struct sig_pendin
} }
} }
static int ptrace_report_signal(struct process *proc, struct sig_pending *pending) { static int ptrace_report_signal(struct process *proc, struct sig_pending *pending)
{
int sig; int sig;
__sigset_t w; __sigset_t w;
long rc; long rc;
@@ -363,7 +364,6 @@ static int ptrace_report_signal(struct process *proc, struct sig_pending *pendin
/* Transition process state */ /* Transition process state */
proc->ftn->status = PS_TRACED; proc->ftn->status = PS_TRACED;
ihk_mc_spinlock_unlock_noirq(&proc->ftn->lock); ihk_mc_spinlock_unlock_noirq(&proc->ftn->lock);
if (proc->ftn->parent) { if (proc->ftn->parent) {
/* kill SIGCHLD */ /* kill SIGCHLD */
ihk_mc_spinlock_lock_noirq(&proc->ftn->parent->lock); ihk_mc_spinlock_lock_noirq(&proc->ftn->parent->lock);
@@ -637,11 +637,11 @@ do_kill(int pid, int tid, int sig, siginfo_t *info)
head = &tproc->sigpending; head = &tproc->sigpending;
} }
rc = 0;
/* Put signal event even when handler is SIG_IGN or SIG_DFL /* Put signal event even when handler is SIG_IGN or SIG_DFL
because target ptraced process must call ptrace_report_signal because target ptraced process must call ptrace_report_signal
in check_signal */ in check_signal */
pending = NULL; pending = NULL;
rc = 0;
if (sig < 33) { // SIGRTMIN - SIGRTMAX if (sig < 33) { // SIGRTMIN - SIGRTMAX
list_for_each_entry(pending, head, list){ list_for_each_entry(pending, head, list){
if(pending->sigmask.__val[0] == mask) if(pending->sigmask.__val[0] == mask)

2
executer/user/mcexec.c
View File

@@ -447,7 +447,7 @@ retry:
/* Check whether the resolved path is a symlink */ /* Check whether the resolved path is a symlink */
if (lstat(path, &sb) == -1) { if (lstat(path, &sb) == -1) {
fprintf(stderr, "lookup_exec_path(): %s, error stat\n"); fprintf(stderr, "lookup_exec_path(): error stat\n");
return errno; return errno;
} }

1
kernel/host.c
View File

@@ -362,7 +362,6 @@ static int process_msg_prepare_process(unsigned long rphys)
return -ENOMEM; return -ENOMEM;
} }
proc->pid = pn->pid; proc->pid = pn->pid;
kprintf("prepare_process,pid=%d,ptrace=%08x\n", proc->pid, proc->ftn->ptrace);
proc->pgid = pn->pgid; proc->pgid = pn->pgid;
proc->ftn->pid = pn->pid; proc->ftn->pid = pn->pid;
proc->vm->region.user_start = pn->user_start; proc->vm->region.user_start = pn->user_start;

7
kernel/syscall.c
View File

@@ -324,7 +324,8 @@ static int wait_zombie(struct process *proc, struct fork_tree_node *child, int *
return ret; return ret;
} }
static int wait_stopped(struct process *proc, struct fork_tree_node *child, int *status, int options) { static int wait_stopped(struct process *proc, struct fork_tree_node *child, int *status, int options)
{
dkprintf("wait_stopped,proc->pid=%d,child->pid=%d,options=%08x\n", dkprintf("wait_stopped,proc->pid=%d,child->pid=%d,options=%08x\n",
proc->pid, child->pid, options); proc->pid, child->pid, options);
int ret; int ret;
@@ -1364,7 +1365,8 @@ SYSCALL_DECLARE(arch_prctl)
ihk_mc_syscall_arg1(ctx)); ihk_mc_syscall_arg1(ctx));
} }
static int ptrace_report_exec(struct process *proc) { static int ptrace_report_exec(struct process *proc)
{
int error = 0; int error = 0;
long rc; long rc;
struct siginfo info; struct siginfo info;
@@ -2357,6 +2359,7 @@ SYSCALL_DECLARE(ptrace)
switch(request) { switch(request) {
case PTRACE_TRACEME: case PTRACE_TRACEME:
error = ptrace_traceme(); error = ptrace_traceme();
break;
case PTRACE_KILL: case PTRACE_KILL:
case PTRACE_CONT: case PTRACE_CONT:
error = ptrace_wakeup_sig(pid, request, data); error = ptrace_wakeup_sig(pid, request, data);