Skip to content

Fix rare startup race condition between OpenCL background job and dt_wb_presets_init #20765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
da-phil wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −10
Draft

Fix rare startup race condition between OpenCL background job and dt_wb_presets_init #20765

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions src/common/darktable.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1873,23 +1873,25 @@ int dt_init(int argc,
heif_init(NULL);
#endif

dt_splash_screen_set_progress(_("initializing WB presets"));
dt_wb_presets_init(NULL);

// Do locale-sensitive init BEFORE starting any background worker jobs
dt_splash_screen_set_progress(_("loading noise profiles"));
darktable.noiseprofile_parser = dt_noiseprofile_init(noiseprofiles_from_command);

dt_splash_screen_set_progress(_("starting OpenCL"));
darktable.opencl = (dt_opencl_t *)calloc(1, sizeof(dt_opencl_t));
darktable.points = (dt_points_t *)calloc(1, sizeof(dt_points_t));
dt_points_init(darktable.points, dt_get_num_threads());

// Only then kick off the OpenCL background job
if(init_gui)
dt_control_add_job(DT_JOB_QUEUE_SYSTEM_BG, _detect_opencl_job_create(exclude_opencl));
else
dt_opencl_init(darktable.opencl, exclude_opencl, print_statistics);

darktable.points = (dt_points_t *)calloc(1, sizeof(dt_points_t));
dt_points_init(darktable.points, dt_get_num_threads());

dt_wb_presets_init(NULL);

dt_splash_screen_set_progress(_("loading noise profiles"));
darktable.noiseprofile_parser = dt_noiseprofile_init(noiseprofiles_from_command);

// must come before mipmap_cache, because that one will need to access
// image dimensions stored in here:
// must come before mipmap_cache, because that one will need to access image dimensions stored in here:
dt_image_cache_init();

dt_mipmap_cache_init();
Expand Down
Loading