[Gammaray-commits] [KDAB/GammaRay] 40003e: ObjectListModel: Fix assert in objectRemovedMainTh...

Kevin Funk kevin.funk at kdab.com
Tue Mar 18 14:01:57 CET 2014


  Branch: refs/heads/master
  Home:   https://github.com/KDAB/GammaRay
  Commit: 40003e78b797939b136b9b2d8581f69071af3c63
      https://github.com/KDAB/GammaRay/commit/40003e78b797939b136b9b2d8581f69071af3c63
  Author: Kevin Funk <kevin.funk at kdab.com>
  Date:   2014-03-12 (Wed, 12 Mar 2014)

  Changed paths:
    M core/objectlistmodel.cpp

  Log Message:
  -----------
  ObjectListModel: Fix assert in objectRemovedMainThread

It's not safe to assume that m_invalidatedObjects does not contain obj in
case objectRemovedMainThread is called from the main thread.

We can end up in this order of calls:
- objectRemoved from a thread other than the main thread
  - inserts obj into m_invalidatedObjects
  - queues a call to objectRemovedMainThread
- objectAdded with the same obj-pointer
- objectRemoved from the main thread
  - calls objectRemovedMainThread directly
  - m_invalidatedObjects still contains obj.
=> Assertion triggered

We fix this by always trying to remove obj from m_invalidatedObjects in
objectRemovedMainThread.


  Commit: bc0aca9f601b7e525f1b25020226f3dbcacec8c3
      https://github.com/KDAB/GammaRay/commit/bc0aca9f601b7e525f1b25020226f3dbcacec8c3
  Author: Kevin Funk <kfunk at kde.org>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    M core/objectlistmodel.cpp

  Log Message:
  -----------
  Merge pull request #73 from krf/fix-multithreaded

ObjectListModel: Fix assert in objectRemovedMainThread


  Commit: e3b0fc71869fcf77a390b6b31e2186ad91cafac0
      https://github.com/KDAB/GammaRay/commit/e3b0fc71869fcf77a390b6b31e2186ad91cafac0
  Author: Kevin Funk <kevin.funk at kdab.com>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    M cmake/FindGraphviz.cmake
    M plugins/statemachineviewer/CMakeLists.txt

  Log Message:
  -----------
  Make compile with GraphViz >= 2.36.0

Fixes #70


  Commit: 651c08568e9e6aa2a2c5acf419dadd379b0148ab
      https://github.com/KDAB/GammaRay/commit/651c08568e9e6aa2a2c5acf419dadd379b0148ab
  Author: Kevin Funk <kfunk at kde.org>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    M cmake/FindGraphviz.cmake
    M plugins/statemachineviewer/CMakeLists.txt

  Log Message:
  -----------
  Merge pull request #75 from krf/2.0

Make compile with GraphViz >= 2.36.0


  Commit: fd31b627e1ba7ff45bec62f3abe8e3a29dfb3ed6
      https://github.com/KDAB/GammaRay/commit/fd31b627e1ba7ff45bec62f3abe8e3a29dfb3ed6
  Author: Kevin Funk <kevin.funk at kdab.com>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    M cmake/FindGraphviz.cmake

  Log Message:
  -----------
  Fix a bug for WIN32 environnement

DOT_TOOL was not defined in case one uses environnement variable GRAPHVIZ_ROOT

Patch by Guillaume Jacquenot, thanks!

Fixes #71


  Commit: 055eb05d5947070028d554dd39a477e5d50b5298
      https://github.com/KDAB/GammaRay/commit/055eb05d5947070028d554dd39a477e5d50b5298
  Author: Kevin Funk <kevin.funk at kdab.com>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    M cmake/FindGraphviz.cmake
    M core/objectlistmodel.cpp
    M plugins/statemachineviewer/CMakeLists.txt

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/2.0'


Compare: https://github.com/KDAB/GammaRay/compare/4f5a5dc2083d...055eb05d5947


More information about the Gammaray-commits mailing list