Cleanup + published on crates.io

Dependencies

• [2] E4MD6T3L Proofreading and commenting of this crate (massive bug fixes included)
• [3] T7QB6QEP Adding debug.rs
• [4] UAQX27N4 Tests
• [5] OP6SVMOD Resetting history
• [6] EAAYH6BQ Debugging put
• [7] OHUZ73MK Versions
• [8] YXKP4AIW New file locks, with multiple sets of free pages

Change contents

• file deletion: parallel_benchmark.rs (-xw-x--x--)
  [3.71008]→[3.71009:71032](∅→∅),[3.71032]→[3.71033:71033](∅→∅)
  − use sanakirja_core::*;

  − use std::sync::atomic::{AtomicUsize, Ordering};

  − use std::sync::Arc;

  −

  − pub fn parallel_benchmark() {

  − let mut stack: [[u64; 512]; N] = [TESTPAGE; N];

  − let stack: [SafePage; N] = [

  − SafePage::from_buf(&mut stack[0], 4096),

  − SafePage::from_buf(&mut stack[1], 4096 * 2),

  − SafePage::from_buf(&mut stack[2], 4096 * 3),

  − SafePage::from_buf(&mut stack[3], 4096 * 4),

  − /*SafePage::from_buf(&mut stack[4], 4096 * 5),

  − SafePage::from_buf(&mut stack[5], 4096 * 6),

  − SafePage::from_buf(&mut stack[6], 4096 * 7),

  − SafePage::from_buf(&mut stack[7], 4096 * 8),

  − SafePage::from_buf(&mut stack[8], 4096 * 9),

  − SafePage::from_buf(&mut stack[9], 4096 * 10),

  − SafePage::from_buf(&mut stack[10], 4096 * 11),

  − SafePage::from_buf(&mut stack[11], 4096 * 12),*/

  − ];

  −

  − let pointer_clone = Arc::new(AtomicUsize::new(0));

  − let result = Arc::new(AtomicUsize::new(0));

  − [

  − start_thread(pointer_clone.clone(), result.clone(), stack.clone()),

  − start_thread(pointer_clone.clone(), result.clone(), stack.clone()),

  − start_thread(pointer_clone.clone(), result.clone(), stack.clone()),

  − start_thread(pointer_clone.clone(), result.clone(), stack.clone()),

  − ];

  −

  − // Wait for the other thread to release the lock

  − while result.load(Ordering::SeqCst) != 0 {}

  −

  − let mut total = std::time::Duration::from_secs(0);

  − let mut total_seq = std::time::Duration::from_secs(0);

  − for _ in 0..100_000 {

  − let time = std::time::SystemTime::now();

  − pointer_clone.store(4, Ordering::Release);

  − result.store(4, Ordering::Release);

  − while result.load(Ordering::Acquire) > 0 {

  − std::hint::spin_loop();

  − }

  − total += time.elapsed().unwrap();

  −

  − let time = std::time::SystemTime::now();

  − for &s in stack.iter() {

  − let s: MutPage = s.into();

  − let header_size = 16;

  − let size = 8;

  − for off in 0..500 {

  − unsafe {

  − let ptr = (TESTPAGE.as_ptr() as *const u8).add(header_size + off * size);

  − let new_ptr = s.0.data.add(header_size + off * size);

  − std::ptr::copy_nonoverlapping(ptr, new_ptr, size);

  − }

  − }

  − }

  − total_seq += time.elapsed().unwrap();

  − }

  − println!("{:?} {:?}", total, total_seq);

  − }

  −

  − #[derive(Debug, Clone, Copy)]

  − struct SafePage {

  − data: *mut u8,

  − offset: u64,

  − }

  −

  − impl From<MutPage> for SafePage {

  − fn from(m: MutPage) -> Self {

  − SafePage {

  − data: m.0.data,

  − offset: m.0.offset,

  − }

  − }

  − }

  −

  − impl From<SafePage> for MutPage {

  − fn from(m: SafePage) -> Self {

  − MutPage(Page {

  − data: m.data,

  − offset: m.offset,

  − })

  − }

  − }

  −

  − impl SafePage {

  − fn from_buf(b: &mut [u64], offset: u64) -> Self {

  − SafePage {

  − data: b.as_mut_ptr() as *mut u8,

  − offset,

  − }

  − }

  − }

  −

  − unsafe impl Sync for SafePage {}

  − unsafe impl Send for SafePage {}

  −

  − fn start_thread(

  − n: Arc<AtomicUsize>,

  − result: Arc<AtomicUsize>,

  − stack: [SafePage; N],

  − ) -> std::thread::JoinHandle<()> {

  − std::thread::spawn(move || loop {

  − let mut current = 0;

  − while current == 0 {

  − current = n.load(Ordering::Acquire);

  − std::hint::spin_loop();

  − }

  − while current > 0 {

  − let mut cur = n.compare_and_swap(current, current - 1, Ordering::Acquire);

  − if cur != current {

  − current -= 1;

  − continue;

  − }

  − cur -= 1;

  − let s: MutPage = stack[cur].into();

  − let header_size = 16;

  − let size = 8;

  − for off in 0..500 {

  − unsafe {

  − let ptr = (TESTPAGE.as_ptr() as *const u8).add(header_size + off * size);

  − let new_ptr = s.0.data.add(header_size + off * size);

  − std::ptr::copy_nonoverlapping(ptr, new_ptr, size);

  − }

  − }

  − result.fetch_sub(1, Ordering::Release);

  − current = cur;

  − }

  − })

  − }

  −

  − const N: usize = 4;

  −

  − const TESTPAGE: [u64; 512] = [

  − 268435955, 3992, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,

  − 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,

  − 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,

  − 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,

  − 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,

  − 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,

  − 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,

  − 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170,

  − 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,

  − 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208,

  − 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227,

  − 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246,

  − 247, 248, 249, 250, 251, 252, 253, 254, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266,

  − 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285,

  − 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,

  − 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323,

  − 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342,

  − 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361,

  − 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380,

  − 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399,

  − 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418,

  − 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437,

  − 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456,

  − 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475,

  − 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494,

  − 495, 496, 497, 498, 499, 499, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

  − ];
• edit in sanakirja/Cargo.toml at line 6
  [3.108516]

  [3.5451]
  + description = "Copy-on-write datastructures, storable on disk (or elsewhere) with a stable format."

  + license = "MIT/Apache-2.0"

  + documentation = "https://docs.rs/sanakirja"

  + repository = "https://nest.pijul.com/pijul/sanakirja"

  + include = [

  + "Cargo.toml",

  + "src/lib.rs",

  + "src/debug.rs",

  + "src/environment/mod.rs",

  + "src/environment/global_header.rs",

  + "src/environment/muttxn.rs",

  + "src/tests.rs"

  + ]
• replacement in sanakirja/Cargo.toml at line 29
  [3.84]→[2.31641:31706](∅→∅)
  − sanakirja-core = { path = "../sanakirja-core", version = "1.0" }
  [3.84]

  [3.5528]
  + sanakirja-core = { path = "../sanakirja-core", version = "1.0.1" }