scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-20 11:40:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lock guard: deprecate

Browse Source
This commit is contained in:
Martin Pulec
2014-10-20 14:10:51 +02:00
parent 75503b84a7
commit d2548bd91c
4 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/stats.cpp
View File

@@ -8,7 +8,6 @@
#include "debug.h"
#include "messaging.h"
#include "module.h"
#include "utils/lock_guard.h"
#include "utils/resource_manager.h"
#define MAX_ITEMS 100

4
src/utils/lock_guard.h
View File

@@ -1,3 +1,7 @@
/**
* @deprecated
* Do not use these functions in new code, use rather std::lock_guard and similar
*/
#ifndef LOCK_GUARD_H_
#define LOCK_GUARD_H_

1
src/utils/video_frame_pool.h
View File

@@ -47,7 +47,6 @@
#include "video.h"
#ifdef __cplusplus
#include "utils/lock_guard.h"
#include <condition_variable>
#include <iostream>

30
src/utils/wait_obj.h
View File

@@ -39,34 +39,30 @@
#define UTILS_WAIT_OBJ_H_
#ifdef __cplusplus
#include "utils/lock_guard.h"
#include <condition_variable>
#include <mutex>
struct wait_obj {
public:
wait_obj() : m_val(false) {
pthread_mutex_init(&m_lock, NULL);
pthread_cond_init(&m_cv, NULL);
}
~wait_obj() {
pthread_mutex_destroy(&m_lock);
pthread_cond_destroy(&m_cv);
}
void wait() {
lock_guard guard(m_lock);
while (!m_val)
pthread_cond_wait(&m_cv, &m_lock);
std::unique_lock<std::mutex> lk(m_lock);
m_cv.wait(lk, [this] { return m_val; });
}
void reset() {
lock_guard guard(m_lock);
m_val = false;
std::lock_guard<std::mutex> lk(m_lock);
m_val = false;
}
void notify() {
lock_guard guard(m_lock);
m_val = true;
pthread_cond_signal(&m_cv);
std::unique_lock<std::mutex> lk(m_lock);
m_val = true;
lk.unlock();
m_cv.notify_one();
}
private:
pthread_mutex_t m_lock;
pthread_cond_t m_cv;
std::mutex m_lock;
std::condition_variable m_cv;
bool m_val;
};
#endif // __cplusplus