summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock2
-rw-r--r--Cargo.toml2
-rw-r--r--crates/tor-memquota/Cargo.toml (renamed from crates/tor-memtrack/Cargo.toml)4
-rw-r--r--crates/tor-memquota/README.md5
-rw-r--r--crates/tor-memquota/src/config.rs (renamed from crates/tor-memtrack/src/config.rs)0
-rw-r--r--crates/tor-memquota/src/drop_bomb.rs (renamed from crates/tor-memtrack/src/drop_bomb.rs)0
-rw-r--r--crates/tor-memquota/src/drop_reentrancy.rs (renamed from crates/tor-memtrack/src/drop_reentrancy.rs)0
-rw-r--r--crates/tor-memquota/src/error.rs (renamed from crates/tor-memtrack/src/error.rs)0
-rw-r--r--crates/tor-memquota/src/internal_prelude.rs (renamed from crates/tor-memtrack/src/internal_prelude.rs)0
-rw-r--r--crates/tor-memquota/src/lib.rs (renamed from crates/tor-memtrack/src/lib.rs)0
-rw-r--r--crates/tor-memquota/src/mtracker.rs (renamed from crates/tor-memtrack/src/mtracker.rs)6
-rw-r--r--crates/tor-memquota/src/mtracker/bookkeeping.rs (renamed from crates/tor-memtrack/src/mtracker/bookkeeping.rs)0
-rw-r--r--crates/tor-memquota/src/mtracker/reclaim.rs (renamed from crates/tor-memtrack/src/mtracker/reclaim.rs)0
-rw-r--r--crates/tor-memquota/src/mtracker/reclaim/deferred_drop.rs (renamed from crates/tor-memtrack/src/mtracker/reclaim/deferred_drop.rs)0
-rw-r--r--crates/tor-memquota/src/mtracker/test.rs (renamed from crates/tor-memtrack/src/mtracker/test.rs)0
-rw-r--r--crates/tor-memquota/src/mtracker/total_qty_notifier.rs (renamed from crates/tor-memtrack/src/mtracker/total_qty_notifier.rs)0
-rw-r--r--crates/tor-memquota/src/refcount.rs (renamed from crates/tor-memtrack/src/refcount.rs)0
-rw-r--r--crates/tor-memquota/src/utils.rs (renamed from crates/tor-memtrack/src/utils.rs)0
-rw-r--r--crates/tor-memtrack/README.md5
19 files changed, 12 insertions, 12 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 4b91f8eb0..263c774c7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5567,7 +5567,7 @@ dependencies = [
]
[[package]]
-name = "tor-memtrack"
+name = "tor-memquota"
version = "0.17.0"
dependencies = [
"derive-deftly",
diff --git a/Cargo.toml b/Cargo.toml
index 4976504db..5b20105e1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,7 +25,7 @@ members = [
"crates/tor-rtmock",
"crates/tor-log-ratelim",
"crates/tor-rpcbase",
- "crates/tor-memtrack",
+ "crates/tor-memquota",
"crates/tor-llcrypto",
"crates/tor-protover",
"crates/tor-bytes",
diff --git a/crates/tor-memtrack/Cargo.toml b/crates/tor-memquota/Cargo.toml
index d518e8e4b..d3a1cc39d 100644
--- a/crates/tor-memtrack/Cargo.toml
+++ b/crates/tor-memquota/Cargo.toml
@@ -1,12 +1,12 @@
[package]
-name = "tor-memtrack"
+name = "tor-memquota"
version = "0.17.0"
authors = ["The Tor Project, Inc.", "Ian Jackson <[email protected]>"]
edition = "2021"
rust-version = "1.70"
license = "MIT OR Apache-2.0"
homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home"
-description = "Memory use tracking utilities, used by Tor software"
+description = "Memory use tracking and quota utilities, used by Tor software"
keywords = ["tor", "arti"]
categories = ["memory", "allocation"]
repository = "https://gitlab.torproject.org/tpo/core/arti.git/"
diff --git a/crates/tor-memquota/README.md b/crates/tor-memquota/README.md
new file mode 100644
index 000000000..1d455ac32
--- /dev/null
+++ b/crates/tor-memquota/README.md
@@ -0,0 +1,5 @@
+# tor-memquota
+
+Memory use quota, tracking and reclamation, for use in Tor DoS resistance
+
+License: MIT OR Apache-2.0
diff --git a/crates/tor-memtrack/src/config.rs b/crates/tor-memquota/src/config.rs
index ce8fd364c..ce8fd364c 100644
--- a/crates/tor-memtrack/src/config.rs
+++ b/crates/tor-memquota/src/config.rs
diff --git a/crates/tor-memtrack/src/drop_bomb.rs b/crates/tor-memquota/src/drop_bomb.rs
index 6a7b55fa6..6a7b55fa6 100644
--- a/crates/tor-memtrack/src/drop_bomb.rs
+++ b/crates/tor-memquota/src/drop_bomb.rs
diff --git a/crates/tor-memtrack/src/drop_reentrancy.rs b/crates/tor-memquota/src/drop_reentrancy.rs
index 3e157cf88..3e157cf88 100644
--- a/crates/tor-memtrack/src/drop_reentrancy.rs
+++ b/crates/tor-memquota/src/drop_reentrancy.rs
diff --git a/crates/tor-memtrack/src/error.rs b/crates/tor-memquota/src/error.rs
index 4cca5bb10..4cca5bb10 100644
--- a/crates/tor-memtrack/src/error.rs
+++ b/crates/tor-memquota/src/error.rs
diff --git a/crates/tor-memtrack/src/internal_prelude.rs b/crates/tor-memquota/src/internal_prelude.rs
index c727496f4..c727496f4 100644
--- a/crates/tor-memtrack/src/internal_prelude.rs
+++ b/crates/tor-memquota/src/internal_prelude.rs
diff --git a/crates/tor-memtrack/src/lib.rs b/crates/tor-memquota/src/lib.rs
index f6d5ad21b..f6d5ad21b 100644
--- a/crates/tor-memtrack/src/lib.rs
+++ b/crates/tor-memquota/src/lib.rs
diff --git a/crates/tor-memtrack/src/mtracker.rs b/crates/tor-memquota/src/mtracker.rs
index 00e276d35..33333a930 100644
--- a/crates/tor-memtrack/src/mtracker.rs
+++ b/crates/tor-memquota/src/mtracker.rs
@@ -1,11 +1,11 @@
-//! Memory tracker, core and low-level API
+//! Memory quota tracker, core and low-level API
//!
//! # Example
//!
//! ```
//! use std::{collections::VecDeque, sync::{Arc, Mutex}};
//! use tor_rtcompat::{CoarseInstant, CoarseTimeProvider, PreferredRuntime};
-//! use tor_memtrack::{mtracker, MemoryQuotaTracker, MemoryReclaimedError};
+//! use tor_memquota::{mtracker, MemoryQuotaTracker, MemoryReclaimedError};
//! use void::{ResultVoidExt, Void};
//!
//! #[derive(Debug)]
@@ -39,7 +39,7 @@
//! }
//!
//! let runtime = PreferredRuntime::create().unwrap();
-//! let config = tor_memtrack::Config::builder().max(1024*1024*1024).build().unwrap();
+//! let config = tor_memquota::Config::builder().max(1024*1024*1024).build().unwrap();
//! let trk = MemoryQuotaTracker::new(&runtime, config).unwrap();
//! let account = trk.new_account(None).unwrap();
//!
diff --git a/crates/tor-memtrack/src/mtracker/bookkeeping.rs b/crates/tor-memquota/src/mtracker/bookkeeping.rs
index ec1241196..ec1241196 100644
--- a/crates/tor-memtrack/src/mtracker/bookkeeping.rs
+++ b/crates/tor-memquota/src/mtracker/bookkeeping.rs
diff --git a/crates/tor-memtrack/src/mtracker/reclaim.rs b/crates/tor-memquota/src/mtracker/reclaim.rs
index 6e45b1f3c..6e45b1f3c 100644
--- a/crates/tor-memtrack/src/mtracker/reclaim.rs
+++ b/crates/tor-memquota/src/mtracker/reclaim.rs
diff --git a/crates/tor-memtrack/src/mtracker/reclaim/deferred_drop.rs b/crates/tor-memquota/src/mtracker/reclaim/deferred_drop.rs
index 3b0742a82..3b0742a82 100644
--- a/crates/tor-memtrack/src/mtracker/reclaim/deferred_drop.rs
+++ b/crates/tor-memquota/src/mtracker/reclaim/deferred_drop.rs
diff --git a/crates/tor-memtrack/src/mtracker/test.rs b/crates/tor-memquota/src/mtracker/test.rs
index 43d3dcd7c..43d3dcd7c 100644
--- a/crates/tor-memtrack/src/mtracker/test.rs
+++ b/crates/tor-memquota/src/mtracker/test.rs
diff --git a/crates/tor-memtrack/src/mtracker/total_qty_notifier.rs b/crates/tor-memquota/src/mtracker/total_qty_notifier.rs
index 4c877ba9a..4c877ba9a 100644
--- a/crates/tor-memtrack/src/mtracker/total_qty_notifier.rs
+++ b/crates/tor-memquota/src/mtracker/total_qty_notifier.rs
diff --git a/crates/tor-memtrack/src/refcount.rs b/crates/tor-memquota/src/refcount.rs
index cbe17b7f0..cbe17b7f0 100644
--- a/crates/tor-memtrack/src/refcount.rs
+++ b/crates/tor-memquota/src/refcount.rs
diff --git a/crates/tor-memtrack/src/utils.rs b/crates/tor-memquota/src/utils.rs
index 4540df03d..4540df03d 100644
--- a/crates/tor-memtrack/src/utils.rs
+++ b/crates/tor-memquota/src/utils.rs
diff --git a/crates/tor-memtrack/README.md b/crates/tor-memtrack/README.md
deleted file mode 100644
index ba3759340..000000000
--- a/crates/tor-memtrack/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# tor-memtrack
-
-Memory use tracking and reclamation, for use in Tor DoS resistance
-
-License: MIT OR Apache-2.0