Changeset 101870 in vbox

Timestamp:

Nov 6, 2023 2:08:07 PM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom: Remove unused code from nsprpub, bugref:10545

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (2 diffs)
• nsprpub/pr/include/md/_unixos.h (modified) (2 diffs)
• nsprpub/pr/include/obsolete (deleted)
• nsprpub/pr/include/prio.h (modified) (7 diffs)
• nsprpub/pr/include/private/pprio.h (modified) (2 diffs)
• nsprpub/pr/include/private/primpl.h (modified) (1 diff)
• nsprpub/pr/src/io/priometh.c (modified) (5 diffs)
• nsprpub/pr/src/io/prlayer.c (modified) (4 diffs)
• nsprpub/pr/src/io/prpolevt.c (modified) (2 diffs)
• nsprpub/pr/src/pthreads/ptio.c (modified) (15 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -62 +62 @@
         NSPRPUB-HEADERS \
         NSPRPUB-MD-HEADERS \
-        NSPRPUB-OBS-HEADERS \
         NSPRPUB-PRIV-HEADERS \
         STRING-HEADERS \
@@ -218 +217 @@
         nsprpub/pr/include/md/_solaris32.cfg \
         nsprpub/pr/include/md/_solaris64.cfg
-NSPRPUB-OBS-HEADERS_INST = $(INST_SDK)bindings/xpcom/include/nsprpub/obsolete/
-NSPRPUB-OBS-HEADERS_IFFLAGS = -m 644
-NSPRPUB-OBS-HEADERS_SOURCES = \
-        nsprpub/pr/include/obsolete/probslet.h
 
 NSPRPUB-PRIV-HEADERS_INST = $(INST_SDK)bindings/xpcom/include/nsprpub/private/

trunk/src/libs/xpcom18a4/nsprpub/pr/include/md/_unixos.h

@@ -356 +356 @@
 extern PRInt32  _MD_accept_read(PRInt32 sock, PRInt32 *newSock,
                                 PRNetAddr **raddr, void *buf, PRInt32 amount);
-extern PRInt32  _PR_UnixSendFile(PRFileDesc *sd, PRSendFileData *sfd,
-                        PRTransmitFileFlags flags, PRIntervalTime timeout);
-
-extern PRStatus _MD_LockFile(PRInt32 osfd);
-extern PRStatus _MD_TLockFile(PRInt32 osfd);
-extern PRStatus _MD_UnlockFile(PRInt32 osfd);
 
 #define _MD_OPEN_DIR(dir, name)             _MD_open_dir(dir, name)
@@ -383 +377 @@
 #define _MD_RMDIR(name)                         _MD_rmdir(name)
 #define _MD_ACCEPT_READ(sock, newSock, raddr, buf, amount)      _MD_accept_read(sock, newSock, raddr, buf, amount)
-
-#define _MD_LOCKFILE _MD_LockFile
-#define _MD_TLOCKFILE _MD_TLockFile
-#define _MD_UNLOCKFILE _MD_UnlockFile
-
 
 extern PRInt32          _MD_socket(int af, int type, int flags);

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prio.h

@@ -112 +112 @@
 #define PR_SendTo VBoxNsprPR_SendTo
 #define PR_TransmitFile VBoxNsprPR_TransmitFile
-#define PR_SendFile VBoxNsprPR_SendFile
 #define PR_GetSockName VBoxNsprPR_GetSockName
 #define PR_GetPeerName VBoxNsprPR_GetPeerName
@@ -136 +135 @@
 typedef struct PRPollDesc       PRPollDesc;
 typedef struct PRFilePrivate    PRFilePrivate;
-typedef struct PRSendFileData   PRSendFileData;
 
 /*
@@ -422 +420 @@
     PRFileDesc *sd, PRFileDesc **nd, PRNetAddr **raddr,
     void *buf, PRInt32 amount, PRIntervalTime t);
-typedef PRInt32 (PR_CALLBACK *PRTransmitfileFN)(
-     PRFileDesc *sd, PRFileDesc *fd, const void *headers,
-     PRInt32 hlen, PRTransmitFileFlags flags, PRIntervalTime t);
 typedef PRStatus (PR_CALLBACK *PRGetsocknameFN)(PRFileDesc *fd, PRNetAddr *addr);
 typedef PRStatus (PR_CALLBACK *PRGetpeernameFN)(PRFileDesc *fd, PRNetAddr *addr);
@@ -431 +426 @@
 typedef PRStatus (PR_CALLBACK *PRSetsocketoptionFN)(
     PRFileDesc *fd, const PRSocketOptionData *data);
-typedef PRInt32 (PR_CALLBACK *PRSendfileFN)(
-        PRFileDesc *networkSocket, PRSendFileData *sendData,
-        PRTransmitFileFlags flags, PRIntervalTime timeout);
 typedef PRStatus (PR_CALLBACK *PRConnectcontinueFN)(
     PRFileDesc *fd, PRInt16 out_flags);
@@ -462 +454 @@
     PRPollFN poll;                  /* Test the fd to see if it is ready        */
     PRAcceptreadFN acceptread;      /* Accept and read on a new (net) fd        */
-    PRTransmitfileFN transmitfile;  /* Transmit at entire file                  */
     PRGetsocknameFN getsockname;    /* Get (net) address associated with fd     */
     PRGetpeernameFN getpeername;    /* Get peer's (net) address                 */
@@ -471 +462 @@
     PRSetsocketoptionFN setsocketoption;
                                     /* Set value of specified option            */
-    PRSendfileFN sendfile;                      /* Send a (partial) file with header/trailer*/
     PRConnectcontinueFN connectcontinue;
                                     /* Continue a nonblocking connect */
@@ -1530 +1520 @@
     PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags,
     const PRNetAddr *addr, PRIntervalTime timeout);
-
-/*
-*************************************************************************
-** FUNCTION: PR_TransmitFile
-** DESCRIPTION:
-**    Transmitfile sends a complete file (sourceFile) across a socket 
-**    (networkSocket).  If headers is non-NULL, the headers will be sent across
-**    the socket prior to sending the file.
-** 
-**    Optionally, the PR_TRANSMITFILE_CLOSE_SOCKET flag may be passed to
-**    transmitfile.  This flag specifies that transmitfile should close the
-**    socket after sending the data.
-**
-** INPUTS:
-**    PRFileDesc *networkSocket
-**        The socket to send data over
-**    PRFileDesc *sourceFile
-**        The file to send
-**    const void *headers
-**        A pointer to headers to be sent before sending data
-**    PRInt32       hlen
-**        length of header buffers in bytes.
-**    PRTransmitFileFlags       flags
-**        If the flags indicate that the connection should be closed,
-**        it will be done immediately after transferring the file, unless
-**        the operation is unsuccessful. 
-.*     PRIntervalTime timeout
- *        Time limit for completion of the transmit operation.
-**
-** RETURNS:
-**    Returns the number of bytes written or -1 if the operation failed.
-**    If an error occurs while sending the file, the PR_TRANSMITFILE_CLOSE_
-**    SOCKET flag is ignored. The reason for the failure is obtained
-**    by calling PR_GetError().
-**************************************************************************
-*/
-
-NSPR_API(PRInt32) PR_TransmitFile(
-    PRFileDesc *networkSocket, PRFileDesc *sourceFile,
-    const void *headers, PRInt32 hlen, PRTransmitFileFlags flags,
-    PRIntervalTime timeout);
-
-/*
-*************************************************************************
-** FUNCTION: PR_SendFile
-** DESCRIPTION:
-**    PR_SendFile sends data from a file (sendData->fd) across a socket 
-**    (networkSocket).  If specified, a header and/or trailer buffer are sent
-**        before and after the file, respectively. The file offset, number of bytes
-**        of file data to send, the header and trailer buffers are specified in the
-**        sendData argument.
-** 
-**    Optionally, if the PR_TRANSMITFILE_CLOSE_SOCKET flag is passed, the
-**    socket is closed after successfully sending the data.
-**
-** INPUTS:
-**    PRFileDesc *networkSocket
-**        The socket to send data over
-**    PRSendFileData *sendData
-**        Contains the FD, file offset and length, header and trailer
-**                buffer specifications.
-**    PRTransmitFileFlags       flags
-**        If the flags indicate that the connection should be closed,
-**        it will be done immediately after transferring the file, unless
-**        the operation is unsuccessful. 
-.*     PRIntervalTime timeout
- *        Time limit for completion of the send operation.
-**
-** RETURNS:
-**    Returns the number of bytes written or -1 if the operation failed.
-**    If an error occurs while sending the file, the PR_TRANSMITFILE_CLOSE_
-**    SOCKET flag is ignored. The reason for the failure is obtained
-**    by calling PR_GetError().
-**************************************************************************
-*/
-
-struct PRSendFileData {
-        PRFileDesc      *fd;                    /* file to send                                                 */
-        PRUint32        file_offset;    /* file offset                                                  */
-        PRSize          file_nbytes;    /* number of bytes of file data to send */
-                                                                /* if 0, send data from file_offset to  */
-                                                                /* end-of-file.                                                 */
-        const void      *header;                /* header buffer                                                */
-        PRInt32         hlen;                   /* header len                                                   */
-        const void      *trailer;               /* trailer buffer                                               */
-        PRInt32         tlen;                   /* trailer len                                                  */
-};
-
-
-NSPR_API(PRInt32) PR_SendFile(
-    PRFileDesc *networkSocket, PRSendFileData *sendData,
-        PRTransmitFileFlags flags, PRIntervalTime timeout);
 
 /*

trunk/src/libs/xpcom18a4/nsprpub/pr/include/private/pprio.h

@@ -159 +159 @@
 NSPR_API(PRFileDesc*)   PR_Socket(PRInt32 domain, PRInt32 type, PRInt32 proto);
 
-/* FUNCTION: PR_LockFile
-** DESCRIPTION:
-**    Lock a file for exclusive access.
-** RETURNS:
-**    PR_SUCCESS when the lock is held
-**    PR_FAILURE otherwise
-*/
-NSPR_API(PRStatus) PR_LockFile(PRFileDesc *fd);
-
-/* FUNCTION: PR_TLockFile
-** DESCRIPTION:
-**    Test and Lock a file for exclusive access.  Do not block if the
-**    file cannot be locked immediately.
-** RETURNS:
-**    PR_SUCCESS when the lock is held
-**    PR_FAILURE otherwise
-*/
-NSPR_API(PRStatus) PR_TLockFile(PRFileDesc *fd);
-
-/* FUNCTION: PR_UnlockFile
-** DESCRIPTION:
-**    Unlock a file which has been previously locked successfully by this
-**    process.
-** RETURNS:
-**    PR_SUCCESS when the lock is released
-**    PR_FAILURE otherwise
-*/
-NSPR_API(PRStatus) PR_UnlockFile(PRFileDesc *fd);
-
 /*
 ** Emulate acceptread by accept and recv.
@@ -194 +165 @@
     PRNetAddr **raddr, void *buf, PRInt32 amount, PRIntervalTime timeout);
 
-/*
-** Emulate sendfile by reading from the file and writing to the socket.
-** The file is memory-mapped if memory-mapped files are supported.
-*/
-NSPR_API(PRInt32) PR_EmulateSendFile(
-    PRFileDesc *networkSocket, PRSendFileData *sendData,
-    PRTransmitFileFlags flags, PRIntervalTime timeout);
-
 PR_END_EXTERN_C
 

trunk/src/libs/xpcom18a4/nsprpub/pr/include/private/primpl.h

@@ -55 +55 @@
 
 #include "md/prosdep.h"
-#include "obsolete/probslet.h"
 
 #ifdef _PR_HAVE_POSIX_SEMAPHORES

trunk/src/libs/xpcom18a4/nsprpub/pr/src/io/priometh.c

@@ -67 +67 @@
     (PRPollFN)_PR_InvalidInt16,
     (PRAcceptreadFN)_PR_InvalidInt,   
-    (PRTransmitfileFN)_PR_InvalidInt, 
     (PRGetsocknameFN)_PR_InvalidStatus,    
     (PRGetpeernameFN)_PR_InvalidStatus,    
@@ -74 +73 @@
     (PRGetsocketoptionFN)_PR_InvalidStatus,
     (PRSetsocketoptionFN)_PR_InvalidStatus,
-    (PRSendfileFN)_PR_InvalidInt, 
     (PRConnectcontinueFN)_PR_InvalidStatus,
     (PRReservedFN)_PR_InvalidInt,
@@ -251 +249 @@
 }
 
-PR_IMPLEMENT(PRInt32) PR_TransmitFile(
-    PRFileDesc *sd, PRFileDesc *fd, const void *hdr, PRInt32 hlen,
-    PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-        return((sd->methods->transmitfile)(sd,fd,hdr,hlen,flags,timeout));
-}
-
 PR_IMPLEMENT(PRInt32) PR_AcceptRead(
     PRFileDesc *sd, PRFileDesc **nd, PRNetAddr **raddr,
@@ -285 +276 @@
 {
         return((fd->methods->setsocketoption)(fd, data));
-}
-
-PR_IMPLEMENT(PRInt32) PR_SendFile(
-        PRFileDesc *sd, PRSendFileData *sfd,
-        PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-        return((sd->methods->sendfile)(sd,sfd,flags,timeout));
 }
 
@@ -325 +309 @@
 }
 
-/*
- * PR_EmulateSendFile
- *
- *    Send file sfd->fd across socket sd. If header/trailer are specified
- *    they are sent before and after the file, respectively.
- *
- *    PR_TRANSMITFILE_CLOSE_SOCKET flag - close socket after sending file
- *    
- *    return number of bytes sent or -1 on error
- *
- */
-
-#if defined(XP_UNIX) || defined(WIN32)
-
-/*
- * An implementation based on memory-mapped files
- */
-
-#define SENDFILE_MMAP_CHUNK     (256 * 1024)
-
-PR_IMPLEMENT(PRInt32) PR_EmulateSendFile(
-    PRFileDesc *sd, PRSendFileData *sfd,
-    PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-    PRInt32 rv, count = 0;
-    PRInt32 len, file_bytes, index = 0;
-    PRFileInfo info;
-    PRIOVec iov[3];
-    PRFileMap *mapHandle = NULL;
-    void *addr = (void*)0; /* initialized to some arbitrary value. Keeps compiler warnings down. */
-    PRUint32 file_mmap_offset, alignment;
-    PRInt64 zero64;
-    PROffset64 file_mmap_offset64;
-    PRUint32 addr_offset, mmap_len;
-
-    /* Get file size */
-    if (PR_SUCCESS != PR_GetOpenFileInfo(sfd->fd, &info)) {
-        count = -1;
-        goto done;
-    }
-    if (sfd->file_nbytes &&
-            (info.size < (sfd->file_offset + sfd->file_nbytes))) {
-        /*
-         * there are fewer bytes in file to send than specified
-         */
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        count = -1;
-        goto done;
-    }
-    if (sfd->file_nbytes)
-        file_bytes = sfd->file_nbytes;
-    else
-        file_bytes = info.size - sfd->file_offset;
-
-    alignment = PR_GetMemMapAlignment();
-
-    /* number of initial bytes to skip in mmap'd segment */
-    addr_offset = sfd->file_offset % alignment;
-
-    /* find previous mmap alignment boundary */
-    file_mmap_offset = sfd->file_offset - addr_offset;
-
-    /*
-     * If the file is large, mmap and send the file in chunks so as
-     * to not consume too much virtual address space
-     */
-    mmap_len = PR_MIN(file_bytes + addr_offset, SENDFILE_MMAP_CHUNK);
-    len = mmap_len - addr_offset;
-
-    /*
-     * Map in (part of) file. Take care of zero-length files.
-     */
-    if (len) {
-        LL_I2L(zero64, 0);
-        mapHandle = PR_CreateFileMap(sfd->fd, zero64, PR_PROT_READONLY);
-        if (!mapHandle) {
-            count = -1;
-            goto done;
-        }
-        LL_I2L(file_mmap_offset64, file_mmap_offset);
-        addr = PR_MemMap(mapHandle, file_mmap_offset64, mmap_len);
-        if (!addr) {
-            count = -1;
-            goto done;
-        }
-    }
-    /*
-     * send headers first, followed by the file
-     */
-    if (sfd->hlen) {
-        iov[index].iov_base = (char *) sfd->header;
-        iov[index].iov_len = sfd->hlen;
-        index++;
-    }
-    if (len) {
-        iov[index].iov_base = (char*)addr + addr_offset;
-        iov[index].iov_len = len;
-        index++;
-    }
-    if ((file_bytes == len) && (sfd->tlen)) {
-        /*
-         * all file data is mapped in; send the trailer too
-         */
-        iov[index].iov_base = (char *) sfd->trailer;
-        iov[index].iov_len = sfd->tlen;
-        index++;
-    }
-    rv = PR_Writev(sd, iov, index, timeout);
-    if (len)
-        PR_MemUnmap(addr, mmap_len);
-    if (rv < 0) {
-        count = -1;
-        goto done;
-    }
-
-    PR_ASSERT(rv == sfd->hlen + len + ((len == file_bytes) ? sfd->tlen : 0));
-
-    file_bytes -= len;
-    count += rv;
-    if (!file_bytes)    /* header, file and trailer are sent */
-        goto done;
-
-    /*
-     * send remaining bytes of the file, if any
-     */
-    len = PR_MIN(file_bytes, SENDFILE_MMAP_CHUNK);
-    while (len > 0) {
-        /*
-         * Map in (part of) file
-         */
-        file_mmap_offset = sfd->file_offset + count - sfd->hlen;
-        PR_ASSERT((file_mmap_offset % alignment) == 0);
-
-        LL_I2L(file_mmap_offset64, file_mmap_offset);
-        addr = PR_MemMap(mapHandle, file_mmap_offset64, len);
-        if (!addr) {
-            count = -1;
-            goto done;
-        }
-        rv = PR_Send(sd, addr, len, 0, timeout);
-        PR_MemUnmap(addr, len);
-        if (rv < 0) {
-            count = -1;
-            goto done;
-        }
-
-        PR_ASSERT(rv == len);
-        file_bytes -= rv;
-        count += rv;
-        len = PR_MIN(file_bytes, SENDFILE_MMAP_CHUNK);
-    }
-    PR_ASSERT(0 == file_bytes);
-    if (sfd->tlen) {
-        rv = PR_Send(sd, sfd->trailer, sfd->tlen, 0, timeout);
-        if (rv >= 0) {
-            PR_ASSERT(rv == sfd->tlen);
-            count += rv;
-        } else
-            count = -1;
-    }
-done:
-    if (mapHandle)
-        PR_CloseFileMap(mapHandle);
-    if ((count >= 0) && (flags & PR_TRANSMITFILE_CLOSE_SOCKET))
-        PR_Close(sd);
-    return count;
-}
-
-#else
-
-PR_IMPLEMENT(PRInt32) PR_EmulateSendFile(
-    PRFileDesc *sd, PRSendFileData *sfd,
-    PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-    PRInt32 rv, count = 0;
-    PRInt32 rlen;
-    const void * buffer;
-    PRInt32 buflen;
-    PRInt32 sendbytes, readbytes;
-    char *buf;
-
-#define _SENDFILE_BUFSIZE   (16 * 1024)
-
-    buf = (char*)PR_MALLOC(_SENDFILE_BUFSIZE);
-    if (buf == NULL) {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return -1;
-    }
-
-    /*
-     * send header first
-     */
-    buflen = sfd->hlen;
-    buffer = sfd->header;
-    while (buflen) {
-        rv = PR_Send(sd, buffer, buflen, 0, timeout);
-        if (rv < 0) {
-            /* PR_Send() has invoked PR_SetError(). */
-            rv = -1;
-            goto done;
-        } else {
-            count += rv;
-            buffer = (const void*) ((const char*)buffer + rv);
-            buflen -= rv;
-        }
-    }
-
-    /*
-     * send file next
-     */
-    if (PR_Seek(sfd->fd, sfd->file_offset, PR_SEEK_SET) < 0) {
-        rv = -1;
-        goto done;
-    }
-    sendbytes = sfd->file_nbytes;
-    if (sendbytes == 0) {
-        /* send entire file */
-        while ((rlen = PR_Read(sfd->fd, buf, _SENDFILE_BUFSIZE)) > 0) {
-            while (rlen) {
-                char *bufptr = buf;
-
-                rv =  PR_Send(sd, bufptr, rlen, 0, timeout);
-                if (rv < 0) {
-                    /* PR_Send() has invoked PR_SetError(). */
-                    rv = -1;
-                    goto done;
-                } else {
-                    count += rv;
-                    bufptr = ((char*)bufptr + rv);
-                    rlen -= rv;
-                }
-            }
-        }
-        if (rlen < 0) {
-            /* PR_Read() has invoked PR_SetError(). */
-            rv = -1;
-            goto done;
-        }
-    } else {
-        readbytes = PR_MIN(sendbytes, _SENDFILE_BUFSIZE);
-        while (readbytes && ((rlen = PR_Read(sfd->fd, buf, readbytes)) > 0)) {
-            while (rlen) {
-                char *bufptr = buf;
-
-                rv =  PR_Send(sd, bufptr, rlen, 0, timeout);
-                if (rv < 0) {
-                    /* PR_Send() has invoked PR_SetError(). */
-                    rv = -1;
-                    goto done;
-                } else {
-                    count += rv;
-                    sendbytes -= rv;
-                    bufptr = ((char*)bufptr + rv);
-                    rlen -= rv;
-                }
-            }
-            readbytes = PR_MIN(sendbytes, _SENDFILE_BUFSIZE);
-        }
-        if (rlen < 0) {
-            /* PR_Read() has invoked PR_SetError(). */
-            rv = -1;
-            goto done;
-        } else if (sendbytes != 0) {
-            /*
-             * there are fewer bytes in file to send than specified
-             */
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-            rv = -1;
-            goto done;
-        }
-    }
-
-    /*
-     * send trailer last
-     */
-    buflen = sfd->tlen;
-    buffer = sfd->trailer;
-    while (buflen) {
-        rv =  PR_Send(sd, buffer, buflen, 0, timeout);
-        if (rv < 0) {
-            /* PR_Send() has invoked PR_SetError(). */
-            rv = -1;
-            goto done;
-        } else {
-            count += rv;
-            buffer = (const void*) ((const char*)buffer + rv);
-            buflen -= rv;
-        }
-    }
-    rv = count;
-
-done:
-    if (buf)
-        PR_DELETE(buf);
-    if ((rv >= 0) && (flags & PR_TRANSMITFILE_CLOSE_SOCKET))
-        PR_Close(sd);
-    return rv;
-}
-
-#endif
-
 /* priometh.c */

trunk/src/libs/xpcom18a4/nsprpub/pr/src/io/prlayer.c

@@ -367 +367 @@
 }
 
-static PRInt32 PR_CALLBACK pl_DefTransmitfile (
-    PRFileDesc *sd, PRFileDesc *fd, const void *headers, PRInt32 hlen,
-    PRTransmitFileFlags flags, PRIntervalTime t)
-{
-    PR_ASSERT(sd != NULL);
-    PR_ASSERT(sd->lower != NULL);
-
-    return sd->lower->methods->transmitfile(
-        sd->lower, fd, headers, hlen, flags, t);
-}
-
 static PRStatus PR_CALLBACK pl_DefGetsockname (PRFileDesc *fd, PRNetAddr *addr)
 {
@@ -410 +399 @@
 
     return (fd->lower->methods->setsocketoption)(fd->lower, data);
-}
-
-static PRInt32 PR_CALLBACK pl_DefSendfile (
-        PRFileDesc *sd, PRSendFileData *sfd,
-        PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-    PR_ASSERT(sd != NULL);
-    PR_ASSERT(sd->lower != NULL);
-
-    return sd->lower->methods->sendfile(
-        sd->lower, sfd, flags, timeout);
 }
 
@@ -448 +426 @@
     pl_DefPoll,
     pl_DefAcceptread,
-    pl_DefTransmitfile,
     pl_DefGetsockname,
     pl_DefGetpeername,
@@ -455 +432 @@
     pl_DefGetsocketoption,
     pl_DefSetsocketoption,
-    pl_DefSendfile,
     pl_DefConnectcontinue,
     (PRReservedFN)_PR_InvalidInt,

trunk/src/libs/xpcom18a4/nsprpub/pr/src/io/prpolevt.c

@@ -107 +107 @@
     _pr_PolEvtPoll,
     (PRAcceptreadFN)_PR_InvalidInt,   
-    (PRTransmitfileFN)_PR_InvalidInt, 
     (PRGetsocknameFN)_PR_InvalidStatus,    
     (PRGetpeernameFN)_PR_InvalidStatus,    
@@ -114 +113 @@
     (PRGetsocketoptionFN)_PR_InvalidStatus,
     (PRSetsocketoptionFN)_PR_InvalidStatus,
-    (PRSendfileFN)_PR_InvalidInt, 
     (PRConnectcontinueFN)_PR_InvalidStatus, 
     (PRReservedFN)_PR_InvalidInt, 

trunk/src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptio.c

@@ -55 +55 @@
 #include <sys/utsname.h> /* for uname */
 #endif
-#if defined(SOLARIS) || defined(UNIXWARE)
+#if defined(SOLARIS)
 #include <sys/filio.h>  /* to pick up FIONREAD */
 #endif
@@ -61 +61 @@
 #include <poll.h>
 #endif
-#ifdef AIX
-/* To pick up sysconf() */
-#include <unistd.h>
-#include <dlfcn.h>  /* for dlopen */
-#else
 /* To pick up getrlimit() etc. */
 #include <sys/time.h>
 #include <sys/resource.h>
-#endif
-
-#ifdef SOLARIS
-/*
- * Define HAVE_SENDFILEV if the system has the sendfilev() system call.
- * Code built this way won't run on a system without sendfilev().
- * We can define HAVE_SENDFILEV by default when the minimum release
- * of Solaris that NSPR supports has sendfilev().
- */
-#ifdef HAVE_SENDFILEV
-
-#include <sys/sendfile.h>
-
-#define SOLARIS_SENDFILEV(a, b, c, d) sendfilev((a), (b), (c), (d))
-
-#else
-
-#include <dlfcn.h>  /* for dlopen */
-
-/*
- * Match the definitions in <sys/sendfile.h>.
- */
-typedef struct sendfilevec {
-    int sfv_fd;       /* input fd */
-    uint_t sfv_flag;  /* flags */
-    off_t sfv_off;    /* offset to start reading from */
-    size_t sfv_len;   /* amount of data */
-} sendfilevec_t;
-
-#define SFV_FD_SELF (-2)
-
-/*
- * extern ssize_t sendfilev(int, const struct sendfilevec *, int, size_t *);
- */
-static ssize_t (*pt_solaris_sendfilev_fptr)() = NULL;
-
-#define SOLARIS_SENDFILEV(a, b, c, d) \
-        (*pt_solaris_sendfilev_fptr)((a), (b), (c), (d))
-
-#endif /* HAVE_SENDFILEV */
-#endif /* SOLARIS */
-
-/*
- * The send_file() system call is available in AIX 4.3.2 or later.
- * If this file is compiled on an older AIX system, it attempts to
- * look up the send_file symbol at run time to determine whether
- * we can use the faster PR_SendFile/PR_TransmitFile implementation based on
- * send_file().  On AIX 4.3.2 or later, we can safely skip this
- * runtime function dispatching and just use the send_file based
- * implementation.
- */
-#ifdef AIX
-#ifdef SF_CLOSE
-#define HAVE_SEND_FILE
-#endif
-
-#ifdef HAVE_SEND_FILE
-
-#define AIX_SEND_FILE(a, b, c) send_file(a, b, c)
-
-#else /* HAVE_SEND_FILE */
-
-/*
- * The following definitions match those in <sys/socket.h>
- * on AIX 4.3.2.
- */
-
-/*
- * Structure for the send_file() system call
- */
-struct sf_parms {
-    /* --------- header parms ---------- */
-    void      *header_data;         /* Input/Output. Points to header buf */
-    uint_t    header_length;        /* Input/Output. Length of the header */
-    /* --------- file parms ------------ */
-    int       file_descriptor;      /* Input. File descriptor of the file */
-    unsigned long long file_size;   /* Output. Size of the file */
-    unsigned long long file_offset; /* Input/Output. Starting offset */
-    long long file_bytes;           /* Input/Output. no. of bytes to send */
-    /* --------- trailer parms --------- */
-    void      *trailer_data;        /* Input/Output. Points to trailer buf */
-    uint_t    trailer_length;       /* Input/Output. Length of the trailer */
-    /* --------- return info ----------- */
-    unsigned long long bytes_sent;  /* Output. no. of bytes sent */
-};
-
-/*
- * Flags for the send_file() system call
- */
-#define SF_CLOSE        0x00000001      /* close the socket after completion */
-#define SF_REUSE        0x00000002      /* reuse socket. not supported */
-#define SF_DONT_CACHE   0x00000004      /* don't apply network buffer cache */
-#define SF_SYNC_CACHE   0x00000008      /* sync/update network buffer cache */
-
-/*
- * prototype: size_t send_file(int *, struct sf_parms *, uint_t);
- */
-static ssize_t (*pt_aix_sendfile_fptr)() = NULL;
-
-#define AIX_SEND_FILE(a, b, c) (*pt_aix_sendfile_fptr)(a, b, c)
-
-#endif /* HAVE_SEND_FILE */
-#endif /* AIX */
-
-#ifdef LINUX
-#include <sys/sendfile.h>
-#endif
 
 #include "primpl.h"
@@ -325 +213 @@
     union { PRIntn flags; } arg4;           /* #4 - read/write flags */
     union { PRNetAddr *addr; } arg5;        /* #5 - send/recv address */
-
-#ifdef SOLARIS
-    /*
-     * For sendfilev()
-     */
-    int nbytes_to_send;                     /* size of header and file */
-#endif  /* SOLARIS */
-
-#ifdef LINUX
-    /*
-     * For sendfile()
-     */
-    int in_fd;                              /* descriptor of file to send */
-    off_t offset;
-    size_t count;
-#endif  /* LINUX */
 
     PRIntervalTime timeout;                 /* client (relative) timeout */
@@ -777 +649 @@
 }  /* pt_recvfrom_cont */
 
-#ifdef SOLARIS
-static PRBool pt_solaris_sendfile_cont(pt_Continuation *op, PRInt16 revents)
-{
-    struct sendfilevec *vec = (struct sendfilevec *) op->arg2.buffer;
-    size_t xferred;
-    ssize_t count;
-
-    count = SOLARIS_SENDFILEV(op->arg1.osfd, vec, op->arg3.amount, &xferred);
-    op->syserrno = errno;
-    PR_ASSERT((count == -1) || (count == xferred));
-
-    if (count == -1) {
-        if (op->syserrno != EWOULDBLOCK && op->syserrno != EAGAIN
-                && op->syserrno != EINTR) {
-            op->result.code = -1;
-            return PR_TRUE;
-        }
-        count = xferred;
-    }
-    PR_ASSERT(count <= op->nbytes_to_send);
-
-    op->result.code += count;
-    if (count < op->nbytes_to_send) {
-        op->nbytes_to_send -= count;
-
-        while (count >= vec->sfv_len) {
-            count -= vec->sfv_len;
-            vec++;
-            op->arg3.amount--;
-        }
-        PR_ASSERT(op->arg3.amount > 0);
-
-        vec->sfv_off += count;
-        vec->sfv_len -= count;
-        PR_ASSERT(vec->sfv_len > 0);
-        op->arg2.buffer = vec;
-
-        return PR_FALSE;
-    }
-
-    return PR_TRUE;
-}
-#endif  /* SOLARIS */
-
-#ifdef LINUX
-static PRBool pt_linux_sendfile_cont(pt_Continuation *op, PRInt16 revents)
-{
-    ssize_t rv;
-    off_t oldoffset;
-
-    oldoffset = op->offset;
-    rv = sendfile(op->arg1.osfd, op->in_fd, &op->offset, op->count);
-    op->syserrno = errno;
-
-    if (rv == -1) {
-        if (op->syserrno != EWOULDBLOCK && op->syserrno != EAGAIN) {
-            op->result.code = -1;
-            return PR_TRUE;
-        }
-        rv = 0;
-    }
-    PR_ASSERT(rv == op->offset - oldoffset);
-    op->result.code += rv;
-    if (rv < op->count) {
-        op->count -= rv;
-        return PR_FALSE;
-    }
-    return PR_TRUE;
-}
-#endif  /* LINUX */
-
 void _PR_InitIO(void)
 {
@@ -1672 +1473 @@
 }  /* pt_SocketWrite */
 
-#ifdef SOLARIS
-
-/*
- *    pt_SolarisSendFile
- *
- *    Send file sfd->fd across socket sd. If specified, header and trailer
- *    buffers are sent before and after the file, respectively.
- *
- *    PR_TRANSMITFILE_CLOSE_SOCKET flag - close socket after sending file
- *
- *    return number of bytes sent or -1 on error
- *
- *    This implementation takes advantage of the sendfilev() system
- *    call available in Solaris 8.
- */
-
-static PRInt32 pt_SolarisSendFile(PRFileDesc *sd, PRSendFileData *sfd,
-                PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-    struct stat statbuf;
-    size_t nbytes_to_send, file_nbytes_to_send;
-    struct sendfilevec sfv_struct[3];
-    int sfvcnt = 0;
-    size_t xferred;
-    PRInt32 count;
-    int syserrno;
-
-    if (sfd->file_nbytes == 0) {
-        /* Get file size */
-        if (fstat(sfd->fd->secret->md.osfd, &statbuf) == -1) {
-            _PR_MD_MAP_FSTAT_ERROR(errno);
-            return -1;
-        }
-        file_nbytes_to_send = statbuf.st_size - sfd->file_offset;
-    } else {
-        file_nbytes_to_send = sfd->file_nbytes;
-    }
-
-    nbytes_to_send = sfd->hlen + sfd->tlen + file_nbytes_to_send;
-
-    if (sfd->hlen != 0) {
-        sfv_struct[sfvcnt].sfv_fd = SFV_FD_SELF;
-        sfv_struct[sfvcnt].sfv_flag = 0;
-        sfv_struct[sfvcnt].sfv_off = (off_t) sfd->header;
-        sfv_struct[sfvcnt].sfv_len = sfd->hlen;
-        sfvcnt++;
-    }
-
-    if (file_nbytes_to_send != 0) {
-        sfv_struct[sfvcnt].sfv_fd = sfd->fd->secret->md.osfd;
-        sfv_struct[sfvcnt].sfv_flag = 0;
-        sfv_struct[sfvcnt].sfv_off = sfd->file_offset;
-        sfv_struct[sfvcnt].sfv_len = file_nbytes_to_send;
-        sfvcnt++;
-    }
-
-    if (sfd->tlen != 0) {
-        sfv_struct[sfvcnt].sfv_fd = SFV_FD_SELF;
-        sfv_struct[sfvcnt].sfv_flag = 0;
-        sfv_struct[sfvcnt].sfv_off = (off_t) sfd->trailer;
-        sfv_struct[sfvcnt].sfv_len = sfd->tlen;
-        sfvcnt++;
-    }
-
-    if (0 == sfvcnt) {
-        count = 0;
-        goto done;
-    }
-
-    /*
-     * Strictly speaking, we may have sent some bytes when the
-     * sendfilev() is interrupted and we should retry it from an
-     * updated offset.  We are not doing that here.
-     */
-    count = SOLARIS_SENDFILEV(sd->secret->md.osfd, sfv_struct,
-            sfvcnt, &xferred);
-
-    PR_ASSERT((count == -1) || (count == xferred));
-
-    if (count == -1) {
-        syserrno = errno;
-        if (syserrno == EINTR
-                || syserrno == EAGAIN || syserrno == EWOULDBLOCK) {
-            count = xferred;
-        }
-    }
-
-    if (count != -1 && count < nbytes_to_send) {
-        pt_Continuation op;
-        struct sendfilevec *vec = sfv_struct;
-        PRInt32 rem = count;
-
-        while (rem >= vec->sfv_len) {
-            rem -= vec->sfv_len;
-            vec++;
-            sfvcnt--;
-        }
-        PR_ASSERT(sfvcnt > 0);
-
-        vec->sfv_off += rem;
-        vec->sfv_len -= rem;
-        PR_ASSERT(vec->sfv_len > 0);
-
-        op.arg1.osfd = sd->secret->md.osfd;
-        op.arg2.buffer = vec;
-        op.arg3.amount = sfvcnt;
-        op.arg4.flags = 0;
-        op.nbytes_to_send = nbytes_to_send - count;
-        op.result.code = count;
-        op.timeout = timeout;
-        op.function = pt_solaris_sendfile_cont;
-        op.event = POLLOUT | POLLPRI;
-        count = pt_Continue(&op);
-        syserrno = op.syserrno;
-    }
-
-done:
-    if (count == -1) {
-        pt_MapError(_MD_solaris_map_sendfile_error, syserrno);
-        return -1;
-    }
-    if (flags & PR_TRANSMITFILE_CLOSE_SOCKET) {
-        PR_Close(sd);
-    }
-    PR_ASSERT(count == nbytes_to_send);
-    return count;
-}
-
-#ifndef HAVE_SENDFILEV
-static pthread_once_t pt_solaris_sendfilev_once_block = PTHREAD_ONCE_INIT;
-
-static void pt_solaris_sendfilev_init_routine(void)
-{
-    void *handle;
-    PRBool close_it = PR_FALSE;
-
-    /*
-     * We do not want to unload libsendfile.so.  This handle is leaked
-     * intentionally.
-     */
-    handle = dlopen("libsendfile.so", RTLD_LAZY | RTLD_GLOBAL);
-    PR_LOG(_pr_io_lm, PR_LOG_DEBUG,
-        ("dlopen(libsendfile.so) returns %p", handle));
-
-    if (NULL == handle) {
-        /*
-         * The dlopen(0, mode) call is to allow for the possibility that
-         * sendfilev() may become part of a standard system library in a
-         * future Solaris release.
-         */
-        handle = dlopen(0, RTLD_LAZY | RTLD_GLOBAL);
-        PR_LOG(_pr_io_lm, PR_LOG_DEBUG,
-            ("dlopen(0) returns %p", handle));
-        close_it = PR_TRUE;
-    }
-    pt_solaris_sendfilev_fptr = (ssize_t (*)()) dlsym(handle, "sendfilev");
-    PR_LOG(_pr_io_lm, PR_LOG_DEBUG,
-        ("dlsym(sendfilev) returns %p", pt_solaris_sendfilev_fptr));
-
-    if (close_it) {
-        dlclose(handle);
-    }
-}
-
-/*
- * pt_SolarisDispatchSendFile
- */
-static PRInt32 pt_SolarisDispatchSendFile(PRFileDesc *sd, PRSendFileData *sfd,
-          PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-    int rv;
-
-    rv = pthread_once(&pt_solaris_sendfilev_once_block,
-            pt_solaris_sendfilev_init_routine);
-    PR_ASSERT(0 == rv);
-    if (pt_solaris_sendfilev_fptr) {
-        return pt_SolarisSendFile(sd, sfd, flags, timeout);
-    } else {
-        return PR_EmulateSendFile(sd, sfd, flags, timeout);
-    }
-}
-#endif /* !HAVE_SENDFILEV */
-
-#endif  /* SOLARIS */
-
-#ifdef LINUX
-/*
- * pt_LinuxSendFile
- *
- *    Send file sfd->fd across socket sd. If specified, header and trailer
- *    buffers are sent before and after the file, respectively.
- *
- *    PR_TRANSMITFILE_CLOSE_SOCKET flag - close socket after sending file
- *
- *    return number of bytes sent or -1 on error
- *
- *      This implementation takes advantage of the sendfile() system
- *      call available in Linux kernel 2.2 or higher.
- */
-
-static PRInt32 pt_LinuxSendFile(PRFileDesc *sd, PRSendFileData *sfd,
-                PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-    struct stat statbuf;
-    size_t file_nbytes_to_send;
-    PRInt32 count = 0;
-    ssize_t rv;
-    int syserrno;
-    off_t offset;
-    PRBool tcp_cork_enabled = PR_FALSE;
-    int tcp_cork;
-
-    if (sfd->file_nbytes == 0) {
-        /* Get file size */
-        if (fstat(sfd->fd->secret->md.osfd, &statbuf) == -1) {
-            _PR_MD_MAP_FSTAT_ERROR(errno);
-            return -1;
-        }
-        file_nbytes_to_send = statbuf.st_size - sfd->file_offset;
-    } else {
-        file_nbytes_to_send = sfd->file_nbytes;
-    }
-
-    if ((sfd->hlen != 0 || sfd->tlen != 0)
-            && sd->secret->md.tcp_nodelay == 0) {
-        tcp_cork = 1;
-        if (setsockopt(sd->secret->md.osfd, SOL_TCP, TCP_CORK,
-                &tcp_cork, sizeof tcp_cork) == 0) {
-            tcp_cork_enabled = PR_TRUE;
-        } else {
-            syserrno = errno;
-            if (syserrno != EINVAL) {
-                _PR_MD_MAP_SETSOCKOPT_ERROR(syserrno);
-                return -1;
-            }
-            /*
-             * The most likely reason for the EINVAL error is that
-             * TCP_NODELAY is set (with a function other than
-             * PR_SetSocketOption).  This is not fatal, so we keep
-             * on going.
-             */
-            PR_LOG(_pr_io_lm, PR_LOG_WARNING,
-                ("pt_LinuxSendFile: "
-                "setsockopt(TCP_CORK) failed with EINVAL\n"));
-        }
-    }
-
-    if (sfd->hlen != 0) {
-        count = PR_Send(sd, sfd->header, sfd->hlen, 0, timeout);
-        if (count == -1) {
-            goto failed;
-        }
-    }
-
-    if (file_nbytes_to_send != 0) {
-        offset = sfd->file_offset;
-        do {
-            rv = sendfile(sd->secret->md.osfd, sfd->fd->secret->md.osfd,
-                &offset, file_nbytes_to_send);
-        } while (rv == -1 && (syserrno = errno) == EINTR);
-        if (rv == -1) {
-            if (syserrno != EAGAIN && syserrno != EWOULDBLOCK) {
-                _MD_linux_map_sendfile_error(syserrno);
-                count = -1;
-                goto failed;
-            }
-            rv = 0;
-        }
-        PR_ASSERT(rv == offset - sfd->file_offset);
-        count += rv;
-
-        if (rv < file_nbytes_to_send) {
-            pt_Continuation op;
-
-            op.arg1.osfd = sd->secret->md.osfd;
-            op.in_fd = sfd->fd->secret->md.osfd;
-            op.offset = offset;
-            op.count = file_nbytes_to_send - rv;
-            op.result.code = count;
-            op.timeout = timeout;
-            op.function = pt_linux_sendfile_cont;
-            op.event = POLLOUT | POLLPRI;
-            count = pt_Continue(&op);
-            syserrno = op.syserrno;
-            if (count == -1) {
-                pt_MapError(_MD_linux_map_sendfile_error, syserrno);
-                goto failed;
-            }
-        }
-    }
-
-    if (sfd->tlen != 0) {
-        rv = PR_Send(sd, sfd->trailer, sfd->tlen, 0, timeout);
-        if (rv == -1) {
-            count = -1;
-            goto failed;
-        }
-        count += rv;
-    }
-
-failed:
-    if (tcp_cork_enabled) {
-        tcp_cork = 0;
-        if (setsockopt(sd->secret->md.osfd, SOL_TCP, TCP_CORK,
-                &tcp_cork, sizeof tcp_cork) == -1 && count != -1) {
-            _PR_MD_MAP_SETSOCKOPT_ERROR(errno);
-            count = -1;
-        }
-    }
-    if (count != -1) {
-        if (flags & PR_TRANSMITFILE_CLOSE_SOCKET) {
-            PR_Close(sd);
-        }
-        PR_ASSERT(count == sfd->hlen + sfd->tlen + file_nbytes_to_send);
-    }
-    return count;
-}
-#endif  /* LINUX */
-
-static PRInt32 pt_SendFile(
-    PRFileDesc *sd, PRSendFileData *sfd,
-    PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-    if (pt_TestAbort()) return -1;
-    /* The socket must be in blocking mode. */
-    if (sd->secret->nonblocking)
-    {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return -1;
-    }
-#if defined(SOLARIS)
-#ifdef HAVE_SENDFILEV
-        return(pt_SolarisSendFile(sd, sfd, flags, timeout));
-#else
-        return(pt_SolarisDispatchSendFile(sd, sfd, flags, timeout));
-#endif /* HAVE_SENDFILEV */
-#elif defined(LINUX)
-        return(pt_LinuxSendFile(sd, sfd, flags, timeout));
-#else
-        return(PR_EmulateSendFile(sd, sfd, flags, timeout));
-#endif
-}
-
-static PRInt32 pt_TransmitFile(
-    PRFileDesc *sd, PRFileDesc *fd, const void *headers,
-    PRInt32 hlen, PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-        PRSendFileData sfd;
-
-        sfd.fd = fd;
-        sfd.file_offset = 0;
-        sfd.file_nbytes = 0;
-        sfd.header = headers;
-        sfd.hlen = hlen;
-        sfd.trailer = NULL;
-        sfd.tlen = 0;
-
-        return(pt_SendFile(sd, &sfd, flags, timeout));
-}  /* pt_TransmitFile */
-
 static PRInt32 pt_AcceptRead(
     PRFileDesc *sd, PRFileDesc **nd, PRNetAddr **raddr,
@@ -2268 +1709 @@
                     (char*)&value, sizeof(PRIntn));
 #ifdef LINUX
-                /* for pt_LinuxSendFile */
+                /* for pt_Linux1 */
                 if (name == TCP_NODELAY && rv == 0) {
                     fd->secret->md.tcp_nodelay = value;
@@ -2367 +1808 @@
     pt_Poll,
     (PRAcceptreadFN)_PR_InvalidInt,
-    (PRTransmitfileFN)_PR_InvalidInt,
     (PRGetsocknameFN)_PR_InvalidStatus,
     (PRGetpeernameFN)_PR_InvalidStatus,
@@ -2374 +1814 @@
     (PRGetsocketoptionFN)_PR_InvalidStatus,
     (PRSetsocketoptionFN)_PR_InvalidStatus,
-    (PRSendfileFN)_PR_InvalidInt,
     (PRConnectcontinueFN)_PR_InvalidStatus,
     (PRReservedFN)_PR_InvalidInt,
@@ -2406 +1845 @@
     pt_Poll,
     (PRAcceptreadFN)_PR_InvalidInt,
-    (PRTransmitfileFN)_PR_InvalidInt,
     (PRGetsocknameFN)_PR_InvalidStatus,
     (PRGetpeernameFN)_PR_InvalidStatus,
@@ -2413 +1851 @@
     (PRGetsocketoptionFN)_PR_InvalidStatus,
     (PRSetsocketoptionFN)_PR_InvalidStatus,
-    (PRSendfileFN)_PR_InvalidInt,
     (PRConnectcontinueFN)_PR_InvalidStatus,
     (PRReservedFN)_PR_InvalidInt,
@@ -2445 +1882 @@
     pt_Poll,
     pt_AcceptRead,
-    pt_TransmitFile,
     pt_GetSockName,
     pt_GetPeerName,
@@ -2452 +1888 @@
     pt_GetSocketOption,
     pt_SetSocketOption,
-    pt_SendFile,
     pt_ConnectContinue,
     (PRReservedFN)_PR_InvalidInt,
@@ -2484 +1919 @@
         pt_Poll,
     (PRAcceptreadFN)_PR_InvalidInt,
-    (PRTransmitfileFN)_PR_InvalidInt,
     (PRGetsocknameFN)_PR_InvalidStatus,
     (PRGetpeernameFN)_PR_InvalidStatus,
@@ -2491 +1925 @@
     (PRGetsocketoptionFN)_PR_InvalidStatus,
     (PRSetsocketoptionFN)_PR_InvalidStatus,
-    (PRSendfileFN)_PR_InvalidInt,
     (PRConnectcontinueFN)_PR_InvalidStatus,
     (PRReservedFN)_PR_InvalidInt,
@@ -3350 +2783 @@
 }  /*  PR_ChangeFileDescNativeHandle*/
 
-PR_IMPLEMENT(PRStatus) PR_LockFile(PRFileDesc *fd)
-{
-    PRStatus status = PR_SUCCESS;
-
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    PR_Lock(_pr_flock_lock);
-    while (-1 == fd->secret->lockCount)
-        PR_WaitCondVar(_pr_flock_cv, PR_INTERVAL_NO_TIMEOUT);
-    if (0 == fd->secret->lockCount)
-    {
-        fd->secret->lockCount = -1;
-        PR_Unlock(_pr_flock_lock);
-        status = _PR_MD_LOCKFILE(fd->secret->md.osfd);
-        PR_Lock(_pr_flock_lock);
-        fd->secret->lockCount = (PR_SUCCESS == status) ? 1 : 0;
-        PR_NotifyAllCondVar(_pr_flock_cv);
-    }
-    else
-    {
-        fd->secret->lockCount += 1;
-    }
-    PR_Unlock(_pr_flock_lock);
-
-    return status;
-}  /* PR_LockFile */
-
-PR_IMPLEMENT(PRStatus) PR_TLockFile(PRFileDesc *fd)
-{
-    PRStatus status = PR_SUCCESS;
-
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    PR_Lock(_pr_flock_lock);
-    if (0 == fd->secret->lockCount)
-    {
-        status = _PR_MD_TLOCKFILE(fd->secret->md.osfd);
-        if (PR_SUCCESS == status) fd->secret->lockCount = 1;
-    }
-    else fd->secret->lockCount += 1;
-    PR_Unlock(_pr_flock_lock);
-
-    return status;
-}  /* PR_TLockFile */
-
-PR_IMPLEMENT(PRStatus) PR_UnlockFile(PRFileDesc *fd)
-{
-    PRStatus status = PR_SUCCESS;
-
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    PR_Lock(_pr_flock_lock);
-    if (fd->secret->lockCount == 1)
-    {
-        status = _PR_MD_UNLOCKFILE(fd->secret->md.osfd);
-        if (PR_SUCCESS == status) fd->secret->lockCount = 0;
-    }
-    else fd->secret->lockCount -= 1;
-    PR_Unlock(_pr_flock_lock);
-
-    return status;
-}
-
-/*
- * The next two entry points should not be in the API, but they are
- * defined here for historical (or hysterical) reasons.
- */
-
-#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
-static PRInt32 PR_GetSysfdTableMax(void)
-#else /* !VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
-PRInt32 PR_GetSysfdTableMax(void)
-#endif /* !VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
-{
-#if defined(XP_UNIX) && !defined(AIX) && !defined(VMS)
-    struct rlimit rlim;
-
-    if ( getrlimit(RLIMIT_NOFILE, &rlim) < 0)
-       return -1;
-
-    return rlim.rlim_max;
-#elif defined(AIX) || defined(VMS)
-    return sysconf(_SC_OPEN_MAX);
-#endif
-}
-
-#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
-static PRInt32 PR_SetSysfdTableSize(PRIntn table_size)
-#else /* !VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
-PRInt32 PR_SetSysfdTableSize(PRIntn table_size)
-#endif /* !VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
-{
-#if defined(XP_UNIX) && !defined(AIX) && !defined(VMS)
-    struct rlimit rlim;
-    PRInt32 tableMax = PR_GetSysfdTableMax();
-
-    if (tableMax < 0) return -1;
-    rlim.rlim_max = tableMax;
-
-    /* Grow as much as we can; even if too big */
-    if ( rlim.rlim_max < table_size )
-        rlim.rlim_cur = rlim.rlim_max;
-    else
-        rlim.rlim_cur = table_size;
-
-    if ( setrlimit(RLIMIT_NOFILE, &rlim) < 0)
-        return -1;
-
-    return rlim.rlim_cur;
-#elif defined(AIX) || defined(VMS)
-    return -1;
-#endif
-}
-
-/*
- * PR_Stat is supported for backward compatibility; some existing Java
- * code uses it.  New code should use PR_GetFileInfo.
- */
-
-#ifndef NO_NSPR_10_SUPPORT
-PR_IMPLEMENT(PRInt32) PR_Stat(const char *name, struct stat *buf)
-{
-    static PRBool unwarned = PR_TRUE;
-    if (unwarned) unwarned = _PR_Obsolete("PR_Stat", "PR_GetFileInfo");
-
-    if (pt_TestAbort()) return -1;
-
-    if (-1 == stat(name, buf)) {
-        pt_MapError(_PR_MD_MAP_STAT_ERROR, errno);
-        return -1;
-    } else {
-        return 0;
-    }
-}
-#endif /* ! NO_NSPR_10_SUPPORT */
-
-
-PR_IMPLEMENT(void) PR_FD_ZERO(PR_fd_set *set)
-{
-    static PRBool unwarned = PR_TRUE;
-    if (unwarned) unwarned = _PR_Obsolete("PR_FD_ZERO (PR_Select)", "PR_Poll");
-    memset(set, 0, sizeof(PR_fd_set));
-}
-
-PR_IMPLEMENT(void) PR_FD_SET(PRFileDesc *fh, PR_fd_set *set)
-{
-    static PRBool unwarned = PR_TRUE;
-    if (unwarned) unwarned = _PR_Obsolete("PR_FD_SET (PR_Select)", "PR_Poll");
-    PR_ASSERT( set->hsize < PR_MAX_SELECT_DESC );
-
-    set->harray[set->hsize++] = fh;
-}
-
-PR_IMPLEMENT(void) PR_FD_CLR(PRFileDesc *fh, PR_fd_set *set)
-{
-    PRUint32 index, index2;
-    static PRBool unwarned = PR_TRUE;
-    if (unwarned) unwarned = _PR_Obsolete("PR_FD_CLR (PR_Select)", "PR_Poll");
-
-    for (index = 0; index<set->hsize; index++)
-       if (set->harray[index] == fh) {
-           for (index2=index; index2 < (set->hsize-1); index2++) {
-               set->harray[index2] = set->harray[index2+1];
-           }
-           set->hsize--;
-           break;
-       }
-}
-
-PR_IMPLEMENT(PRInt32) PR_FD_ISSET(PRFileDesc *fh, PR_fd_set *set)
-{
-    PRUint32 index;
-    static PRBool unwarned = PR_TRUE;
-    if (unwarned) unwarned = _PR_Obsolete("PR_FD_ISSET (PR_Select)", "PR_Poll");
-    for (index = 0; index<set->hsize; index++)
-       if (set->harray[index] == fh) {
-           return 1;
-       }
-    return 0;
-}
-
-PR_IMPLEMENT(void) PR_FD_NSET(PRInt32 fd, PR_fd_set *set)
-{
-    static PRBool unwarned = PR_TRUE;
-    if (unwarned) unwarned = _PR_Obsolete("PR_FD_NSET (PR_Select)", "PR_Poll");
-    PR_ASSERT( set->nsize < PR_MAX_SELECT_DESC );
-
-    set->narray[set->nsize++] = fd;
-}
-
-PR_IMPLEMENT(void) PR_FD_NCLR(PRInt32 fd, PR_fd_set *set)
-{
-    PRUint32 index, index2;
-    static PRBool unwarned = PR_TRUE;
-    if (unwarned) unwarned = _PR_Obsolete("PR_FD_NCLR (PR_Select)", "PR_Poll");
-
-    for (index = 0; index<set->nsize; index++)
-       if (set->narray[index] == fd) {
-           for (index2=index; index2 < (set->nsize-1); index2++) {
-               set->narray[index2] = set->narray[index2+1];
-           }
-           set->nsize--;
-           break;
-       }
-}
-
-PR_IMPLEMENT(PRInt32) PR_FD_NISSET(PRInt32 fd, PR_fd_set *set)
-{
-    PRUint32 index;
-    static PRBool unwarned = PR_TRUE;
-    if (unwarned) unwarned = _PR_Obsolete("PR_FD_NISSET (PR_Select)", "PR_Poll");
-    for (index = 0; index<set->nsize; index++)
-       if (set->narray[index] == fd) {
-           return 1;
-       }
-    return 0;
-}
-
-#include <sys/types.h>
-#include <sys/time.h>
-#if !defined(SUNOS4) && !defined(HPUX) && !defined(LINUX)
-#include <sys/select.h>
-#endif
-
-static PRInt32
-_PR_getset(PR_fd_set *pr_set, fd_set *set)
-{
-    PRUint32 index;
-    PRInt32 max = 0;
-
-    if (!pr_set)
-        return 0;
-
-    FD_ZERO(set);
-
-    /* First set the pr file handle osfds */
-    for (index=0; index<pr_set->hsize; index++) {
-        FD_SET(pr_set->harray[index]->secret->md.osfd, set);
-        if (pr_set->harray[index]->secret->md.osfd > max)
-            max = pr_set->harray[index]->secret->md.osfd;
-    }
-    /* Second set the native osfds */
-    for (index=0; index<pr_set->nsize; index++) {
-        FD_SET(pr_set->narray[index], set);
-        if (pr_set->narray[index] > max)
-            max = pr_set->narray[index];
-    }
-    return max;
-}
-
-static void
-_PR_setset(PR_fd_set *pr_set, fd_set *set)
-{
-    PRUint32 index, last_used;
-
-    if (!pr_set)
-        return;
-
-    for (last_used=0, index=0; index<pr_set->hsize; index++) {
-        if ( FD_ISSET(pr_set->harray[index]->secret->md.osfd, set) ) {
-            pr_set->harray[last_used++] = pr_set->harray[index];
-        }
-    }
-    pr_set->hsize = last_used;
-
-    for (last_used=0, index=0; index<pr_set->nsize; index++) {
-        if ( FD_ISSET(pr_set->narray[index], set) ) {
-            pr_set->narray[last_used++] = pr_set->narray[index];
-        }
-    }
-    pr_set->nsize = last_used;
-}
-
-PR_IMPLEMENT(PRInt32) PR_Select(
-    PRInt32 unused, PR_fd_set *pr_rd, PR_fd_set *pr_wr,
-    PR_fd_set *pr_ex, PRIntervalTime timeout)
-{
-    fd_set rd, wr, ex;
-    struct timeval tv, *tvp;
-    PRInt32 max, max_fd;
-    PRInt32 rv;
-    /*
-     * For restarting select() if it is interrupted by a Unix signal.
-     * We use these variables to figure out how much time has elapsed
-     * and how much of the timeout still remains.
-     */
-    PRIntervalTime start, elapsed, remaining;
-
-    static PRBool unwarned = PR_TRUE;
-    if (unwarned) unwarned = _PR_Obsolete( "PR_Select", "PR_Poll");
-
-    FD_ZERO(&rd);
-    FD_ZERO(&wr);
-    FD_ZERO(&ex);
-
-    max_fd = _PR_getset(pr_rd, &rd);
-    max_fd = (max = _PR_getset(pr_wr, &wr))>max_fd?max:max_fd;
-    max_fd = (max = _PR_getset(pr_ex, &ex))>max_fd?max:max_fd;
-
-    if (timeout == PR_INTERVAL_NO_TIMEOUT) {
-        tvp = NULL;
-    } else {
-        tv.tv_sec = (PRInt32)PR_IntervalToSeconds(timeout);
-        tv.tv_usec = (PRInt32)PR_IntervalToMicroseconds(
-                timeout - PR_SecondsToInterval(tv.tv_sec));
-        tvp = &tv;
-        start = PR_IntervalNow();
-    }
-
-retry:
-    rv = select(max_fd + 1, (_PRSelectFdSetArg_t) &rd,
-        (_PRSelectFdSetArg_t) &wr, (_PRSelectFdSetArg_t) &ex, tvp);
-
-    if (rv == -1 && errno == EINTR) {
-        if (timeout == PR_INTERVAL_NO_TIMEOUT) {
-            goto retry;
-        } else {
-            elapsed = (PRIntervalTime) (PR_IntervalNow() - start);
-            if (elapsed > timeout) {
-                rv = 0;  /* timed out */
-            } else {
-                remaining = timeout - elapsed;
-                tv.tv_sec = (PRInt32)PR_IntervalToSeconds(remaining);
-                tv.tv_usec = (PRInt32)PR_IntervalToMicroseconds(
-                        remaining - PR_SecondsToInterval(tv.tv_sec));
-                goto retry;
-            }
-        }
-    }
-
-    if (rv > 0) {
-        _PR_setset(pr_rd, &rd);
-        _PR_setset(pr_wr, &wr);
-        _PR_setset(pr_ex, &ex);
-    } else if (rv == -1) {
-        pt_MapError(_PR_MD_MAP_SELECT_ERROR, errno);
-    }
-    return rv;
-}
-
 /* ptio.c */