Commit 647e0645 authored by Tristan Matthews's avatar Tristan Matthews

* #30347: daemon: remove ScopedLock

parent 5a8b31fd
...@@ -84,8 +84,6 @@ libsflphone_la_SOURCES = conference.cpp \ ...@@ -84,8 +84,6 @@ libsflphone_la_SOURCES = conference.cpp \
logger.cpp \ logger.cpp \
numbercleaner.cpp \ numbercleaner.cpp \
fileutils.cpp \ fileutils.cpp \
scoped_lock.cpp \
scoped_lock.h \
sflthread.cpp \ sflthread.cpp \
sflthread.h \ sflthread.h \
conference.h \ conference.h \
......
/*
* Copyright (C) 2012-2013 Savoir-Faire Linux Inc.
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Additional permission under GNU GPL version 3 section 7:
*
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
* terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
#include "scoped_lock.h"
namespace sfl {
ScopedLock::ScopedLock(pthread_mutex_t &mutex) : mutex_(mutex) {
pthread_mutex_lock(&mutex_);
}
ScopedLock::ScopedLock(pthread_mutex_t &mutex, bool &acquired) : mutex_(mutex) {
acquired = (pthread_mutex_trylock(&mutex_) == 0);
}
ScopedLock::~ScopedLock() {
pthread_mutex_unlock(&mutex_);
}
}
/*
* Copyright (C) 2012-2013 Savoir-Faire Linux Inc.
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Additional permission under GNU GPL version 3 section 7:
*
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
* terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
#ifndef SCOPED_LOCK_H_
#define SCOPED_LOCK_H_
#include <pthread.h>
/**
* @file scoped_lock.h
* @brief Helper class to allow exception-safe mutex locking/unlocking.
* Note that the mutex does not belong to this class.
*/
namespace sfl {
class ScopedLock {
public:
explicit ScopedLock(pthread_mutex_t &mutex);
// acquired will be set to true if the mutex was locked immediately
ScopedLock(pthread_mutex_t &mutex, bool &acquired);
~ScopedLock();
private:
pthread_mutex_t &mutex_;
};
}
#endif // SCOPED_LOCK_H_
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment