Switch to memmap2 fork
This commit is contained in:
committed by
Trent Nelson
parent
a645b9481d
commit
ec9f9bd5d8
13
Cargo.lock
generated
13
Cargo.lock
generated
@ -1985,6 +1985,15 @@ dependencies = [
|
|||||||
"winapi 0.3.8",
|
"winapi 0.3.8",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "memmap2"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d9b70ca2a6103ac8b665dc150b142ef0e4e89df640c9e6cf295d189c3caebe5a"
|
||||||
|
dependencies = [
|
||||||
|
"libc",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "memoffset"
|
name = "memoffset"
|
||||||
version = "0.5.4"
|
version = "0.5.4"
|
||||||
@ -4387,7 +4396,7 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
"libloading 0.6.2",
|
"libloading 0.6.2",
|
||||||
"log 0.4.8",
|
"log 0.4.8",
|
||||||
"memmap",
|
"memmap2",
|
||||||
"num-derive 0.3.0",
|
"num-derive 0.3.0",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
"num_cpus",
|
"num_cpus",
|
||||||
@ -4481,7 +4490,7 @@ dependencies = [
|
|||||||
"itertools 0.9.0",
|
"itertools 0.9.0",
|
||||||
"libsecp256k1",
|
"libsecp256k1",
|
||||||
"log 0.4.8",
|
"log 0.4.8",
|
||||||
"memmap",
|
"memmap2",
|
||||||
"num-derive 0.3.0",
|
"num-derive 0.3.0",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
"pbkdf2",
|
"pbkdf2",
|
||||||
|
11
programs/bpf/Cargo.lock
generated
11
programs/bpf/Cargo.lock
generated
@ -1039,13 +1039,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
|
checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "memmap"
|
name = "memmap2"
|
||||||
version = "0.7.0"
|
version = "0.1.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
|
checksum = "d9b70ca2a6103ac8b665dc150b142ef0e4e89df640c9e6cf295d189c3caebe5a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"winapi 0.3.8",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -2060,7 +2059,7 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
"libloading",
|
"libloading",
|
||||||
"log",
|
"log",
|
||||||
"memmap",
|
"memmap2",
|
||||||
"num-derive 0.3.0",
|
"num-derive 0.3.0",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
"num_cpus",
|
"num_cpus",
|
||||||
@ -2106,7 +2105,7 @@ dependencies = [
|
|||||||
"itertools",
|
"itertools",
|
||||||
"libsecp256k1",
|
"libsecp256k1",
|
||||||
"log",
|
"log",
|
||||||
"memmap",
|
"memmap2",
|
||||||
"num-derive 0.3.0",
|
"num-derive 0.3.0",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
"pbkdf2",
|
"pbkdf2",
|
||||||
|
@ -24,7 +24,7 @@ lazy_static = "1.4.0"
|
|||||||
libc = "0.2.72"
|
libc = "0.2.72"
|
||||||
libloading = "0.6.2"
|
libloading = "0.6.2"
|
||||||
log = "0.4.8"
|
log = "0.4.8"
|
||||||
memmap = "0.7.0"
|
memmap2 = "0.1.0"
|
||||||
num-derive = { version = "0.3" }
|
num-derive = { version = "0.3" }
|
||||||
num-traits = { version = "0.2" }
|
num-traits = { version = "0.2" }
|
||||||
num_cpus = "1.13.0"
|
num_cpus = "1.13.0"
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
use log::*;
|
use log::*;
|
||||||
use memmap::MmapMut;
|
use memmap2::MmapMut;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use solana_sdk::{
|
use solana_sdk::{
|
||||||
account::Account,
|
account::Account,
|
||||||
|
@ -20,7 +20,7 @@ default = [
|
|||||||
"chrono",
|
"chrono",
|
||||||
"curve25519-dalek",
|
"curve25519-dalek",
|
||||||
"generic-array",
|
"generic-array",
|
||||||
"memmap",
|
"memmap2",
|
||||||
"rand",
|
"rand",
|
||||||
"rand_chacha",
|
"rand_chacha",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
@ -45,7 +45,7 @@ hex = "0.4.2"
|
|||||||
hmac = "0.7.0"
|
hmac = "0.7.0"
|
||||||
itertools = { version = "0.9.0" }
|
itertools = { version = "0.9.0" }
|
||||||
log = { version = "0.4.8" }
|
log = { version = "0.4.8" }
|
||||||
memmap = { version = "0.7.0", optional = true }
|
memmap2 = { version = "0.1.0", optional = true }
|
||||||
num-derive = { version = "0.3" }
|
num-derive = { version = "0.3" }
|
||||||
num-traits = { version = "0.2" }
|
num-traits = { version = "0.2" }
|
||||||
pbkdf2 = { version = "0.3.0", default-features = false }
|
pbkdf2 = { version = "0.3.0", default-features = false }
|
||||||
|
@ -414,9 +414,9 @@ impl<T: std::cmp::Ord + AbiExample> AbiExample for BTreeSet<T> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(not(feature = "program"))]
|
#[cfg(not(feature = "program"))]
|
||||||
impl AbiExample for memmap::MmapMut {
|
impl AbiExample for memmap2::MmapMut {
|
||||||
fn example() -> Self {
|
fn example() -> Self {
|
||||||
memmap::MmapMut::map_anon(1).expect("failed to map the data file")
|
memmap2::MmapMut::map_anon(1).expect("failed to map the data file")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ use crate::{
|
|||||||
};
|
};
|
||||||
use bincode::{deserialize, serialize};
|
use bincode::{deserialize, serialize};
|
||||||
use chrono::{TimeZone, Utc};
|
use chrono::{TimeZone, Utc};
|
||||||
use memmap::Mmap;
|
use memmap2::Mmap;
|
||||||
use std::{
|
use std::{
|
||||||
collections::BTreeMap,
|
collections::BTreeMap,
|
||||||
fmt,
|
fmt,
|
||||||
|
Reference in New Issue
Block a user