X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fmmap-align-internal.h;fp=include%2Fbabeltrace%2Fmmap-align-internal.h;h=0000000000000000000000000000000000000000;hp=bef6378762bef0fc0a59ee2b38324eae8f25df15;hb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;hpb=7e69c04f557e46fb50e5a888a3bc3451afbd3b8e

diff --git a/include/babeltrace/mmap-align-internal.h b/include/babeltrace/mmap-align-internal.h
deleted file mode 100644
index bef63787..00000000
--- a/include/babeltrace/mmap-align-internal.h
+++ /dev/null
@@ -1,132 +0,0 @@
-#ifndef _BABELTRACE_MMAP_ALIGN_H
-#define _BABELTRACE_MMAP_ALIGN_H
-
-/*
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/align-internal.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <babeltrace/compat/mman-internal.h>
-#include <babeltrace/common-internal.h>
-
-/*
- * This header implements a wrapper over mmap (mmap_align) that memory
- * maps a file region that is not necessarily multiple of the page size.
- * It returns a structure (instead of a pointer) that contains the mmap
- * pointer (page-aligned) and a pointer to the offset requested within
- * that page. Note: in the current implementation, the "addr" parameter
- * cannot be forced, so we allocate at an address chosen by the OS.
- */
-
-struct mmap_align {
-	void *page_aligned_addr;	/* mmap address, aligned to floor */
-	size_t page_aligned_length;	/* mmap length, containing range */
-
-	void *addr;			/* virtual mmap address */
-	size_t length;			/* virtual mmap length */
-};
-
-#ifdef __WIN32__
-#include <windows.h>
-
-/*
- * On windows the memory mapping offset must be aligned to the memory
- * allocator allocation granularity and not the page size.
- */
-static inline
-off_t get_page_aligned_offset(off_t offset, size_t page_size)
-{
-       SYSTEM_INFO sysinfo;
-
-       GetNativeSystemInfo(&sysinfo);
-
-       return ALIGN_FLOOR(offset, sysinfo.dwAllocationGranularity);
-}
-#else
-static inline
-off_t get_page_aligned_offset(off_t offset, size_t page_size)
-{
-       return ALIGN_FLOOR(offset, page_size);
-}
-#endif
-
-static inline
-struct mmap_align *mmap_align(size_t length, int prot,
-		int flags, int fd, off_t offset)
-{
-	struct mmap_align *mma;
-	off_t page_aligned_offset;	/* mmap offset, aligned to floor */
-	size_t page_size;
-
-	page_size = bt_common_get_page_size();
-
-	mma = malloc(sizeof(*mma));
-	if (!mma)
-		return MAP_FAILED;
-	mma->length = length;
-	page_aligned_offset = get_page_aligned_offset(offset, page_size);
-	/*
-	 * Page aligned length needs to contain the requested range.
-	 * E.g., for a small range that fits within a single page, we might
-	 * require a 2 pages page_aligned_length if the range crosses a page
-	 * boundary.
-	 */
-	mma->page_aligned_length = ALIGN(length + offset - page_aligned_offset, page_size);
-	mma->page_aligned_addr = bt_mmap(NULL, mma->page_aligned_length,
-		prot, flags, fd, page_aligned_offset);
-	if (mma->page_aligned_addr == MAP_FAILED) {
-		free(mma);
-		return MAP_FAILED;
-	}
-	mma->addr = ((uint8_t *) mma->page_aligned_addr) + (offset - page_aligned_offset);
-	return mma;
-}
-
-static inline
-int munmap_align(struct mmap_align *mma)
-{
-	void *page_aligned_addr;
-	size_t page_aligned_length;
-
-	page_aligned_addr = mma->page_aligned_addr;
-	page_aligned_length = mma->page_aligned_length;
-	free(mma);
-	return bt_munmap(page_aligned_addr, page_aligned_length);
-}
-
-static inline
-void *mmap_align_addr(struct mmap_align *mma)
-{
-	return mma->addr;
-}
-
-/*
- * Helper for special-cases, normally unused.
- */
-static inline
-void mmap_align_set_addr(struct mmap_align *mma, void *addr)
-{
-	mma->addr = addr;
-}
-
-#endif /* _BABELTRACE_MMAP_ALIGN_H */