diff options
| author | Josh Blum | 2010-05-04 13:15:57 -0700 |
|---|---|---|
| committer | Josh Blum | 2010-05-04 13:15:57 -0700 |
| commit | b6f86944737975efde1275144c1c344e4a633146 (patch) | |
| tree | 6287b1cd117425a34d9499bc69c706bd0fdc971b /gcell/lib/runtime/gc_job_manager_impl.h | |
| parent | 1e4bf239c1f09a0180585de62746922bcd34b639 (diff) | |
| parent | e22224454f63be561fa2a5923d35b65ba403b6ac (diff) | |
| download | gnuradio-b6f86944737975efde1275144c1c344e4a633146.tar.gz gnuradio-b6f86944737975efde1275144c1c344e4a633146.tar.bz2 gnuradio-b6f86944737975efde1275144c1c344e4a633146.zip | |
Merge branch 'master' of http://gnuradio.org/git/gnuradio into uhd
Diffstat (limited to 'gcell/lib/runtime/gc_job_manager_impl.h')
| -rw-r--r-- | gcell/lib/runtime/gc_job_manager_impl.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gcell/lib/runtime/gc_job_manager_impl.h b/gcell/lib/runtime/gc_job_manager_impl.h index a56117870..640fdfe79 100644 --- a/gcell/lib/runtime/gc_job_manager_impl.h +++ b/gcell/lib/runtime/gc_job_manager_impl.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007,2008,2009 Free Software Foundation, Inc. + * Copyright 2007,2008,2009,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -107,16 +107,16 @@ class gc_job_manager_impl : public gc_job_manager boost::shared_ptr<void> _d_comp_info_boost; // hack for automatic storage mgmt // used to coordinate communication w/ the event handling thread - omni_mutex d_eh_mutex; - omni_condition d_eh_cond; + boost::mutex d_eh_mutex; + boost::condition_variable d_eh_cond; pthread_t d_eh_thread; // the event handler thread volatile evt_handler_state d_eh_state; volatile bool d_shutdown_requested; spe_event_handler d_spe_event_handler; // used to coordinate communication w/ the job completer thread - omni_mutex d_jc_mutex; - omni_condition d_jc_cond; + boost::mutex d_jc_mutex; + boost::condition_variable d_jc_cond; pthread_t d_jc_thread; // the job completion thread volatile job_completer_state d_jc_state; int d_jc_njobs_active; // # of jobs submitted but not yet reaped |