xnu-792.12.6.tar.gz

[apple/xnu.git] / bsd / kern / kern_descrip.c

diff --git a/bsd/kern/kern_descrip.c b/bsd/kern/kern_descrip.c
index 7cff95e667319edf10b73fe55e8db2ab4b82c318..babf977cbab95f5357859cee930a87998e9b8ec6 100644 (file)
--- a/bsd/kern/kern_descrip.c
+++ b/bsd/kern/kern_descrip.c
@@ -1,23 +1,31 @@
 /*
 /*

- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 2006 Apple Computer, Inc. All Rights Reserved.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * This file contains Original Code and/or Modifications of Original Code 
+ * as defined in and that are subject to the Apple Public Source License 
+ * Version 2.0 (the 'License'). You may not use this file except in 
+ * compliance with the License.  The rights granted to you under the 
+ * License may not be used to create, or enable the creation or 
+ * redistribution of, unlawful or unlicensed copies of an Apple operating 
+ * system, or to circumvent, violate, or enable the circumvention or 
+ * violation of, any terms of an Apple operating system software license 
+ * agreement.
+ *
+ * Please obtain a copy of the License at 
+ * http://www.opensource.apple.com/apsl/ and read it before using this 
+ * file.
+ *
+ * The Original Code and all software distributed under the License are 
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
+ * Please see the License for the specific language governing rights and 
+ * limitations under the License.
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@

  */
 /* Copyright (c) 1995, 1997 Apple Computer, Inc. All Rights Reserved */
 /*
  */
 /* Copyright (c) 1995, 1997 Apple Computer, Inc. All Rights Reserved */
 /*


@@ -106,6 +114,7 @@ int fdgetf_noref(struct proc *p, int fd, struct fileproc **resultfp);
 void fg_drop(struct fileproc * fp);
 void fg_free(struct fileglob *fg);
 void fg_ref(struct fileproc * fp);
 void fg_drop(struct fileproc * fp);
 void fg_free(struct fileglob *fg);
 void fg_ref(struct fileproc * fp);

+int fp_getfpshm(struct proc *p, int fd, struct fileproc **resultfp, struct pshmnode  **resultpshm);

 
 static int closef_finish(struct fileproc *fp, struct fileglob *fg, struct proc *p);
 
 
 static int closef_finish(struct fileproc *fp, struct fileglob *fg, struct proc *p);
 


@@ -148,11 +157,13 @@ file_lock_init(void)
 
        /* allocate file lock group attribute and group */
        file_lck_grp_attr= lck_grp_attr_alloc_init();
 
        /* allocate file lock group attribute and group */
        file_lck_grp_attr= lck_grp_attr_alloc_init();

+       lck_grp_attr_setstat(file_lck_grp_attr);

 
        file_lck_grp = lck_grp_alloc_init("file",  file_lck_grp_attr);
 
        /* Allocate file lock attribute */
        file_lck_attr = lck_attr_alloc_init();
 
        file_lck_grp = lck_grp_alloc_init("file",  file_lck_grp_attr);
 
        /* Allocate file lock attribute */
        file_lck_attr = lck_attr_alloc_init();

+       //lck_attr_setdebug(file_lck_attr);

 
        uipc_lock = lck_mtx_alloc_init(file_lck_grp, file_lck_attr);
        file_iterate_lcok = lck_mtx_alloc_init(file_lck_grp, file_lck_attr);
 
        uipc_lock = lck_mtx_alloc_init(file_lck_grp, file_lck_attr);
        file_iterate_lcok = lck_mtx_alloc_init(file_lck_grp, file_lck_attr);


@@ -1499,42 +1510,6 @@ fp_getfvp(p, fd, resultfp, resultvp)
 }
 
 
 }
 
 

-
-int
-fp_getfvpandvid(p, fd, resultfp, resultvp, vidp)
-       struct proc *p;
-       int fd;
-       struct fileproc **resultfp;
-       struct vnode  **resultvp;
-       uint32_t * vidp;
-{
-       struct filedesc *fdp = p->p_fd;
-       struct fileproc *fp;
-
-       proc_fdlock(p);
-       if (fd < 0 || fd >= fdp->fd_nfiles ||
-                       (fp = fdp->fd_ofiles[fd]) == NULL ||
-                       (fdp->fd_ofileflags[fd] & UF_RESERVED)) {
-               proc_fdunlock(p);
-               return (EBADF);
-       }
-       if (fp->f_type != DTYPE_VNODE) {
-               proc_fdunlock(p);
-               return(ENOTSUP);
-       }
-       fp->f_iocount++;
-
-       if (resultfp)
-               *resultfp = fp;
-       if (resultvp)
-               *resultvp = (struct vnode *)fp->f_data;
-       if (vidp)
-               *vidp = (uint32_t)vnode_vid((struct vnode *)fp->f_data);
-       proc_fdunlock(p);
-
-       return (0);
-}
-

 /*
  * Returns:    EBADF                   The file descriptor is invalid
  *             EOPNOTSUPP              The file descriptor is not a socket
 /*
  * Returns:    EBADF                   The file descriptor is invalid
  *             EOPNOTSUPP              The file descriptor is not a socket


@@ -1673,74 +1648,6 @@ fp_getfpsem(p, fd, resultfp, resultpsem)
 
        return (0);
 }
 
        return (0);
 }

-
-
-int
-fp_getfpipe(p, fd, resultfp, resultpipe)
-       struct proc *p;
-       int fd;
-       struct fileproc **resultfp;
-       struct pipe  **resultpipe;
-{
-       struct filedesc *fdp = p->p_fd;
-       struct fileproc *fp;
-
-       proc_fdlock(p);
-       if (fd < 0 || fd >= fdp->fd_nfiles ||
-                       (fp = fdp->fd_ofiles[fd]) == NULL ||
-                       (fdp->fd_ofileflags[fd] & UF_RESERVED)) {
-               proc_fdunlock(p);
-               return (EBADF);
-       }
-       if (fp->f_type != DTYPE_PIPE) {
-               proc_fdunlock(p);
-               return(EBADF);
-       }
-       fp->f_iocount++;
-
-       if (resultfp)
-               *resultfp = fp;
-       if (resultpipe)
-               *resultpipe = (struct pipe *)fp->f_data;
-       proc_fdunlock(p);
-
-       return (0);
-}
-
-
-#define DTYPE_ATALK -1
-int
-fp_getfatalk(p, fd, resultfp, resultatalk)
-       struct proc *p;
-       int fd;
-       struct fileproc **resultfp;
-       struct atalk  **resultatalk;
-{
-       struct filedesc *fdp = p->p_fd;
-       struct fileproc *fp;
-
-       proc_fdlock(p);
-       if (fd < 0 || fd >= fdp->fd_nfiles ||
-                       (fp = fdp->fd_ofiles[fd]) == NULL ||
-                       (fdp->fd_ofileflags[fd] & UF_RESERVED)) {
-               proc_fdunlock(p);
-               return (EBADF);
-       }
-       if (fp->f_type != (DTYPE_ATALK+1)) {
-               proc_fdunlock(p);
-               return(EBADF);
-       }
-       fp->f_iocount++;
-
-       if (resultfp)
-               *resultfp = fp;
-       if (resultatalk)
-               *resultatalk = (struct atalk *)fp->f_data;
-       proc_fdunlock(p);
-
-       return (0);
-}
-

 int
 fp_lookup(p, fd, resultfp, locked)
        struct proc *p;
 int
 fp_lookup(p, fd, resultfp, locked)
        struct proc *p;