fix: Add atomic operations and proper memory barriers for macos-14 co…

…mpatibility Co-Authored-By: Matt Wong <[email protected]>
liquidaty · Dec 18, 2024 · 3d3eddb · 3d3eddb
1 parent 344fbdf
commit 3d3eddb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/app/sheet.c b/app/sheet.c
@@ -413,11 +413,11 @@ static zsvsheet_status zsvsheet_filter_handler(struct zsvsheet_proc_context *ctx
   struct zsvsheet_display_info *di = &state->display_info;
   struct zsvsheet_ui_buffer *current_ui_buffer = *state->display_info.ui_buffers.current;
   int prompt_footer_row = (int)(di->dimensions->rows - di->dimensions->footer_span);
-  struct zsvsheet_buffer_info_internal binfo = zsvsheet_buffer_info_internal(current_ui_buffer);
+  struct zsvsheet_buffer_info_internal binfo = zsvsheet_get_buffer_info(current_ui_buffer);
   int err;
   const char *filter;
 
-  if (binfo.write_in_progress && !binfo.write_done)
+  if (write_in_progress(current_ui_buffer) && !write_done(current_ui_buffer))
     return zsvsheet_status_busy;
 
   if (!zsvsheet_buffer_data_filename(current_ui_buffer))

diff --git a/app/sheet/ui_buffer.c b/app/sheet/ui_buffer.c
@@ -190,3 +190,14 @@ int zsvsheet_ui_buffer_pop(struct zsvsheet_ui_buffer **base, struct zsvsheet_ui_
   }
   return 0;
 }
+
+struct zsvsheet_buffer_info_internal zsvsheet_get_buffer_info(struct zsvsheet_ui_buffer *ub) {
+  struct zsvsheet_buffer_info_internal info = {0};
+  if (ub) {
+    info.flags = ub->flags;
+    info.index = ub->index;
+    info.dimensions.rows = ub->dimensions.row_count;
+    info.dimensions.cols = ub->dimensions.col_count;
+  }
+  return info;
+}
diff --git a/app/sheet/ui_buffer.h b/app/sheet/ui_buffer.h
@@ -92,6 +92,7 @@ struct zsvsheet_ui_buffer {
 void zsvsheet_ui_buffer_create_worker(struct zsvsheet_ui_buffer *ub, void *(*start_func)(void *), void *arg);
 void zsvsheet_ui_buffer_join_worker(struct zsvsheet_ui_buffer *ub);
 void zsvsheet_ui_buffer_delete(struct zsvsheet_ui_buffer *ub);
+struct zsvsheet_buffer_info_internal zsvsheet_get_buffer_info(struct zsvsheet_ui_buffer *ub);
 
 // Compatibility macros for struct access
 #define has_row_num(b) atomic_test_bit(&(b)->flags.flags[0], HAS_ROW_NUM_BIT)