Skip to content

Commit

Permalink
Revert "strand-cam: remove jemallocator"
Browse files Browse the repository at this point in the history
This reverts commit 7893896.
astraw committed Oct 13, 2022
1 parent 4c39262 commit 28899e3
Showing 3 changed files with 7 additions and 3 deletions.
3 changes: 0 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -36,9 +36,6 @@
setting is now `start_backend = "pylon"` to enable Basler Pylon cameras to
continue with existing Braid `.toml` configuration files.)
* Rename command line program `offline-retrack` to `braid-offline-retrack`.
* Removed jemallocator from `strand-cam` in favor of the default rust allocator.
This was added to fix a "corrupted size vs. prev_size" error in 2019, but
seems no longer needed.
* MKV and FMF files use frame timestamps computed from the triggerbox device if
available.
* When saving MKV, FMF and April Tag CSV files, default filenames include the
3 changes: 3 additions & 0 deletions strand-cam/Cargo.toml
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@ rust-version = "1.60"
path = "src/strand-cam.rs"

[dependencies]
jemallocator = {version="0.3", optional=true}
async-change-tracker = "0.3"
bui-backend-types = "0.8"
bui-backend = {version="0.14", default-features = false}
@@ -131,6 +132,8 @@ flydratrax = ["mvg", "nalgebra", "strand-cam-pseudo-cal", "flydra-mvg",
# build with the flydra-feature-detector
flydra_feat_detect = ["flydra-feature-detector"]

jemalloc = ["jemallocator"]

vpx = ["mkv-writer/vpx"]

use_ipp = ["flydra-feature-detector?/use_ipp"]
4 changes: 4 additions & 0 deletions strand-cam/src/cli_app.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#[cfg(feature = "jemalloc")]
#[global_allocator]
static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;

use std::path::PathBuf;

use clap::Arg;

0 comments on commit 28899e3

Please sign in to comment.