Tarball conversion

3 files changed, 376 insertions, 0 deletions

diff --git a/mmap/unix/common.c b/mmap/unix/common.c
new file mode 100644
index 0000000..1172f3c
--- /dev/null
+++ b/mmap/unix/common.c
@@ -0,0 +1,43 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* common .c
+ * This file has any function that is truly common and platform
+ * neutral.  Or at least that's the theory.
+ * 
+ * The header files are a problem so there are a few #ifdef's to take
+ * care of those.
+ *
+ */
+
+#include "apr.h"
+#include "apr_private.h"
+#include "apr_mmap.h"
+#include "apr_errno.h"
+
+#if APR_HAS_MMAP || defined(BEOS)
+
+APR_DECLARE(apr_status_t) apr_mmap_offset(void **addr, apr_mmap_t *mmap,
+                                          apr_off_t offset)
+{
+    if (offset < 0 || (apr_size_t)offset > mmap->size)
+        return APR_EINVAL;
+    
+    (*addr) = (char *) mmap->mm + offset;
+    return APR_SUCCESS;
+}
+
+#endif
diff --git a/mmap/unix/mmap.c b/mmap/unix/mmap.c
new file mode 100644
index 0000000..6719570
--- /dev/null
+++ b/mmap/unix/mmap.c
@@ -0,0 +1,172 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apr.h"
+#include "apr_private.h"
+#include "apr_general.h"
+#include "apr_strings.h"
+#include "apr_mmap.h"
+#include "apr_errno.h"
+#include "apr_arch_file_io.h"
+#include "apr_portable.h"
+
+/* System headers required for the mmap library */
+#ifdef BEOS
+#include <kernel/OS.h>
+#endif
+#if APR_HAVE_STRING_H
+#include <string.h>
+#endif
+#if APR_HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#ifdef HAVE_SYS_MMAN_H
+#include <sys/mman.h>
+#endif
+
+#if APR_HAS_MMAP || defined(BEOS)
+
+static apr_status_t mmap_cleanup(void *themmap)
+{
+    apr_mmap_t *mm = themmap;
+    apr_mmap_t *next = APR_RING_NEXT(mm,link);
+    int rv = 0;
+
+    /* we no longer refer to the mmaped region */
+    APR_RING_REMOVE(mm,link);
+    APR_RING_NEXT(mm,link) = NULL;
+    APR_RING_PREV(mm,link) = NULL;
+
+    if (next != mm) {
+        /* more references exist, so we're done */
+        return APR_SUCCESS;
+    }
+
+#ifdef BEOS
+    rv = delete_area(mm->area);
+#else
+    rv = munmap(mm->mm, mm->size);
+#endif
+    mm->mm = (void *)-1;
+
+    if (rv == 0) {
+        return APR_SUCCESS;
+    }
+    return errno;
+}
+
+APR_DECLARE(apr_status_t) apr_mmap_create(apr_mmap_t **new, 
+                                          apr_file_t *file, apr_off_t offset, 
+                                          apr_size_t size, apr_int32_t flag, 
+                                          apr_pool_t *cont)
+{
+    void *mm;
+#ifdef BEOS
+    area_id aid = -1;
+    uint32 pages = 0;
+#else
+    apr_int32_t native_flags = 0;
+#endif
+
+#if APR_HAS_LARGE_FILES && defined(HAVE_MMAP64)
+#define mmap mmap64
+#elif APR_HAS_LARGE_FILES && SIZEOF_OFF_T == 4
+    /* LFS but no mmap64: check for overflow */
+    if ((apr_int64_t)offset + size > INT_MAX)
+        return APR_EINVAL;
+#endif
+
+    if (size == 0)
+        return APR_EINVAL;
+    
+    if (file == NULL || file->filedes == -1 || file->buffered)
+        return APR_EBADF;
+    (*new) = (apr_mmap_t *)apr_pcalloc(cont, sizeof(apr_mmap_t));
+    
+#ifdef BEOS
+    /* XXX: mmap shouldn't really change the seek offset */
+    apr_file_seek(file, APR_SET, &offset);
+
+    /* There seems to be some strange interactions that mean our area must
+     * be set as READ & WRITE or writev will fail!  Go figure...
+     * So we ignore the value in flags and always ask for both READ and WRITE
+     */
+    pages = (size + B_PAGE_SIZE -1) / B_PAGE_SIZE;
+    aid = create_area("apr_mmap", &mm , B_ANY_ADDRESS, pages * B_PAGE_SIZE,
+        B_NO_LOCK, B_WRITE_AREA|B_READ_AREA);
+
+    if (aid < B_NO_ERROR) {
+        /* we failed to get an area we can use... */
+        *new = NULL;
+        return APR_ENOMEM;
+    }
+
+    if (aid >= B_NO_ERROR)
+        read(file->filedes, mm, size);
+    
+    (*new)->area = aid;
+#else
+
+    if (flag & APR_MMAP_WRITE) {
+        native_flags |= PROT_WRITE;
+    }
+    if (flag & APR_MMAP_READ) {
+        native_flags |= PROT_READ;
+    }
+
+    mm = mmap(NULL, size, native_flags, MAP_SHARED, file->filedes, offset);
+
+    if (mm == (void *)-1) {
+        /* we failed to get an mmap'd file... */
+        *new = NULL;
+        return errno;
+    }
+#endif
+
+    (*new)->mm = mm;
+    (*new)->size = size;
+    (*new)->cntxt = cont;
+    APR_RING_ELEM_INIT(*new, link);
+
+    /* register the cleanup... */
+    apr_pool_cleanup_register((*new)->cntxt, (void*)(*new), mmap_cleanup,
+             apr_pool_cleanup_null);
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_mmap_dup(apr_mmap_t **new_mmap,
+                                       apr_mmap_t *old_mmap,
+                                       apr_pool_t *p)
+{
+    *new_mmap = (apr_mmap_t *)apr_pmemdup(p, old_mmap, sizeof(apr_mmap_t));
+    (*new_mmap)->cntxt = p;
+
+    APR_RING_INSERT_AFTER(old_mmap, *new_mmap, link);
+
+    apr_pool_cleanup_register(p, *new_mmap, mmap_cleanup,
+                              apr_pool_cleanup_null);
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_mmap_delete(apr_mmap_t *mm)
+{
+    return apr_pool_cleanup_run(mm->cntxt, mm, mmap_cleanup);
+}
+
+#endif
diff --git a/mmap/win32/mmap.c b/mmap/win32/mmap.c
new file mode 100644
index 0000000..d5d88ae
--- /dev/null
+++ b/mmap/win32/mmap.c
@@ -0,0 +1,161 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apr.h"
+#include "apr_private.h"
+#include "apr_general.h"
+#include "apr_mmap.h"
+#include "apr_errno.h"
+#include "apr_arch_file_io.h"
+#include "apr_portable.h"
+#include "apr_strings.h"
+
+#if APR_HAS_MMAP
+
+static apr_status_t mmap_cleanup(void *themmap)
+{
+    apr_mmap_t *mm = themmap;
+    apr_mmap_t *next = APR_RING_NEXT(mm,link);
+
+    /* we no longer refer to the mmaped region */
+    APR_RING_REMOVE(mm,link);
+    APR_RING_NEXT(mm,link) = NULL;
+    APR_RING_PREV(mm,link) = NULL;
+
+    if (next != mm) {
+        /* more references exist, so we're done */
+        return APR_SUCCESS;
+    }
+
+    if (mm->mv) {
+        if (!UnmapViewOfFile(mm->mv))
+        {
+            apr_status_t rv = apr_get_os_error();
+            CloseHandle(mm->mhandle);
+            mm->mv = NULL;
+            mm->mhandle = NULL;
+            return rv;
+        }
+        mm->mv = NULL;
+    }
+    if (mm->mhandle) 
+    {
+        if (!CloseHandle(mm->mhandle))
+        {
+            apr_status_t rv = apr_get_os_error();
+            CloseHandle(mm->mhandle);
+            mm->mhandle = NULL;
+            return rv;
+        }
+        mm->mhandle = NULL;
+    }
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_mmap_create(apr_mmap_t **new, apr_file_t *file,
+                                          apr_off_t offset, apr_size_t size,
+                                          apr_int32_t flag, apr_pool_t *cont)
+{
+    static DWORD memblock = 0;
+    DWORD fmaccess = 0;
+    DWORD mvaccess = 0;
+    DWORD offlo;
+    DWORD offhi;
+
+    if (size == 0)
+        return APR_EINVAL;
+    
+    if (flag & APR_MMAP_WRITE)
+        fmaccess |= PAGE_READWRITE;
+    else if (flag & APR_MMAP_READ)
+        fmaccess |= PAGE_READONLY;
+
+    if (flag & APR_MMAP_READ)
+        mvaccess |= FILE_MAP_READ;
+    if (flag & APR_MMAP_WRITE)
+        mvaccess |= FILE_MAP_WRITE;
+
+    if (!file || !file->filehand || file->filehand == INVALID_HANDLE_VALUE
+        || file->buffered)
+        return APR_EBADF;
+
+    if (!memblock)
+    {
+        SYSTEM_INFO si;
+        GetSystemInfo(&si);
+        memblock = si.dwAllocationGranularity;
+    }   
+    
+    *new = apr_pcalloc(cont, sizeof(apr_mmap_t));
+    (*new)->pstart = (offset / memblock) * memblock;
+    (*new)->poffset = offset - (*new)->pstart;
+    (*new)->psize = (apr_size_t)((*new)->poffset) + size;
+    /* The size of the CreateFileMapping object is the current size
+     * of the size of the mmap object (e.g. file size), not the size 
+     * of the mapped region!
+     */
+
+    (*new)->mhandle = CreateFileMapping(file->filehand, NULL, fmaccess,
+                                        0, 0, NULL);
+    if (!(*new)->mhandle || (*new)->mhandle == INVALID_HANDLE_VALUE)
+    {
+        *new = NULL;
+        return apr_get_os_error();
+    }
+
+    offlo = (DWORD)(*new)->pstart;
+    offhi = (DWORD)((*new)->pstart >> 32);
+    (*new)->mv = MapViewOfFile((*new)->mhandle, mvaccess, offhi,
+                               offlo, (*new)->psize);
+    if (!(*new)->mv)
+    {
+        apr_status_t rv = apr_get_os_error();
+        CloseHandle((*new)->mhandle);
+        *new = NULL;
+        return rv;
+    }
+
+    (*new)->mm = (char*)((*new)->mv) + (*new)->poffset;
+    (*new)->size = size;
+    (*new)->cntxt = cont;
+    APR_RING_ELEM_INIT(*new, link);
+
+    /* register the cleanup... */
+    apr_pool_cleanup_register((*new)->cntxt, (void*)(*new), mmap_cleanup,
+                         apr_pool_cleanup_null);
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_mmap_dup(apr_mmap_t **new_mmap,
+                                       apr_mmap_t *old_mmap,
+                                       apr_pool_t *p)
+{
+    *new_mmap = (apr_mmap_t *)apr_pmemdup(p, old_mmap, sizeof(apr_mmap_t));
+    (*new_mmap)->cntxt = p;
+
+    APR_RING_INSERT_AFTER(old_mmap, *new_mmap, link);
+
+    apr_pool_cleanup_register(p, *new_mmap, mmap_cleanup,
+                              apr_pool_cleanup_null);
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_mmap_delete(apr_mmap_t *mm)
+{
+    return apr_pool_cleanup_run(mm->cntxt, mm, mmap_cleanup);
+}
+
+#endif