TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

general: replace remaining references to ConditionVarFull.

Browse Source
This commit is contained in:
rdb 2019-02-11 16:17:33 +01:00
parent afed80e83a
commit 11b5f09819
7 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/chan/animControl.h
View File

@ -24,7 +24,7 @@
#include "typedReferenceCount.h" #include "typedReferenceCount.h"
#include "namable.h" #include "namable.h"
#include "pmutex.h" #include "pmutex.h"
#include "conditionVarFull.h" #include "conditionVar.h"
class PartBundle; class PartBundle;
class AnimChannelBase; class AnimChannelBase;
@ -79,7 +79,7 @@ private:
bool _pending; bool _pending;
std::string _pending_done_event; std::string _pending_done_event;
Mutex _pending_lock; // protects the above two. Mutex _pending_lock; // protects the above two.
ConditionVarFull _pending_cvar; // signals when _pending goes true. ConditionVar _pending_cvar; // signals when _pending goes true.
// This is a PT(PartGroup) instead of a PT(PartBundle), just because we // This is a PT(PartGroup) instead of a PT(PartBundle), just because we
// can't include partBundle.h for circular reasons. But it actually keeps a // can't include partBundle.h for circular reasons. But it actually keeps a

1
panda/src/event/asyncFuture.cxx
View File

@ -14,7 +14,6 @@
#include "asyncFuture.h" #include "asyncFuture.h"
#include "asyncTask.h" #include "asyncTask.h"
#include "asyncTaskManager.h" #include "asyncTaskManager.h"
#include "conditionVarFull.h"
#include "config_event.h" #include "config_event.h"
#include "pStatTimer.h" #include "pStatTimer.h"
#include "throw_event.h" #include "throw_event.h"

4
panda/src/event/asyncTaskChain.h
View File

@ -20,7 +20,7 @@
#include "asyncTaskCollection.h" #include "asyncTaskCollection.h"
#include "typedReferenceCount.h" #include "typedReferenceCount.h"
#include "thread.h" #include "thread.h"
#include "conditionVarFull.h" #include "conditionVar.h"
#include "pvector.h" #include "pvector.h"
#include "pdeque.h" #include "pdeque.h"
#include "pStatCollector.h" #include "pStatCollector.h"
@ -159,7 +159,7 @@ protected:
AsyncTaskManager *_manager; AsyncTaskManager *_manager;
ConditionVarFull _cvar; // signaled when one of the task heaps, _state, or _current_sort changes, or a task finishes. ConditionVar _cvar; // signaled when one of the task heaps, _state, or _current_sort changes, or a task finishes.
enum State { enum State {
S_initial, // no threads yet S_initial, // no threads yet

4
panda/src/event/asyncTaskManager.h
View File

@ -23,7 +23,7 @@
#include "thread.h" #include "thread.h"
#include "pmutex.h" #include "pmutex.h"
#include "mutexHolder.h" #include "mutexHolder.h"
#include "conditionVarFull.h" #include "conditionVar.h"
#include "pvector.h" #include "pvector.h"
#include "pdeque.h" #include "pdeque.h"
#include "pStatCollector.h" #include "pStatCollector.h"
@ -130,7 +130,7 @@ protected:
TasksByName _tasks_by_name; TasksByName _tasks_by_name;
PT(ClockObject) _clock; PT(ClockObject) _clock;
ConditionVarFull _frame_cvar; // Signalled when the clock ticks. ConditionVar _frame_cvar; // Signalled when the clock ticks.
static AsyncTaskManager* _global_ptr; static AsyncTaskManager* _global_ptr;

4
panda/src/gobj/texture.h
View File

@ -29,7 +29,7 @@
#include "pStatCollector.h" #include "pStatCollector.h"
#include "pmutex.h" #include "pmutex.h"
#include "mutexHolder.h" #include "mutexHolder.h"
#include "conditionVarFull.h" #include "conditionVar.h"
#include "loaderOptions.h" #include "loaderOptions.h"
#include "string_utils.h" #include "string_utils.h"
#include "cycleData.h" #include "cycleData.h"
@ -1034,7 +1034,7 @@ protected:
Mutex _lock; Mutex _lock;
// Used to implement unlocked_reload_ram_image(). // Used to implement unlocked_reload_ram_image().
ConditionVarFull _cvar; // condition: _reloading is true. ConditionVar _cvar; // condition: _reloading is true.
bool _reloading; bool _reloading;
// A Texture keeps a list (actually, a map) of all the // A Texture keeps a list (actually, a map) of all the

3
panda/src/gobj/vertexDataPage.h
View File

@ -21,7 +21,6 @@
#include "vertexDataSaveFile.h" #include "vertexDataSaveFile.h"
#include "pmutex.h" #include "pmutex.h"
#include "conditionVar.h" #include "conditionVar.h"
#include "conditionVarFull.h"
#include "thread.h" #include "thread.h"
#include "mutexHolder.h" #include "mutexHolder.h"
#include "pdeque.h" #include "pdeque.h"
@ -147,7 +146,7 @@ private:
// Signaled when anything new is added to either of the above queues, or // Signaled when anything new is added to either of the above queues, or
// when _shutdown is set true. This wakes up any pending thread. // when _shutdown is set true. This wakes up any pending thread.
ConditionVarFull _pending_cvar; ConditionVar _pending_cvar;
PageThreads _threads; PageThreads _threads;
friend class PageThread; friend class PageThread;

4
panda/src/net/datagramQueue.h
View File

@ -18,7 +18,7 @@
#include "netDatagram.h" #include "netDatagram.h"
#include "pmutex.h" #include "pmutex.h"
#include "conditionVarFull.h" #include "conditionVar.h"
#include "pdeque.h" #include "pdeque.h"
/** /**
@ -41,7 +41,7 @@ public:
private: private:
Mutex _cvlock; Mutex _cvlock;
ConditionVarFull _cv; // signaled when queue contents change. ConditionVar _cv; // signaled when queue contents change.
typedef pdeque<NetDatagram> QueueType; typedef pdeque<NetDatagram> QueueType;
QueueType _queue; QueueType _queue;