Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(ctx): replace gstuff constructible with oncelock #2267

Merged
merged 6 commits into from
Dec 10, 2024
Merged

chore(ctx): replace gstuff constructible with oncelock #2267

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
098989e
improve mm_ctx perf
borngraced Nov 6, 2024
c9baf0d
uncommit mm2_test_helper lock file
borngraced Nov 6, 2024
a7ec9c5
use OnceLock from std
borngraced Nov 7, 2024
2fbcd3f
undo try_lock
borngraced Nov 8, 2024
d96e447
nits
borngraced Nov 9, 2024
72018af
avoid redundant clone of arc and replace AtomicDex API with KDF
borngraced Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions mm2src/coins/z_coin/storage/blockdb/blockdb_sql_storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,9 @@ impl BlockDbImpl {
async_blocking(move || {
let conn = Connection::open(path).map_to_mm(|err| ZcoinStorageError::DbError(err.to_string()))?;
let conn = Arc::new(Mutex::new(conn));
let conn_clone = conn.clone();
let conn_clone = conn_clone.lock().unwrap();
run_optimization_pragmas(&conn_clone).map_to_mm(|err| ZcoinStorageError::DbError(err.to_string()))?;
conn_clone
let conn_lock = conn.lock().unwrap();
run_optimization_pragmas(&conn_lock).map_to_mm(|err| ZcoinStorageError::DbError(err.to_string()))?;
conn_lock
.execute(
"CREATE TABLE IF NOT EXISTS compactblocks (
height INTEGER PRIMARY KEY,
Expand All @@ -61,6 +60,7 @@ impl BlockDbImpl {
[],
)
.map_to_mm(|err| ZcoinStorageError::DbError(err.to_string()))?;
drop(conn_lock);

Ok(Self { db: conn, ticker })
})
Expand All @@ -76,8 +76,7 @@ impl BlockDbImpl {
.get()
.cloned()
.unwrap_or_else(|| Arc::new(Mutex::new(Connection::open_in_memory().unwrap())));
let conn_clone = conn.clone();
let conn_lock = conn_clone.lock().unwrap();
let conn_lock = conn.lock().unwrap();
run_optimization_pragmas(&conn_lock).map_err(|err| ZcoinStorageError::DbError(err.to_string()))?;
conn_lock
.execute(
Expand All @@ -88,6 +87,7 @@ impl BlockDbImpl {
[],
)
.map_to_mm(|err| ZcoinStorageError::DbError(err.to_string()))?;
drop(conn_lock);

Ok(BlockDbImpl { db: conn, ticker })
})
Expand Down
4 changes: 2 additions & 2 deletions mm2src/mm2_main/src/mm2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ pub fn mm2_main(version: String, datetime: String) {
}

if first_arg == Some("--version") || first_arg == Some("-v") || first_arg == Some("version") {
println!("AtomicDEX API: {version}");
println!("Komodo DeFi Framework: {version}");
return;
}

Expand All @@ -291,7 +291,7 @@ pub fn mm2_main(version: String, datetime: String) {
return;
}

log!("AtomicDEX API {} DT {}", version, datetime);
log!("Komodo DeFi Framework {} DT {}", version, datetime);

if let Err(err) = run_lp_main(first_arg, &|_| (), version, datetime) {
log!("{}", err);
Expand Down
Loading