oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

db/upnp: add local reference variables 

Prepare to refactor some code.
This commit is contained in:
Max Kellermann 2014-01-17 00:17:20 +01:00
parent a35c7bc81a
commit 59510f509a
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/db/upnp/Discovery.cxx
View File

@ -107,6 +107,9 @@ static ContentDirectoryPool contentDirectories;
static void * static void *
discoExplorer(void *) discoExplorer(void *)
{ {
auto &mutex = contentDirectories.m_mutex;
auto &directories = contentDirectories.m_directories;
for (;;) { for (;;) {
DiscoveredTask *tsk = 0; DiscoveredTask *tsk = 0;
if (!discoveredQueue.take(tsk)) { if (!discoveredQueue.take(tsk)) {
@ -114,12 +117,12 @@ discoExplorer(void *)
return (void*)1; return (void*)1;
} }
const ScopeLock protect(contentDirectories.m_mutex); const ScopeLock protect(mutex);
if (!tsk->alive) { if (!tsk->alive) {
// Device signals it is going off. // Device signals it is going off.
auto it = contentDirectories.m_directories.find(tsk->deviceId); auto it = directories.find(tsk->deviceId);
if (it != contentDirectories.m_directories.end()) { if (it != directories.end()) {
contentDirectories.m_directories.erase(it); directories.erase(it);
} }
} else { } else {
// Device signals its existence and well-being. Perform the // Device signals its existence and well-being. Perform the
@ -142,9 +145,9 @@ discoExplorer(void *)
} }
#if defined(__clang__) || GCC_CHECK_VERSION(4,8) #if defined(__clang__) || GCC_CHECK_VERSION(4,8)
auto e = contentDirectories.m_directories.emplace(tsk->deviceId, d); auto e = directories.emplace(tsk->deviceId, d);
#else #else
auto e = contentDirectories.m_directories.insert(std::make_pair(tsk->deviceId, d)); auto e = directories.insert(std::make_pair(tsk->deviceId, d));
#endif #endif
if (!e.second) if (!e.second)
e.first->second = d; e.first->second = d;
@ -199,13 +202,14 @@ void
UPnPDeviceDirectory::expireDevices() UPnPDeviceDirectory::expireDevices()
{ {
const ScopeLock protect(contentDirectories.m_mutex); const ScopeLock protect(contentDirectories.m_mutex);
auto &directories = contentDirectories.m_directories;
time_t now = time(0); time_t now = time(0);
bool didsomething = false; bool didsomething = false;
for (auto it = contentDirectories.m_directories.begin(); for (auto it = directories.begin();
it != contentDirectories.m_directories.end();) { it != directories.end();) {
if (now - it->second.last_seen > it->second.expires) { if (now - it->second.last_seen > it->second.expires) {
it = contentDirectories.m_directories.erase(it); it = directories.erase(it);
didsomething = true; didsomething = true;
} else { } else {
it++; it++;
@ -271,9 +275,10 @@ UPnPDeviceDirectory::getDirServices(std::vector<ContentDirectoryService> &out)
expireDevices(); expireDevices();
const ScopeLock protect(contentDirectories.m_mutex); const ScopeLock protect(contentDirectories.m_mutex);
auto &directories = contentDirectories.m_directories;
for (auto dit = contentDirectories.m_directories.begin(); for (auto dit = directories.begin();
dit != contentDirectories.m_directories.end(); dit++) { dit != directories.end(); dit++) {
for (const auto &service : dit->second.device.services) { for (const auto &service : dit->second.device.services) {
if (isCDService(service.serviceType.c_str())) { if (isCDService(service.serviceType.c_str())) {
out.emplace_back(dit->second.device, service); out.emplace_back(dit->second.device, service);