From owner-p4-projects@FreeBSD.ORG Fri Aug 17 20:57:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E22AB16A46B; Fri, 17 Aug 2007 20:57:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 84A6E16A418 for ; Fri, 17 Aug 2007 20:57:22 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 71FB113C465 for ; Fri, 17 Aug 2007 20:57:22 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7HKvMgg000827 for ; Fri, 17 Aug 2007 20:57:22 GMT (envelope-from jbr@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7HKvMhw000824 for perforce@freebsd.org; Fri, 17 Aug 2007 20:57:22 GMT (envelope-from jbr@FreeBSD.org) Date: Fri, 17 Aug 2007 20:57:22 GMT Message-Id: <200708172057.l7HKvMhw000824@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jbr@FreeBSD.org using -f From: Jesper Brix Rosenkilde To: Perforce Change Reviews Cc: Subject: PERFORCE change 125277 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2007 20:57:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=125277 Change 125277 by jbr@jbr_bob on 2007/08/17 20:56:31 now with getpid and fork Affected files ... .. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_exec.c#16 edit .. //depot/projects/soc2007/jbr-syscall/src/sys/sys/exec.h#4 edit .. //depot/projects/soc2007/jbr-syscall/src/sys/sys/types.h#2 edit .. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_glue.c#2 edit .. //depot/projects/soc2007/jbr-syscall/tests/fork.c#1 add .. //depot/projects/soc2007/jbr-syscall/tests/getpid.c#1 add Differences ... ==== //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_exec.c#16 (text+ko) ==== @@ -454,7 +454,6 @@ */ if (imgp->interpreted) { exec_unmap_first_page(imgp); - exec_unmap_sysshm(imgp); /* * VV_TEXT needs to be unset for scripts. There is a short * period before we determine that something is a script where @@ -911,24 +910,21 @@ struct image_params *imgp; { int error; + struct proc *p = imgp->proc; vm_map_t map = &imgp->proc->p_vmspace->vm_map; vm_offset_t *addr = &imgp->proc->p_usrsysshm; - int test = 42; + struct sysshm outsysshm; error = vm_map_sysshm(map, addr, 42); - copyout((caddr_t) &test, (caddr_t) *addr, sizeof(int)); + outsysshm.pid = p->p_pid; + strncpy(outsysshm.progtitle, p->p_comm, MAXCOMLEN); + strncpy(outsysshm.proctitle, "\0", 1); + copyout((caddr_t) &outsysshm, (caddr_t) *addr, sizeof(struct sysshm)); return(error); } -void -exec_unmap_sysshm(imgp) - struct image_params *imgp; -{ - -} - /* * Destroy old address space, and allocate a new stack * The new stack is only SGROWSIZ large because it is grown ==== //depot/projects/soc2007/jbr-syscall/src/sys/sys/exec.h#4 (text+ko) ==== @@ -75,7 +75,6 @@ void exec_unmap_first_page(struct image_params *); int exec_map_sysshm(struct image_params *); -void exec_unmap_sysshm(struct image_params *); int exec_register(const struct execsw *); int exec_unregister(const struct execsw *); ==== //depot/projects/soc2007/jbr-syscall/src/sys/sys/types.h#2 (text+ko) ==== @@ -372,6 +372,12 @@ __END_DECLS #endif /* !_KERNEL */ +struct sysshm { + pid_t pid; + char progtitle[20]; + char proctitle[2048]; +}; + #endif /* __BSD_VISIBLE */ #endif /* !_SYS_TYPES_H_ */ ==== //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_glue.c#2 (text+ko) ==== @@ -511,6 +511,7 @@ int flags; { struct proc *p1 = td->td_proc; + struct sysshm sysshm; if ((flags & RFPROC) == 0) { /* @@ -542,6 +543,16 @@ shmfork(p1, p2); } + + p2->p_usrsysshm = p1->p_usrsysshm - + (vm_offset_t) p1->p_vmspace->vm_daddr + + (vm_offset_t) p2->p_vmspace->vm_daddr; + + copyin((caddr_t) p1->p_usrsysshm, (caddr_t) &sysshm, + sizeof(struct sysshm)); + sysshm.pid = p2->p_pid; + copyout((caddr_t) &sysshm, (caddr_t) p2->p_usrsysshm, + sizeof(struct sysshm)); /* * cpu_fork will copy and update the pcb, set up the kernel stack, * and make the child ready to run.