зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1710097 - Use the memmap2 crate in place of the unmaintained memmap crate r=mstange
Differential Revision: https://phabricator.services.mozilla.com/D124653
This commit is contained in:
Gabriele Svelto
Родитель
212446b536
Коммит
ef5658276d
|
|
@ -2886,16 +2886,6 @@ version = "2.4.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
|
||||
|
||||
[[package]]
|
||||
name = "memmap"
|
||||
version = "0.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "memmap2"
|
||||
version = "0.2.3"
|
||||
|
|
@ -3872,7 +3862,7 @@ name = "profiler_helper"
|
|||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"goblin",
|
||||
"memmap",
|
||||
"memmap2 0.3.0",
|
||||
"object",
|
||||
"rustc-demangle",
|
||||
"thin-vec",
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
{"files":{"Cargo.toml":"4f6e813f7480758c57f9d180ade1276761a499245846fadb7a96a234342506ca","LICENSE-APACHE":"04ea4849dba9dcae07113850c6f1b1a69052c625210639914eee352023f750ad","LICENSE-MIT":"bd1d8f06a6ce1f7645991e347b95864b970eed43624305eb4bb78c09aef8692d","README.md":"193c46fdc56e4ca953ec7179bf4fd5f302b46557d86181b56b7d6294f25eaa96","ci/install.sh":"8841985e8645d391829ba52cd669bc5c5d98b1fdd8979c7cfd3cd3573c4a0a4b","ci/script.sh":"04127e49ac7346941f0a21d2e1a9177719e62f1e92755579c3601fc98e33006c","examples/cat.rs":"86cfee28482f92ea4c4ae4ebdff97d70fc095208cc5de09db39994118468d1ff","src/lib.rs":"82e116f2b1fbfc7e987a0dfde7e73e51b231f38f33b76369c6de0d46b63c60e1","src/unix.rs":"93fb4fe71dd04e2d1c5e1b6a285bce8b729456bdddbd758aa6768e8ab30ed143","src/windows.rs":"21566160bc1b2f2f82988b9e1274b3b700034cad0e5ca723695863a432da4896"},"package":"6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"}
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
|
||||
#
|
||||
# When uploading crates to the registry Cargo will automatically
|
||||
# "normalize" Cargo.toml files for maximal compatibility
|
||||
# with all versions of Cargo and also rewrite `path` dependencies
|
||||
# to registry (e.g. crates.io) dependencies
|
||||
#
|
||||
# If you believe there's an error in this file please file an
|
||||
# issue against the rust-lang/cargo repository. If you're
|
||||
# editing this file be aware that the upstream Cargo.toml
|
||||
# will likely look very different (and much more reasonable)
|
||||
|
||||
[package]
|
||||
name = "memmap"
|
||||
version = "0.7.0"
|
||||
authors = ["Dan Burkert <dan@danburkert.com>"]
|
||||
description = "Cross-platform Rust API for memory-mapped file IO"
|
||||
documentation = "https://docs.rs/memmap"
|
||||
keywords = ["mmap", "memory-map", "io", "file"]
|
||||
license = "MIT/Apache-2.0"
|
||||
repository = "https://github.com/danburkert/memmap-rs"
|
||||
[dev-dependencies.tempdir]
|
||||
version = "0.3"
|
||||
[target."cfg(unix)".dependencies.libc]
|
||||
version = "0.2"
|
||||
[target."cfg(windows)".dependencies.winapi]
|
||||
version = "0.3"
|
||||
features = ["basetsd", "handleapi", "memoryapi", "minwindef", "std", "sysinfoapi"]
|
||||
[badges.appveyor]
|
||||
repository = "danburkert/mmap"
|
||||
|
||||
[badges.travis-ci]
|
||||
repository = "danburkert/memmap-rs"
|
||||
|
|
@ -1,201 +0,0 @@
|
|||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [2015] [Dan Burkert]
|
||||
|
||||
Licensed 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.
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
Copyright (c) 2015 Dan Burkert
|
||||
|
||||
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.
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
# memmap
|
||||
|
||||
A Rust library for cross-platform memory mapped IO.
|
||||
|
||||
[](https://travis-ci.org/danburkert/memmap-rs)
|
||||
[](https://ci.appveyor.com/project/danburkert/mmap)
|
||||
[](https://docs.rs/memmap)
|
||||
[](https://crates.io/crates/memmap)
|
||||
|
||||
## Features
|
||||
|
||||
- [x] file-backed memory maps
|
||||
- [x] anonymous memory maps
|
||||
- [x] synchronous and asynchronous flushing
|
||||
- [x] copy-on-write memory maps
|
||||
- [x] read-only memory maps
|
||||
- [x] stack support (`MAP_STACK` on unix)
|
||||
- [x] executable memory maps
|
||||
- [ ] huge page support
|
||||
|
||||
## Platforms
|
||||
|
||||
`memmap` should work on any platform supported by
|
||||
[`libc`](https://github.com/rust-lang-nursery/libc#platforms-and-documentation).
|
||||
`memmap` requires Rust stable 1.13 or greater.
|
||||
|
||||
`memmap` is continuously tested on:
|
||||
* `x86_64-unknown-linux-gnu` (Linux)
|
||||
* `i686-unknown-linux-gnu`
|
||||
* `x86_64-unknown-linux-musl` (Linux MUSL)
|
||||
* `x86_64-apple-darwin` (OSX)
|
||||
* `i686-apple-darwin`
|
||||
* `x86_64-pc-windows-msvc` (Windows)
|
||||
* `i686-pc-windows-msvc`
|
||||
* `x86_64-pc-windows-gnu`
|
||||
* `i686-pc-windows-gnu`
|
||||
|
||||
`memmap` is continuously cross-compiled against:
|
||||
* `arm-linux-androideabi` (Android)
|
||||
* `aarch64-unknown-linux-gnu` (ARM)
|
||||
* `arm-unknown-linux-gnueabihf`
|
||||
* `mips-unknown-linux-gnu` (MIPS)
|
||||
* `x86_64-apple-ios` (iOS)
|
||||
* `i686-apple-ios`
|
||||
|
||||
## License
|
||||
|
||||
`memmap` is primarily distributed under the terms of both the MIT license and the
|
||||
Apache License (Version 2.0).
|
||||
|
||||
See [LICENSE-APACHE](LICENSE-APACHE), [LICENSE-MIT](LICENSE-MIT) for details.
|
||||
|
||||
Copyright (c) 2015 Dan Burkert.
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
set -ex
|
||||
|
||||
main() {
|
||||
local target=
|
||||
if [ $TRAVIS_OS_NAME = linux ]; then
|
||||
target=x86_64-unknown-linux-musl
|
||||
sort=sort
|
||||
else
|
||||
target=x86_64-apple-darwin
|
||||
sort=gsort # for `sort --sort-version`, from brew's coreutils.
|
||||
fi
|
||||
|
||||
# Builds for iOS are done on OSX, but require the specific target to be
|
||||
# installed.
|
||||
case $TARGET in
|
||||
aarch64-apple-ios)
|
||||
rustup target install aarch64-apple-ios
|
||||
;;
|
||||
armv7-apple-ios)
|
||||
rustup target install armv7-apple-ios
|
||||
;;
|
||||
armv7s-apple-ios)
|
||||
rustup target install armv7s-apple-ios
|
||||
;;
|
||||
i386-apple-ios)
|
||||
rustup target install i386-apple-ios
|
||||
;;
|
||||
x86_64-apple-ios)
|
||||
rustup target install x86_64-apple-ios
|
||||
;;
|
||||
esac
|
||||
|
||||
# This fetches latest stable release
|
||||
local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \
|
||||
| cut -d/ -f3 \
|
||||
| grep -E '^v[0.1.0-9.]+$' \
|
||||
| $sort --version-sort \
|
||||
| tail -n1)
|
||||
curl -LSfs https://japaric.github.io/trust/install.sh | \
|
||||
sh -s -- \
|
||||
--force \
|
||||
--git japaric/cross \
|
||||
--tag $tag \
|
||||
--target $target
|
||||
}
|
||||
|
||||
main
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
# This script takes care of testing your crate
|
||||
|
||||
set -ex
|
||||
|
||||
main() {
|
||||
cross build --target $TARGET
|
||||
cross build --target $TARGET --release
|
||||
|
||||
if [ ! -z $DISABLE_TESTS ]; then
|
||||
return
|
||||
fi
|
||||
|
||||
cross test --target $TARGET
|
||||
cross test --target $TARGET --release
|
||||
}
|
||||
|
||||
# we don't run the "test phase" when doing deploys
|
||||
if [ -z $TRAVIS_TAG ]; then
|
||||
main
|
||||
fi
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
extern crate memmap;
|
||||
|
||||
use std::env;
|
||||
use std::fs::File;
|
||||
use std::io::{self, Write};
|
||||
|
||||
use memmap::Mmap;
|
||||
|
||||
/// Output a file's contents to stdout. The file path must be provided as the first process
|
||||
/// argument.
|
||||
fn main() {
|
||||
let path = env::args()
|
||||
.nth(1)
|
||||
.expect("supply a single path as the program argument");
|
||||
|
||||
let file = File::open(path).expect("failed to open the file");
|
||||
|
||||
let mmap = unsafe { Mmap::map(&file).expect("failed to map the file") };
|
||||
|
||||
io::stdout()
|
||||
.write_all(&mmap[..])
|
||||
.expect("failed to output the file contents");
|
||||
}
|
||||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -1,214 +0,0 @@
|
|||
extern crate libc;
|
||||
|
||||
use std::fs::File;
|
||||
use std::os::unix::io::{AsRawFd, RawFd};
|
||||
use std::{io, ptr};
|
||||
|
||||
#[cfg(any(
|
||||
all(target_os = "linux", not(target_arch = "mips")),
|
||||
target_os = "freebsd",
|
||||
target_os = "android"
|
||||
))]
|
||||
const MAP_STACK: libc::c_int = libc::MAP_STACK;
|
||||
|
||||
#[cfg(not(any(
|
||||
all(target_os = "linux", not(target_arch = "mips")),
|
||||
target_os = "freebsd",
|
||||
target_os = "android"
|
||||
)))]
|
||||
const MAP_STACK: libc::c_int = 0;
|
||||
|
||||
pub struct MmapInner {
|
||||
ptr: *mut libc::c_void,
|
||||
len: usize,
|
||||
}
|
||||
|
||||
impl MmapInner {
|
||||
/// Creates a new `MmapInner`.
|
||||
///
|
||||
/// This is a thin wrapper around the `mmap` sytem call.
|
||||
fn new(
|
||||
len: usize,
|
||||
prot: libc::c_int,
|
||||
flags: libc::c_int,
|
||||
file: RawFd,
|
||||
offset: u64,
|
||||
) -> io::Result<MmapInner> {
|
||||
let alignment = offset % page_size() as u64;
|
||||
let aligned_offset = offset - alignment;
|
||||
let aligned_len = len + alignment as usize;
|
||||
if aligned_len == 0 {
|
||||
// Normally the OS would catch this, but it segfaults under QEMU.
|
||||
return Err(io::Error::new(
|
||||
io::ErrorKind::InvalidInput,
|
||||
"memory map must have a non-zero length",
|
||||
));
|
||||
}
|
||||
|
||||
unsafe {
|
||||
let ptr = libc::mmap(
|
||||
ptr::null_mut(),
|
||||
aligned_len as libc::size_t,
|
||||
prot,
|
||||
flags,
|
||||
file,
|
||||
aligned_offset as libc::off_t,
|
||||
);
|
||||
|
||||
if ptr == libc::MAP_FAILED {
|
||||
Err(io::Error::last_os_error())
|
||||
} else {
|
||||
Ok(MmapInner {
|
||||
ptr: ptr.offset(alignment as isize),
|
||||
len: len,
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn map(len: usize, file: &File, offset: u64) -> io::Result<MmapInner> {
|
||||
MmapInner::new(
|
||||
len,
|
||||
libc::PROT_READ,
|
||||
libc::MAP_SHARED,
|
||||
file.as_raw_fd(),
|
||||
offset,
|
||||
)
|
||||
}
|
||||
|
||||
pub fn map_exec(len: usize, file: &File, offset: u64) -> io::Result<MmapInner> {
|
||||
MmapInner::new(
|
||||
len,
|
||||
libc::PROT_READ | libc::PROT_EXEC,
|
||||
libc::MAP_SHARED,
|
||||
file.as_raw_fd(),
|
||||
offset,
|
||||
)
|
||||
}
|
||||
|
||||
pub fn map_mut(len: usize, file: &File, offset: u64) -> io::Result<MmapInner> {
|
||||
MmapInner::new(
|
||||
len,
|
||||
libc::PROT_READ | libc::PROT_WRITE,
|
||||
libc::MAP_SHARED,
|
||||
file.as_raw_fd(),
|
||||
offset,
|
||||
)
|
||||
}
|
||||
|
||||
pub fn map_copy(len: usize, file: &File, offset: u64) -> io::Result<MmapInner> {
|
||||
MmapInner::new(
|
||||
len,
|
||||
libc::PROT_READ | libc::PROT_WRITE,
|
||||
libc::MAP_PRIVATE,
|
||||
file.as_raw_fd(),
|
||||
offset,
|
||||
)
|
||||
}
|
||||
|
||||
/// Open an anonymous memory map.
|
||||
pub fn map_anon(len: usize, stack: bool) -> io::Result<MmapInner> {
|
||||
let stack = if stack { MAP_STACK } else { 0 };
|
||||
MmapInner::new(
|
||||
len,
|
||||
libc::PROT_READ | libc::PROT_WRITE,
|
||||
libc::MAP_SHARED | libc::MAP_ANON | stack,
|
||||
-1,
|
||||
0,
|
||||
)
|
||||
}
|
||||
|
||||
pub fn flush(&self, offset: usize, len: usize) -> io::Result<()> {
|
||||
let alignment = (self.ptr as usize + offset) % page_size();
|
||||
let offset = offset as isize - alignment as isize;
|
||||
let len = len + alignment;
|
||||
let result =
|
||||
unsafe { libc::msync(self.ptr.offset(offset), len as libc::size_t, libc::MS_SYNC) };
|
||||
if result == 0 {
|
||||
Ok(())
|
||||
} else {
|
||||
Err(io::Error::last_os_error())
|
||||
}
|
||||
}
|
||||
|
||||
pub fn flush_async(&self, offset: usize, len: usize) -> io::Result<()> {
|
||||
let alignment = offset % page_size();
|
||||
let aligned_offset = offset - alignment;
|
||||
let aligned_len = len + alignment;
|
||||
let result = unsafe {
|
||||
libc::msync(
|
||||
self.ptr.offset(aligned_offset as isize),
|
||||
aligned_len as libc::size_t,
|
||||
libc::MS_ASYNC,
|
||||
)
|
||||
};
|
||||
if result == 0 {
|
||||
Ok(())
|
||||
} else {
|
||||
Err(io::Error::last_os_error())
|
||||
}
|
||||
}
|
||||
|
||||
fn mprotect(&mut self, prot: libc::c_int) -> io::Result<()> {
|
||||
unsafe {
|
||||
let alignment = self.ptr as usize % page_size();
|
||||
let ptr = self.ptr.offset(-(alignment as isize));
|
||||
let len = self.len + alignment;
|
||||
if libc::mprotect(ptr, len, prot) == 0 {
|
||||
Ok(())
|
||||
} else {
|
||||
Err(io::Error::last_os_error())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn make_read_only(&mut self) -> io::Result<()> {
|
||||
self.mprotect(libc::PROT_READ)
|
||||
}
|
||||
|
||||
pub fn make_exec(&mut self) -> io::Result<()> {
|
||||
self.mprotect(libc::PROT_READ | libc::PROT_EXEC)
|
||||
}
|
||||
|
||||
pub fn make_mut(&mut self) -> io::Result<()> {
|
||||
self.mprotect(libc::PROT_READ | libc::PROT_WRITE)
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn ptr(&self) -> *const u8 {
|
||||
self.ptr as *const u8
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn mut_ptr(&mut self) -> *mut u8 {
|
||||
self.ptr as *mut u8
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn len(&self) -> usize {
|
||||
self.len
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for MmapInner {
|
||||
fn drop(&mut self) {
|
||||
let alignment = self.ptr as usize % page_size();
|
||||
unsafe {
|
||||
assert!(
|
||||
libc::munmap(
|
||||
self.ptr.offset(-(alignment as isize)),
|
||||
(self.len + alignment) as libc::size_t
|
||||
) == 0,
|
||||
"unable to unmap mmap: {}",
|
||||
io::Error::last_os_error()
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
unsafe impl Sync for MmapInner {}
|
||||
unsafe impl Send for MmapInner {}
|
||||
|
||||
fn page_size() -> usize {
|
||||
unsafe { libc::sysconf(libc::_SC_PAGESIZE) as usize }
|
||||
}
|
||||
|
|
@ -1,300 +0,0 @@
|
|||
use std::fs::File;
|
||||
use std::os::raw::c_void;
|
||||
use std::os::windows::io::{AsRawHandle, RawHandle};
|
||||
use std::{io, mem, ptr};
|
||||
|
||||
use winapi::shared::basetsd::SIZE_T;
|
||||
use winapi::shared::minwindef::DWORD;
|
||||
use winapi::um::handleapi::{CloseHandle, INVALID_HANDLE_VALUE};
|
||||
use winapi::um::memoryapi::{
|
||||
CreateFileMappingW, FlushViewOfFile, MapViewOfFile, UnmapViewOfFile, VirtualProtect,
|
||||
FILE_MAP_ALL_ACCESS, FILE_MAP_COPY, FILE_MAP_EXECUTE, FILE_MAP_READ, FILE_MAP_WRITE,
|
||||
};
|
||||
use winapi::um::sysinfoapi::GetSystemInfo;
|
||||
use winapi::um::winnt::{
|
||||
PAGE_EXECUTE_READ, PAGE_EXECUTE_READWRITE, PAGE_EXECUTE_WRITECOPY, PAGE_READONLY,
|
||||
PAGE_READWRITE, PAGE_WRITECOPY,
|
||||
};
|
||||
|
||||
pub struct MmapInner {
|
||||
file: Option<File>,
|
||||
ptr: *mut c_void,
|
||||
len: usize,
|
||||
copy: bool,
|
||||
}
|
||||
|
||||
impl MmapInner {
|
||||
/// Creates a new `MmapInner`.
|
||||
///
|
||||
/// This is a thin wrapper around the `CreateFileMappingW` and `MapViewOfFile` system calls.
|
||||
pub fn new(
|
||||
file: &File,
|
||||
protect: DWORD,
|
||||
access: DWORD,
|
||||
offset: u64,
|
||||
len: usize,
|
||||
copy: bool,
|
||||
) -> io::Result<MmapInner> {
|
||||
let alignment = offset % allocation_granularity() as u64;
|
||||
let aligned_offset = offset - alignment as u64;
|
||||
let aligned_len = len + alignment as usize;
|
||||
|
||||
unsafe {
|
||||
let handle = CreateFileMappingW(
|
||||
file.as_raw_handle(),
|
||||
ptr::null_mut(),
|
||||
protect,
|
||||
0,
|
||||
0,
|
||||
ptr::null(),
|
||||
);
|
||||
if handle == ptr::null_mut() {
|
||||
return Err(io::Error::last_os_error());
|
||||
}
|
||||
|
||||
let ptr = MapViewOfFile(
|
||||
handle,
|
||||
access,
|
||||
(aligned_offset >> 16 >> 16) as DWORD,
|
||||
(aligned_offset & 0xffffffff) as DWORD,
|
||||
aligned_len as SIZE_T,
|
||||
);
|
||||
CloseHandle(handle);
|
||||
|
||||
if ptr == ptr::null_mut() {
|
||||
Err(io::Error::last_os_error())
|
||||
} else {
|
||||
Ok(MmapInner {
|
||||
file: Some(file.try_clone()?),
|
||||
ptr: ptr.offset(alignment as isize),
|
||||
len: len as usize,
|
||||
copy: copy,
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn map(len: usize, file: &File, offset: u64) -> io::Result<MmapInner> {
|
||||
let write = protection_supported(file.as_raw_handle(), PAGE_READWRITE);
|
||||
let exec = protection_supported(file.as_raw_handle(), PAGE_EXECUTE_READ);
|
||||
let mut access = FILE_MAP_READ;
|
||||
let protection = match (write, exec) {
|
||||
(true, true) => {
|
||||
access |= FILE_MAP_WRITE | FILE_MAP_EXECUTE;
|
||||
PAGE_EXECUTE_READWRITE
|
||||
}
|
||||
(true, false) => {
|
||||
access |= FILE_MAP_WRITE;
|
||||
PAGE_READWRITE
|
||||
}
|
||||
(false, true) => {
|
||||
access |= FILE_MAP_EXECUTE;
|
||||
PAGE_EXECUTE_READ
|
||||
}
|
||||
(false, false) => PAGE_READONLY,
|
||||
};
|
||||
|
||||
let mut inner = MmapInner::new(file, protection, access, offset, len, false)?;
|
||||
if write || exec {
|
||||
inner.make_read_only()?;
|
||||
}
|
||||
Ok(inner)
|
||||
}
|
||||
|
||||
pub fn map_exec(len: usize, file: &File, offset: u64) -> io::Result<MmapInner> {
|
||||
let write = protection_supported(file.as_raw_handle(), PAGE_READWRITE);
|
||||
let mut access = FILE_MAP_READ | FILE_MAP_EXECUTE;
|
||||
let protection = if write {
|
||||
access |= FILE_MAP_WRITE;
|
||||
PAGE_EXECUTE_READWRITE
|
||||
} else {
|
||||
PAGE_EXECUTE_READ
|
||||
};
|
||||
|
||||
let mut inner = MmapInner::new(file, protection, access, offset, len, false)?;
|
||||
if write {
|
||||
inner.make_exec()?;
|
||||
}
|
||||
Ok(inner)
|
||||
}
|
||||
|
||||
pub fn map_mut(len: usize, file: &File, offset: u64) -> io::Result<MmapInner> {
|
||||
let exec = protection_supported(file.as_raw_handle(), PAGE_EXECUTE_READ);
|
||||
let mut access = FILE_MAP_READ | FILE_MAP_WRITE;
|
||||
let protection = if exec {
|
||||
access |= FILE_MAP_EXECUTE;
|
||||
PAGE_EXECUTE_READWRITE
|
||||
} else {
|
||||
PAGE_READWRITE
|
||||
};
|
||||
|
||||
let mut inner = MmapInner::new(file, protection, access, offset, len, false)?;
|
||||
if exec {
|
||||
inner.make_mut()?;
|
||||
}
|
||||
Ok(inner)
|
||||
}
|
||||
|
||||
pub fn map_copy(len: usize, file: &File, offset: u64) -> io::Result<MmapInner> {
|
||||
let exec = protection_supported(file.as_raw_handle(), PAGE_EXECUTE_READWRITE);
|
||||
let mut access = FILE_MAP_COPY;
|
||||
let protection = if exec {
|
||||
access |= FILE_MAP_EXECUTE;
|
||||
PAGE_EXECUTE_WRITECOPY
|
||||
} else {
|
||||
PAGE_WRITECOPY
|
||||
};
|
||||
|
||||
let mut inner = MmapInner::new(file, protection, access, offset, len, true)?;
|
||||
if exec {
|
||||
inner.make_mut()?;
|
||||
}
|
||||
Ok(inner)
|
||||
}
|
||||
|
||||
pub fn map_anon(len: usize, _stack: bool) -> io::Result<MmapInner> {
|
||||
unsafe {
|
||||
// Create a mapping and view with maximum access permissions, then use `VirtualProtect`
|
||||
// to set the actual `Protection`. This way, we can set more permissive protection later
|
||||
// on.
|
||||
// Also see https://msdn.microsoft.com/en-us/library/windows/desktop/aa366537.aspx
|
||||
|
||||
let handle = CreateFileMappingW(
|
||||
INVALID_HANDLE_VALUE,
|
||||
ptr::null_mut(),
|
||||
PAGE_EXECUTE_READWRITE,
|
||||
(len >> 16 >> 16) as DWORD,
|
||||
(len & 0xffffffff) as DWORD,
|
||||
ptr::null(),
|
||||
);
|
||||
if handle == ptr::null_mut() {
|
||||
return Err(io::Error::last_os_error());
|
||||
}
|
||||
let access = FILE_MAP_ALL_ACCESS | FILE_MAP_EXECUTE;
|
||||
let ptr = MapViewOfFile(handle, access, 0, 0, len as SIZE_T);
|
||||
CloseHandle(handle);
|
||||
|
||||
if ptr == ptr::null_mut() {
|
||||
return Err(io::Error::last_os_error());
|
||||
}
|
||||
|
||||
let mut old = 0;
|
||||
let result = VirtualProtect(ptr, len as SIZE_T, PAGE_READWRITE, &mut old);
|
||||
if result != 0 {
|
||||
Ok(MmapInner {
|
||||
file: None,
|
||||
ptr: ptr,
|
||||
len: len as usize,
|
||||
copy: false,
|
||||
})
|
||||
} else {
|
||||
Err(io::Error::last_os_error())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn flush(&self, offset: usize, len: usize) -> io::Result<()> {
|
||||
self.flush_async(offset, len)?;
|
||||
if let Some(ref file) = self.file {
|
||||
file.sync_data()?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn flush_async(&self, offset: usize, len: usize) -> io::Result<()> {
|
||||
let result = unsafe { FlushViewOfFile(self.ptr.offset(offset as isize), len as SIZE_T) };
|
||||
if result != 0 {
|
||||
Ok(())
|
||||
} else {
|
||||
Err(io::Error::last_os_error())
|
||||
}
|
||||
}
|
||||
|
||||
fn virtual_protect(&mut self, protect: DWORD) -> io::Result<()> {
|
||||
unsafe {
|
||||
let alignment = self.ptr as usize % allocation_granularity();
|
||||
let ptr = self.ptr.offset(-(alignment as isize));
|
||||
let aligned_len = self.len as SIZE_T + alignment as SIZE_T;
|
||||
|
||||
let mut old = 0;
|
||||
let result = VirtualProtect(ptr, aligned_len, protect, &mut old);
|
||||
|
||||
if result != 0 {
|
||||
Ok(())
|
||||
} else {
|
||||
Err(io::Error::last_os_error())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn make_read_only(&mut self) -> io::Result<()> {
|
||||
self.virtual_protect(PAGE_READONLY)
|
||||
}
|
||||
|
||||
pub fn make_exec(&mut self) -> io::Result<()> {
|
||||
if self.copy {
|
||||
self.virtual_protect(PAGE_EXECUTE_WRITECOPY)
|
||||
} else {
|
||||
self.virtual_protect(PAGE_EXECUTE_READ)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn make_mut(&mut self) -> io::Result<()> {
|
||||
if self.copy {
|
||||
self.virtual_protect(PAGE_WRITECOPY)
|
||||
} else {
|
||||
self.virtual_protect(PAGE_READWRITE)
|
||||
}
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn ptr(&self) -> *const u8 {
|
||||
self.ptr as *const u8
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn mut_ptr(&mut self) -> *mut u8 {
|
||||
self.ptr as *mut u8
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn len(&self) -> usize {
|
||||
self.len
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for MmapInner {
|
||||
fn drop(&mut self) {
|
||||
let alignment = self.ptr as usize % allocation_granularity();
|
||||
unsafe {
|
||||
let ptr = self.ptr.offset(-(alignment as isize));
|
||||
assert!(
|
||||
UnmapViewOfFile(ptr) != 0,
|
||||
"unable to unmap mmap: {}",
|
||||
io::Error::last_os_error()
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
unsafe impl Sync for MmapInner {}
|
||||
unsafe impl Send for MmapInner {}
|
||||
|
||||
fn protection_supported(handle: RawHandle, protection: DWORD) -> bool {
|
||||
unsafe {
|
||||
let handle = CreateFileMappingW(handle, ptr::null_mut(), protection, 0, 0, ptr::null());
|
||||
if handle == ptr::null_mut() {
|
||||
return false;
|
||||
}
|
||||
CloseHandle(handle);
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
fn allocation_granularity() -> usize {
|
||||
unsafe {
|
||||
let mut info = mem::zeroed();
|
||||
GetSystemInfo(&mut info);
|
||||
return info.dwAllocationGranularity as usize;
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,7 @@ version = "0.1.0"
|
|||
authors = ["Markus Stange <mstange@themasta.com>"]
|
||||
|
||||
[dependencies]
|
||||
memmap = "0.7"
|
||||
memmap2 = "0.3"
|
||||
rustc-demangle = "0.1"
|
||||
uuid = "0.8"
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
extern crate memmap;
|
||||
extern crate memmap2;
|
||||
extern crate rustc_demangle;
|
||||
extern crate thin_vec;
|
||||
extern crate uuid;
|
||||
|
|
@ -18,7 +18,7 @@ mod compact_symbol_table;
|
|||
mod elf;
|
||||
|
||||
#[cfg(feature = "parse_elf")]
|
||||
use memmap::MmapOptions;
|
||||
use memmap2::MmapOptions;
|
||||
#[cfg(feature = "parse_elf")]
|
||||
use std::fs::File;
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче