Mentions légales du service

Skip to content
Snippets Groups Projects

jlindgre std threads

Merged Jussi Lindgren requested to merge wip-jlindgre-std-threads into wip-all-openvibe20-base
4 unresolved threads

Esp check class DoubleLock.

Merge request reports

Approval is optional

Merged by Jussi LindgrenJussi Lindgren 7 years ago (Oct 25, 2017 3:00pm UTC)

Merge details

  • Changes merged into wip-all-openvibe20-base with 40b64bdd.
  • Deleted the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
251 256
252 257 acquire();
253 258
254 acquire_t.reset(new boost::thread(boost::bind(&boost::asio::io_service::run, &m_io)));
259 auto f = boost::bind(&boost::asio::io_service::run, &m_io);
  • 132 134
    133 135 OpenViBE::uint32 m_ui32CurrentQueueIndex;
    134 136
    135 boost::scoped_ptr<boost::thread> m_ThreadPtr;
    137 boost::scoped_ptr<std::thread> m_ThreadPtr;
  • 1 # ---------------------------------
    2 # Finds third party rt
    3 # Adds library to target
    4 # Adds include path
    5 # ---------------------------------
    6
    7 GET_PROPERTY(OV_PRINTED GLOBAL PROPERTY OV_TRIED_ThirdPartyRT)
    8
    9 IF(UNIX)
    10 # For Ubuntu 13.04 (interprocess/ipc/message_queue.hpp in ovasCPluginExternalStimulations.cpp caused dep)
  • 110 }
    108 if (l_f64DriftMs != m_f64LastDriftMs)
    109 {
    110 m_f64LastDriftMs = l_f64DriftMs;
    111 111
    112 if(l_bShouldDisconnect)
    113 {
    114 gdk_threads_enter();
    115 m_rGUI.disconnect();
    116 gdk_threads_leave();
    112 gdk_threads_add_idle(idle_updatedrift_cb, (void *)this);
    113 }
    114
    115 if (l_bShouldDisconnect)
    116 {
    117 gdk_threads_add_idle(idle_updatedisconnect_cb, (void *)this);
  • Jussi Lindgren added 37 commits

    added 37 commits

    • d76c7c8d...c2ba1133 - 31 commits from branch wip-all-openvibe20-base
    • fe7fa2dc - Server: Fixes AS freeze on gtk 2.24.31 on Windows
    • c3eed2a5 - Server: Fixed gcc unhappiness
    • 3e1803ae - Server: Changed to use more thread safe gdk_threads_add_idle()
    • 7fd91b7f - Drivers: Removed gdk_threads_enter()/exit() from Biosemi ActiveTwo
    • bf54f73b - Server: Changed to use std::thread and std::mutex instead of Boost
    • 40b64bdd - Server: Use std for pointers instead of boost

    Compare with previous version

  • Please register or sign in to reply
    Loading