d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change svr4_sys_break() to just call obreak() and mark it MPSAFE.

Browse Source 
Not objected to by:	alc
This commit is contained in:
John Baldwin 2006-06-26 18:36:57 +00:00
parent cf837b8943
commit b0f6106af9
2 changed files with 4 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
sys/compat/svr4/svr4_misc.c
View File

@ -792,58 +792,10 @@ svr4_sys_break(td, uap)
struct thread *td;
struct svr4_sys_break_args *uap;
{
struct proc *p = td->td_proc;
struct vmspace *vm = p->p_vmspace;
vm_offset_t new, old, base, ns;
int rv;
struct obreak_args ap;
base = round_page((vm_offset_t) vm->vm_daddr);
ns = (vm_offset_t)uap->nsize;
new = round_page(ns);
if (new > base) {
PROC_LOCK(p);
if ((new - base) > (unsigned)lim_cur(p, RLIMIT_DATA)) {
PROC_UNLOCK(p);
return ENOMEM;
}
PROC_UNLOCK(p);
if (new >= VM_MAXUSER_ADDRESS)
return (ENOMEM);
} else if (new < base) {
/*
* This is simply an invalid value. If someone wants to
* do fancy address space manipulations, mmap and munmap
* can do most of what the user would want.
*/
return EINVAL;
}
old = base + ctob(vm->vm_dsize);
if (new > old) {
vm_size_t diff;
diff = new - old;
PROC_LOCK(p);
if (vm->vm_map.size + diff > lim_cur(p, RLIMIT_VMEM)) {
PROC_UNLOCK(p);
return(ENOMEM);
}
PROC_UNLOCK(p);
rv = vm_map_find(&vm->vm_map, NULL, 0, &old, diff, FALSE,
VM_PROT_ALL, VM_PROT_ALL, 0);
if (rv != KERN_SUCCESS) {
return (ENOMEM);
}
vm->vm_dsize += btoc(diff);
} else if (new < old) {
rv = vm_map_remove(&vm->vm_map, new, old);
if (rv != KERN_SUCCESS) {
return (ENOMEM);
}
vm->vm_dsize -= btoc(old - new);
}
return (0);
ap.nsize = uap->nsize;
return (obreak(td, &ap));
}
static __inline clock_t

2
sys/compat/svr4/syscalls.master
View File

@ -57,7 +57,7 @@
14 AUE_NULL MSTD { int svr4_sys_mknod(char* path, int mode, int dev); }
15 AUE_NULL MNOPROTO { int chmod(char *path, int mode); }
16 AUE_NULL MNOPROTO { int chown(char *path, uid_t uid, gid_t gid); }
17 AUE_NULL STD { int svr4_sys_break(caddr_t nsize); }
17 AUE_NULL MSTD { int svr4_sys_break(caddr_t nsize); }
18 AUE_NULL MSTD { int svr4_sys_stat(char* path, \
struct svr4_stat* ub); }
19 AUE_NULL MNOPROTO { int lseek(int filedes, off_t *offset, \