[WIP] perf: use rwlock for scope data access

.clang-format

@@ -4,5 +4,5 @@ IndentPPDirectives: AfterHash
 ColumnLimit: 80
 AlwaysBreakAfterDefinitionReturnType: All
 PointerAlignment: Right
-ForEachMacros: ['SENTRY_WITH_SCOPE', 'SENTRY_WITH_SCOPE_MUT', 'SENTRY_WITH_SCOPE_MUT_NO_FLUSH', 'SENTRY_WITH_OPTIONS', 'SENTRY_WITH_OPTIONS_MUT']
+ForEachMacros: ['SENTRY_WITH_SCOPE', 'SENTRY_WITH_SCOPE_MUT', 'SENTRY_WITH_SCOPE_MUT_NO_FLUSH', 'SENTRY_WITH_OPTIONS', 'SENTRY_WITH_OPTIONS_MUT', 'SENTRY_SCOPE_READ_LOCK', 'SENTRY_SCOPE_WRITE_LOCK']
 InsertNewlineAtEOF: True

src/backends/sentry_backend_crashpad.cpp

@@ -516,7 +516,7 @@ crashpad_handler(int signum, siginfo_t *info, ucontext_t *user_context)
                 // written above and stays breadcrumb-free
                 SENTRY_WITH_SCOPE (scope) {
                     sentry_value_set_by_key(crash_event, "breadcrumbs",
-                        sentry__ringbuffer_to_list(scope->breadcrumbs));
+                        sentry__scope_breadcrumbs_to_list(scope));
                 }
 
                 sentry__session_replay_flush_pending(
@@ -1167,10 +1167,9 @@ make_attachment_path(const sentry_path_t *run_path, sentry_value_t attachment)
 }
 
 static void
-crashpad_backend_add_attachment(sentry_backend_t *backend,
-    sentry_value_t attachment, const sentry_options_t *UNUSED(options))
+crashpad_backend_add_attachment(void *state, sentry_value_t attachment)
 {
-    auto *data = static_cast<crashpad_state_t *>(backend->data);
+    auto *data = static_cast<crashpad_state_t *>(state);
     if (!data || !data->client) {
         return;
     }
@@ -1199,10 +1198,9 @@ crashpad_backend_add_attachment(sentry_backend_t *backend,
 }
 
 static void
-crashpad_backend_remove_attachment(
-    sentry_backend_t *backend, sentry_value_t attachment)
+crashpad_backend_remove_attachment(void *state, sentry_value_t attachment)
 {
-    auto *data = static_cast<crashpad_state_t *>(backend->data);
+    auto *data = static_cast<crashpad_state_t *>(state);
     if (!data || !data->client) {
         return;
     }
@@ -1258,8 +1256,14 @@ sentry__backend_new(void)
     backend->prune_database_func = crashpad_backend_prune_database;
 #if defined(SENTRY_PLATFORM_WINDOWS) || defined(SENTRY_PLATFORM_LINUX)         \
     || defined(SENTRY_PLATFORM_MACOS)
-    backend->add_attachment_func = crashpad_backend_add_attachment;
-    backend->remove_attachment_func = crashpad_backend_remove_attachment;
+    backend->scope_observer = sentry__scope_observer_new();
+    if (backend->scope_observer) {
+        backend->scope_observer->data = data;
+        backend->scope_observer->add_attachment
+            = crashpad_backend_add_attachment;
+        backend->scope_observer->remove_attachment
+            = crashpad_backend_remove_attachment;
+    }
 #endif
     backend->data = data;
     backend->can_capture_after_shutdown = true;

src/backends/sentry_backend_native.c

@@ -174,6 +174,7 @@ wer_register_module(uint64_t app_tid)
 typedef struct {
     sentry_crash_ipc_t *ipc;
     pid_t daemon_pid;
+    sentry_path_t *run_path;
     sentry_path_t *event_path;
     sentry_path_t *breadcrumb1_path;
     sentry_path_t *breadcrumb2_path;
@@ -244,6 +245,10 @@ native_backend_startup(
         return 1;
     }
     backend->data = state;
+    state->run_path = sentry__path_clone(options->run->run_path);
+    if (backend->scope_observer) {
+        backend->scope_observer->data = state;
+    }
 
     // Initialize IPC (protected by global synchronization for concurrent
     // access)
@@ -725,6 +730,7 @@ native_backend_free(sentry_backend_t *backend)
     sentry__path_free(state->breadcrumb1_path);
     sentry__path_free(state->breadcrumb2_path);
     sentry__path_free(state->envelope_path);
+    sentry__path_free(state->run_path);
 
     sentry_free(state);
 }
@@ -763,12 +769,14 @@ native_backend_write_attachments(const sentry_path_t *event_path)
         return;
     }
     SENTRY_WITH_SCOPE (scope) {
-        sentry_value_t attachments = scope->attachments;
+        sentry_value_t attachments = sentry__scope_load_attachments(scope);
         if (sentry_value_get_length(attachments) == 0) {
+            sentry_value_decref(attachments);
             continue;
         }
         sentry_path_t *run_path = sentry__path_dir(event_path);
         if (!run_path) {
+            sentry_value_decref(attachments);
             continue;
         }
         sentry_path_t *attach_list_path
@@ -817,6 +825,7 @@ native_backend_write_attachments(const sentry_path_t *event_path)
             sentry__path_free(attach_list_path);
         }
         sentry__path_free(run_path);
+        sentry_value_decref(attachments);
     }
 }
 
@@ -941,18 +950,19 @@ native_backend_add_breadcrumb(sentry_backend_t *backend,
 }
 
 static void
-native_backend_add_attachment(sentry_backend_t *backend,
-    sentry_value_t attachment, const sentry_options_t *options)
+native_backend_add_attachment(void *data, sentry_value_t attachment)
 {
-    (void)backend; // Unused
+    native_backend_state_t *state = (native_backend_state_t *)data;
+    if (!state) {
+        return;
+    }
 
     // For buffer attachments, derive a path in the run directory and write to
     // disk
     size_t bytes_len = 0;
     const char *bytes = sentry__attachment_get_bytes(attachment, &bytes_len);
     if (bytes) {
-        sentry_path_t *path
-            = make_attachment_path(options->run->run_path, attachment);
+        sentry_path_t *path = make_attachment_path(state->run_path, attachment);
         if (!path) {
             const char *filename = sentry__attachment_get_filename(attachment);
             SENTRY_WARNF("failed to create path for native backend attachment "
@@ -1147,7 +1157,10 @@ sentry__backend_new(void)
     backend->except_func = native_backend_except;
     backend->flush_scope_func = native_backend_flush_scope;
     backend->add_breadcrumb_func = native_backend_add_breadcrumb;
-    backend->add_attachment_func = native_backend_add_attachment;
+    backend->scope_observer = sentry__scope_observer_new();
+    if (backend->scope_observer) {
+        backend->scope_observer->add_attachment = native_backend_add_attachment;
+    }
     backend->user_consent_changed_func = native_backend_user_consent_changed;
     backend->can_capture_after_shutdown = false;
 

src/integrations/sentry_integration_wer.c

@@ -191,6 +191,18 @@ wer_remove_attachment(void *UNUSED(data), sentry_value_t attachment)
     }
 }
 
+static void
+wer_for_each_attachment(
+    sentry_scope_t *scope, void *data, void (*callback)(void *, sentry_value_t))
+{
+    sentry_value_t attachments = sentry__scope_load_attachments(scope);
+    size_t len = sentry_value_get_length(attachments);
+    for (size_t i = 0; i < len; i++) {
+        callback(data, sentry_value_get_by_index(attachments, i));
+    }
+    sentry_value_decref(attachments);
+}
+
 static void
 wer_cleanup_tag(const char *key, sentry_value_t UNUSED(value), void *data)
 {
@@ -207,13 +219,11 @@ wer_clear(void *data)
         return;
     }
 
-    sentry__value_foreach_key_value(scope->tags, wer_cleanup_tag, wer_data);
+    sentry_value_t tags = sentry__scope_load_tags(scope);
+    sentry__value_foreach_key_value(tags, wer_cleanup_tag, wer_data);
+    sentry_value_decref(tags);
 
-    size_t len = sentry_value_get_length(scope->attachments);
-    for (size_t i = 0; i < len; i++) {
-        wer_remove_attachment(
-            wer_data, sentry_value_get_by_index(scope->attachments, i));
-    }
+    wer_for_each_attachment(scope, wer_data, wer_remove_attachment);
 }
 
 static void
@@ -238,11 +248,7 @@ register_wer(
     if (sentry__scope_add_observer(scope, observer)) {
         wer_data->scope = scope;
         wer_data->observer = observer;
-        size_t len = sentry_value_get_length(scope->attachments);
-        for (size_t i = 0; i < len; i++) {
-            wer_add_attachment(
-                wer_data, sentry_value_get_by_index(scope->attachments, i));
-        }
+        wer_for_each_attachment(scope, wer_data, wer_add_attachment);
     }
 }
 
@@ -256,13 +262,11 @@ unregister_wer(
         return;
     }
 
-    sentry__value_foreach_key_value(scope->tags, wer_cleanup_tag, wer_data);
+    sentry_value_t tags = sentry__scope_load_tags(scope);
+    sentry__value_foreach_key_value(tags, wer_cleanup_tag, wer_data);
+    sentry_value_decref(tags);
 
-    size_t len = sentry_value_get_length(scope->attachments);
-    for (size_t i = 0; i < len; i++) {
-        wer_remove_attachment(
-            wer_data, sentry_value_get_by_index(scope->attachments, i));
-    }
+    wer_for_each_attachment(scope, wer_data, wer_remove_attachment);
 
     sentry__scope_remove_observer(scope, wer_data->observer);
     wer_data->scope = NULL;

src/sentry_backend.c

@@ -9,5 +9,6 @@ sentry__backend_free(sentry_backend_t *backend)
     if (backend->free_func) {
         backend->free_func(backend);
     }
+    sentry_free(backend->scope_observer);
     sentry_free(backend);
 }

src/sentry_backend.h

@@ -25,9 +25,7 @@ struct sentry_backend_s {
     void (*user_consent_changed_func)(sentry_backend_t *);
     uint64_t (*get_last_crash_func)(sentry_backend_t *);
     void (*prune_database_func)(sentry_backend_t *);
-    void (*add_attachment_func)(
-        sentry_backend_t *, sentry_value_t, const sentry_options_t *options);
-    void (*remove_attachment_func)(sentry_backend_t *, sentry_value_t);
+    sentry_scope_observer_t *scope_observer;
     void *data;
     // Whether this backend still runs after shutdown_func was called.
     bool can_capture_after_shutdown;