Remove more atomcis

Author: simolus3

crates/core/src/crud_vtab.rs

@@ -4,7 +4,6 @@ use alloc::boxed::Box;
 use alloc::rc::Rc;
 use const_format::formatcp;
 use core::ffi::{CStr, c_char, c_int, c_void};
-use core::sync::atomic::Ordering;
 use serde::Serialize;
 use serde_json::value::RawValue;
 
@@ -88,7 +87,7 @@ impl VirtualTable {
             .ok_or_else(|| PowerSyncError::state_error("Not in tx"))?;
         let db = self.db;
 
-        if self.state.is_in_sync_local.load(Ordering::Relaxed) {
+        if self.state.is_in_sync_local.get() {
             // Don't collect CRUD writes while we're syncing the local database - writes made here
             // aren't writes we should upload.
             // This normally doesn't happen because we insert directly into the data tables, but

crates/core/src/state.rs

@@ -1,7 +1,6 @@
 use core::{
-    cell::{Ref, RefCell},
+    cell::{Cell, Ref, RefCell},
     ffi::{c_int, c_void},
-    sync::atomic::{AtomicBool, Ordering},
 };
 
 use alloc::{
@@ -21,7 +20,7 @@ use crate::schema::Schema;
 /// functions/vtabs that need access to it.
 #[derive(Default)]
 pub struct DatabaseState {
-    pub is_in_sync_local: AtomicBool,
+    pub is_in_sync_local: Cell<bool>,
     schema: RefCell<Option<Schema>>,
     pending_updates: RefCell<BTreeSet<String>>,
     commited_updates: RefCell<BTreeSet<String>>,
@@ -47,15 +46,15 @@ impl DatabaseState {
     }
 
     pub fn sync_local_guard<'a>(&'a self) -> impl Drop + use<'a> {
-        self.is_in_sync_local
-            .compare_exchange(false, true, Ordering::Acquire, Ordering::Acquire)
-            .expect("should not be syncing already");
+        if self.is_in_sync_local.replace(true) {
+            panic!("Should ont be syncing already");
+        }
 
         struct ClearOnDrop<'a>(&'a DatabaseState);
 
         impl Drop for ClearOnDrop<'_> {
             fn drop(&mut self) {
-                self.0.is_in_sync_local.store(false, Ordering::Release);
+                self.0.is_in_sync_local.set(false);
             }
         }
 
@@ -129,11 +128,7 @@ pub fn register(db: *mut sqlite::sqlite3, state: Rc<DatabaseState>) -> Result<()
     ) {
         let data = unsafe { DatabaseState::from_context(&ctx) };
 
-        ctx.result_int(if data.is_in_sync_local.load(Ordering::Relaxed) {
-            1
-        } else {
-            0
-        });
+        ctx.result_int(if data.is_in_sync_local.get() { 1 } else { 0 });
     }
 
     db.create_function_v2(

crates/core/src/update_hooks.rs

@@ -1,7 +1,7 @@
 use core::{
+    cell::Cell,
     ffi::{CStr, c_char, c_int, c_void},
     ptr::null_mut,
-    sync::atomic::{AtomicBool, Ordering},
 };
 
 use alloc::{boxed::Box, rc::Rc};
@@ -22,7 +22,7 @@ use crate::{constants::SUBTYPE_JSON, error::PowerSyncError, state::DatabaseState
 /// closed and the function is unregistered.
 pub fn register(db: *mut sqlite::sqlite3, state: Rc<DatabaseState>) -> Result<(), ResultCode> {
     let state = Box::new(HookState {
-        has_registered_hooks: AtomicBool::new(false),
+        has_registered_hooks: Cell::new(false),
         db,
         state,
     });
@@ -41,15 +41,15 @@ pub fn register(db: *mut sqlite::sqlite3, state: Rc<DatabaseState>) -> Result<()
 }
 
 struct HookState {
-    has_registered_hooks: AtomicBool,
+    has_registered_hooks: Cell<bool>,
     db: *mut sqlite::sqlite3,
     state: Rc<DatabaseState>,
 }
 
 extern "C" fn destroy_function(ctx: *mut c_void) {
     let state = unsafe { Box::from_raw(ctx as *mut HookState) };
 
-    if state.has_registered_hooks.load(Ordering::Relaxed) {
+    if state.has_registered_hooks.get() {
         check_previous(
             "update",
             &state.state,
@@ -107,7 +107,7 @@ extern "C" fn powersync_update_hooks(
                     Rc::into_raw(db_state.clone()) as *mut c_void,
                 ),
             );
-            state.has_registered_hooks.store(true, Ordering::Relaxed);
+            state.has_registered_hooks.set(true);
         }
         "get" => {
             let state = unsafe { user_data.as_ref().unwrap_unchecked() };