/* XXX these should be in a common header somwhere, but aren't */
extern int chrtoblk_set(int, int);
-extern vm_offset_t kmem_mb_alloc(vm_map_t, int, int);
+extern vm_offset_t kmem_mb_alloc(vm_map_t, int, int, kern_return_t *);
/* XXX most of these just exist to export; there's no good header for them*/
void pcb_synch(void);
int dmmin, dmmax, dmtext;
vm_offset_t
-kmem_mb_alloc(vm_map_t mbmap, int size, int physContig)
+kmem_mb_alloc(vm_map_t mbmap, int size, int physContig, kern_return_t *err)
{
vm_offset_t addr = 0;
kern_return_t kr = KERN_SUCCESS;
- if (!physContig)
- kr = kernel_memory_allocate(mbmap, &addr, size, 0, KMA_NOPAGEWAIT | KMA_KOBJECT | KMA_LOMEM, VM_KERN_MEMORY_MBUF);
- else
- kr = kmem_alloc_contig(mbmap, &addr, size, PAGE_MASK, 0xfffff, 0, KMA_NOPAGEWAIT | KMA_KOBJECT | KMA_LOMEM, VM_KERN_MEMORY_MBUF);
+ if (!physContig) {
+ kr = kernel_memory_allocate(mbmap, &addr, size, 0, KMA_KOBJECT | KMA_LOMEM, VM_KERN_MEMORY_MBUF);
+ } else {
+ kr = kmem_alloc_contig(mbmap, &addr, size, PAGE_MASK, 0xfffff, 0, KMA_KOBJECT | KMA_LOMEM, VM_KERN_MEMORY_MBUF);
+ }
- if (kr != KERN_SUCCESS)
+ if (kr != KERN_SUCCESS) {
addr = 0;
+ }
+ if (err) {
+ *err = kr;
+ }
return addr;
}
ut = (struct uthread *)get_bsdthread_info(thread);
if (ut && (ut->uu_flag & UT_VFORK) && ut->uu_proc) {
p = ut->uu_proc;
- if ((p->p_lflag & P_LINVFORK) == 0)
+ if ((p->p_lflag & P_LINVFORK) == 0) {
panic("returning child proc not under vfork");
- if (p->p_vforkact != (void *)thread)
+ }
+ if (p->p_vforkact != (void *)thread) {
panic("returning child proc which is not cur_act");
- return (p);
+ }
+ return p;
}
p = (struct proc *)get_bsdtask_info(current_task());
- if (p == NULL)
- return (kernproc);
+ if (p == NULL) {
+ return kernproc;
+ }
- return (p);
+ return p;
}
/* Device switch add delete routines */
struct bdevsw * devsw;
if (index < 0) {
- if (index == -1)
+ if (index == -1) {
index = 1; /* start at 1 to avoid collision with volfs (Radar 2842228) */
- else
+ } else {
index = -index; /* start at least this far up in the table */
+ }
devsw = &bdevsw[index];
for (; index < nblkdev; index++, devsw++) {
- if (memcmp((char *)devsw, (char *)&nobdev, sizeof(struct bdevsw)) == 0)
+ if (memcmp((char *)devsw, (char *)&nobdev, sizeof(struct bdevsw)) == 0) {
break;
+ }
}
}
- if (index < 0 || index >= nblkdev)
- return (-1);
+ if (index < 0 || index >= nblkdev) {
+ return -1;
+ }
devsw = &bdevsw[index];
if ((memcmp((char *)devsw, (char *)&nobdev, sizeof(struct bdevsw)) != 0)) {
- return (-1);
+ return -1;
}
- return (index);
+ return index;
}
/*
int
bdevsw_add(int index, struct bdevsw * bsw)
{
+ lck_mtx_lock_spin(&devsw_lock_list_mtx);
index = bdevsw_isfree(index);
if (index < 0) {
- return (-1);
+ index = -1;
+ } else {
+ bdevsw[index] = *bsw;
}
- bdevsw[index] = *bsw;
- return (index);
+ lck_mtx_unlock(&devsw_lock_list_mtx);
+ return index;
}
/*
* if the slot has the same bsw, then remove
{
struct bdevsw * devsw;
- if (index < 0 || index >= nblkdev)
- return (-1);
+ if (index < 0 || index >= nblkdev) {
+ return -1;
+ }
devsw = &bdevsw[index];
+ lck_mtx_lock_spin(&devsw_lock_list_mtx);
if ((memcmp((char *)devsw, (char *)bsw, sizeof(struct bdevsw)) != 0)) {
- return (-1);
+ index = -1;
+ } else {
+ bdevsw[index] = nobdev;
}
- bdevsw[index] = nobdev;
- return (index);
+ lck_mtx_unlock(&devsw_lock_list_mtx);
+ return index;
}
/*
struct cdevsw * devsw;
if (index < 0) {
- if (index == -1)
+ if (index == -1) {
index = 0;
- else
+ } else {
index = -index; /* start at least this far up in the table */
+ }
devsw = &cdevsw[index];
for (; index < nchrdev; index++, devsw++) {
- if (memcmp((char *)devsw, (char *)&nocdev, sizeof(struct cdevsw)) == 0)
+ if (memcmp((char *)devsw, (char *)&nocdev, sizeof(struct cdevsw)) == 0) {
break;
+ }
}
}
- if (index < 0 || index >= nchrdev)
- return (-1);
+ if (index < 0 || index >= nchrdev) {
+ return -1;
+ }
devsw = &cdevsw[index];
if ((memcmp((char *)devsw, (char *)&nocdev, sizeof(struct cdevsw)) != 0)) {
- return (-1);
+ return -1;
}
- return (index);
+ return index;
}
/*
int
cdevsw_add(int index, struct cdevsw * csw)
{
+ lck_mtx_lock_spin(&devsw_lock_list_mtx);
index = cdevsw_isfree(index);
if (index < 0) {
- return (-1);
+ index = -1;
+ } else {
+ cdevsw[index] = *csw;
}
- cdevsw[index] = *csw;
- return (index);
+ lck_mtx_unlock(&devsw_lock_list_mtx);
+ return index;
}
/*
* if the slot has the same csw, then remove
{
struct cdevsw * devsw;
- if (index < 0 || index >= nchrdev)
- return (-1);
+ if (index < 0 || index >= nchrdev) {
+ return -1;
+ }
devsw = &cdevsw[index];
+ lck_mtx_lock_spin(&devsw_lock_list_mtx);
if ((memcmp((char *)devsw, (char *)csw, sizeof(struct cdevsw)) != 0)) {
- return (-1);
+ index = -1;
+ } else {
+ cdevsw[index] = nocdev;
+ cdevsw_flags[index] = 0;
}
- cdevsw[index] = nocdev;
- cdevsw_flags[index] = 0;
- return (index);
+ lck_mtx_unlock(&devsw_lock_list_mtx);
+ return index;
}
static int
cdev_set_bdev(int cdev, int bdev)
{
- return (chrtoblk_set(cdev, bdev));
+ return chrtoblk_set(cdev, bdev);
}
int
{
index = cdevsw_add(index, csw);
if (index < 0) {
- return (index);
+ return index;
}
if (cdev_set_bdev(index, bdev) < 0) {
cdevsw_remove(index, csw);
- return (-1);
+ return -1;
}
- return (index);
+ return index;
}
int
-cdevsw_setkqueueok(int index, struct cdevsw * csw, int use_offset)
+cdevsw_setkqueueok(int maj, struct cdevsw * csw, int extra_flags)
{
struct cdevsw * devsw;
uint64_t flags = CDEVSW_SELECT_KQUEUE;
- if (index < 0 || index >= nchrdev)
- return (-1);
+ if (maj < 0 || maj >= nchrdev) {
+ return -1;
+ }
- devsw = &cdevsw[index];
+ devsw = &cdevsw[maj];
if ((memcmp((char *)devsw, (char *)csw, sizeof(struct cdevsw)) != 0)) {
- return (-1);
+ return -1;
}
- if (use_offset) {
- flags |= CDEVSW_USE_OFFSET;
- }
+ flags |= extra_flags;
- cdevsw_flags[index] = flags;
+ cdevsw_flags[maj] = flags;
return 0;
}
int
bsd_hostname(char * buf, int bufsize, int * len)
{
+ int ret, hnlen;
/*
- * "hostname" is null-terminated, and "hostnamelen" is equivalent to strlen(hostname).
+ * "hostname" is null-terminated
*/
- if (hostnamelen < bufsize) {
+ lck_mtx_lock(&hostname_lock);
+ hnlen = strlen(hostname);
+ if (hnlen < bufsize) {
strlcpy(buf, hostname, bufsize);
- *len = hostnamelen;
- return 0;
+ *len = hnlen;
+ ret = 0;
} else {
- return ENAMETOOLONG;
+ ret = ENAMETOOLONG;
}
+ lck_mtx_unlock(&hostname_lock);
+ return ret;
}
void
projects / apple / xnu.git / blobdiff