From b546ffebcc418bd7cabbca52df3faebd0d1d29c9 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Sun, 2 Jul 2017 16:41:33 -0400 Subject: [PATCH] Fix issues with jemalloc; remove the needless path index from `Subpath` --- partitionfinder/Cargo.toml | 4 ++++ partitionfinder/src/lib.rs | 5 ++++- partitionfinder/src/partitionfinder.h | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/partitionfinder/Cargo.toml b/partitionfinder/Cargo.toml index 6b5b08bd..f864282d 100644 --- a/partitionfinder/Cargo.toml +++ b/partitionfinder/Cargo.toml @@ -3,6 +3,10 @@ name = "partitionfinder" version = "0.1.0" authors = ["Patrick Walton "] +[lib] +name = "partitionfinder" +crate-type = ["dylib", "rlib"] + [dependencies] bit-vec = "0.4" euclid = "0.15" diff --git a/partitionfinder/src/lib.rs b/partitionfinder/src/lib.rs index d3480fc0..a3e1cd24 100644 --- a/partitionfinder/src/lib.rs +++ b/partitionfinder/src/lib.rs @@ -1,5 +1,9 @@ // partitionfinder/lib.rs +#![feature(alloc_jemalloc)] + +// Needed to work around a problem with `heapsize` +extern crate alloc_jemalloc; extern crate bit_vec; extern crate euclid; @@ -43,5 +47,4 @@ pub struct ControlPoints { #[derive(Debug, Clone, Copy)] pub struct Subpath { pub first_endpoint_index: u32, - pub path_index: u32, } diff --git a/partitionfinder/src/partitionfinder.h b/partitionfinder/src/partitionfinder.h index e2c7a308..7ace8f5f 100644 --- a/partitionfinder/src/partitionfinder.h +++ b/partitionfinder/src/partitionfinder.h @@ -39,7 +39,7 @@ struct pf_control_points { typedef struct pf_control_points pf_control_points_t; struct pf_subpath { - uint32_t first_endpoint_index, path_index; + uint32_t first_endpoint_index; }; typedef struct pf_subpath pf_subpath_t;