Merge lp:~mhr3/libunity/shared-models-only-on-main-thread into lp:libunity
Status: | Merged |
---|---|
Approved by: | James Henstridge |
Approved revision: | 261 |
Merged at revision: | 260 |
Proposed branch: | lp:~mhr3/libunity/shared-models-only-on-main-thread |
Merge into: | lp:libunity |
Diff against target: |
300 lines (+117/-43) 6 files modified
configure.ac (+1/-1) src/unity-aggregator-scope-private.vala (+1/-2) src/unity-deprecated-scope-impl.vala (+5/-6) src/unity-models.vala (+71/-14) src/unity-scope-dbus-impl.vala (+6/-6) test/vala/test-scope.vala (+33/-14) |
To merge this branch: | bzr merge lp:~mhr3/libunity/shared-models-only-on-main-thread |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Henstridge | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+175317@code.launchpad.net |
Commit message
Fix a threading issue where shared model could have been serialized (in response to a standard Clone() request defined by the dee protocol) while a search was running in a separate thread and adding more rows to the model.
Description of the change
Fix a threading issue where shared model could have been serialized (in response to a standard Clone() request defined by the dee protocol) while a search was running in a separate thread add adding more rows to the model.
DeeSharedModels are no longer pushed to directly from the search thread, instead a IdleSource is used to add the rows from the main thread. This only fixes the non-deprecated scopes, but the deprecated ones don't perform searches in a separate thread in the first place.
PASSED: Continuous integration, rev:259 jenkins. qa.ubuntu. com/job/ libunity- ci/67/ jenkins. qa.ubuntu. com/job/ libunity- saucy-amd64- ci/52 jenkins. qa.ubuntu. com/job/ libunity- saucy-armhf- ci/52 jenkins. qa.ubuntu. com/job/ libunity- saucy-i386- ci/52
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ libunity- ci/67/rebuild
http://