core/gtk-adwaita: Export mutex API The initial plan was to complete every actions inside callbacks. However, most UI libraries/frameworks requires main thread for accessing UI. That means, state could be changed during the UI operation because it's outside the callback's mutex locking.

Changes

6 changed files (+70/-0)

• core/src/App.zig
  • @@ -358,6 +358,16 @@ };
    thread.detach(); } + pub fn lock(capi_ptr: ?*CApi) callconv(.C) void { + const capi = capi_ptr orelse return; + capi.internal.capi_lock.lock(); + } + + pub fn unlock(capi_ptr: ?*CApi) callconv(.C) void { + const capi = capi_ptr orelse return; + capi.internal.capi_lock.unlock(); + } + pub fn onServerChange(capi_ptr: ?*CApi, cb: OnServerChange.Fn, userdata: callback.UserData) callconv(.C) void { const capi = capi_ptr orelse return; // TODO: Notify error to caller
• core/src/App/ServerSelector.zig
  • @@ -180,6 +180,16 @@
    return .{ slice, servers }; } + pub fn lock(capi_ptr: ?*CApi) callconv(.C) void { + const capi = capi_ptr orelse return; + capi.internal.capi_lock.lock(); + } + + pub fn unlock(capi_ptr: ?*CApi) callconv(.C) void { + const capi = capi_ptr orelse return; + capi.internal.capi_lock.unlock(); + } + pub fn onChange(capi_ptr: ?*CApi, cb: OnChange.Fn, user_data: callback.UserData) callconv(.C) void { const capi = capi_ptr orelse return; // TODO: Notify error to caller
• core/src/lib.h
  • @@ -168,6 +168,18 @@ */
    void plac_app_server_selector_load(plac_app_server_selector*); /** + * Locks server selector's mutex. + * Do not forget to unlock after using. + * Locking more than once from the same thread without unlocking is undefined behavior. + */ + void plac_app_server_selector_lock(plac_app_server_selector*); + + /** + * Unlocks server selector's mutex. + */ + void plac_app_server_selector_unlock(plac_app_server_selector*); + + /** * Appends a callback that will be invoked everytime "plac_app_server_selector" changes. */ typedef void (*plac_cb_server_selector_change)(void*);
  • @@ -284,6 +296,18 @@ */
    void plac_app_connect(plac_app*, char *server_id, unsigned int server_id_len, char *saved_token, unsigned int saved_token_len); + + /** + * Locks app's mutex. + * Do not forget to unlock after using. + * Locking more than once from the same thread without unlocking is undefined behavior. + */ + void plac_app_lock(plac_app*); + + /** + * Unlocks app's mutex. + */ + void plac_app_unlock(plac_app*); /** * Event fired when "server" field changes (connect/disconnect).
• core/src/lib.vapi
  • @@ -146,6 +146,12 @@
    [CCode (cname = "plac_app_server_selector_load")] public void load(); + [CCode (cname = "plac_app_server_selector_lock")] + public void lock (); + + [CCode (cname = "plac_app_server_selector_unlock")] + public void unlock (); + [CCode (cname = "plac_app_server_selector_on_change")] public void on_change (OnChange f);
  • @@ -200,6 +206,12 @@ public void restore_state();
    [CCode (cname = "plac_app_connect")] public void connect(string* server_id, uint server_id_len, string? saved_token, uint saved_token_len); + + [CCode (cname = "plac_app_lock")] + public void lock (); + + [CCode (cname = "plac_app_unlock")] + public void unlock (); [CCode (cname = "plac_app_on_server_change")] public void on_server_change (OnServerChange f);
• core/src/lib.zig
  • @@ -48,6 +48,8 @@ });
    @export(&App.ServerSelector.CApi.reset, .{ .name = "plac_app_server_selector_reset" }); @export(&App.ServerSelector.CApi.load, .{ .name = "plac_app_server_selector_load" }); + @export(&App.ServerSelector.CApi.lock, .{ .name = "plac_app_server_selector_lock" }); + @export(&App.ServerSelector.CApi.unlock, .{ .name = "plac_app_server_selector_unlock" }); @export(&App.ServerSelector.CApi.onChange, .{ .name = "plac_app_server_selector_on_change" }); @export( &App.ServerSelector.CApi.onChangeDisarm,
  • @@ -59,6 +61,8 @@ @export(&App.CApi.destroy, .{ .name = "plac_app_destroy" });
    @export(&App.CApi.setStatePath, .{ .name = "plac_app_set_state_path" }); @export(&App.CApi.restoreState, .{ .name = "plac_app_restore_state" }); @export(&App.CApi.connect, .{ .name = "plac_app_connect" }); + @export(&App.CApi.lock, .{ .name = "plac_app_lock" }); + @export(&App.CApi.unlock, .{ .name = "plac_app_unlock" }); @export(&App.CApi.onServerChange, .{ .name = "plac_app_on_server_change" }); @export(&App.CApi.onServerChangeDisarm, .{ .name = "plac_app_on_server_change_disarm" }); @export(&App.CApi.onConnectionChange, .{ .name = "plac_app_on_connection_change" });
• gtk-adwaita/src/Application.vala
  • @@ -150,13 +150,18 @@
    private void start_scanning() { core.server_selector.on_change(() => { GLib.Idle.add(() => { + core.server_selector.lock(); this.render(); + core.server_selector.unlock(); return false; }); }); core.server_selector.load(); + + core.server_selector.lock(); this.render(); + core.server_selector.unlock(); } private void render() {
  • @@ -278,13 +283,18 @@
    public void start() { core.on_connection_change(() => { GLib.Idle.add(() => { + core.lock(); this.render(); + core.unlock(); return false; }); }); this.present(); + + core.lock(); this.render(); + core.unlock(); } private void render() {