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

lib/upnp/Discovery: use DeferredMonitor instead of BlockingCall()

Browse Source
This commit is contained in:
Max Kellermann 2017-08-25 11:01:30 +02:00
parent 8aef518c05
commit e5ee357903
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/upnp/Discovery.cxx
View File

@ -22,7 +22,6 @@
#include "ContentDirectoryService.hxx"
#include "Log.hxx"
#include "lib/curl/Global.hxx"
#include "event/Call.hxx"
#include "util/DeleteDisposer.hxx"
#include "util/ScopeExit.hxx"
#include "util/RuntimeError.hxx"
@ -34,7 +33,7 @@
UPnPDeviceDirectory::Downloader::Downloader(UPnPDeviceDirectory &_parent,
const Upnp_Discovery &disco)
:parent(_parent),
:DeferredMonitor(_parent.GetEventLoop()), parent(_parent),
id(disco.DeviceId), url(disco.Location),
expires(std::chrono::seconds(disco.Expires)),
request(*parent.curl, url.c_str(), *this)
@ -42,16 +41,6 @@ UPnPDeviceDirectory::Downloader::Downloader(UPnPDeviceDirectory &_parent,
parent.downloaders.push_back(*this);
}
void
UPnPDeviceDirectory::Downloader::Start()
{
auto &event_loop = parent.GetEventLoop();
BlockingCall(event_loop, [this](){
request.Start();
});
}
void
UPnPDeviceDirectory::Downloader::Destroy()
{
@ -59,6 +48,12 @@ UPnPDeviceDirectory::Downloader::Destroy()
DeleteDisposer());
}
void
UPnPDeviceDirectory::Downloader::RunDeferred()
{
request.Start();
}
void
UPnPDeviceDirectory::Downloader::OnHeaders(unsigned status,
std::multimap<std::string, std::string> &&)

11
src/lib/upnp/Discovery.hxx
View File

@ -26,6 +26,7 @@
#include "lib/curl/Handler.hxx"
#include "lib/curl/Request.hxx"
#include "thread/Mutex.hxx"
#include "event/DeferredMonitor.hxx"
#include "Compiler.h"
#include <upnp/upnp.h>
@ -83,7 +84,7 @@ class UPnPDeviceDirectory final : UpnpCallback {
class Downloader final
: public boost::intrusive::list_base_hook<boost::intrusive::link_mode<boost::intrusive::normal_link>>,
CurlResponseHandler {
DeferredMonitor, CurlResponseHandler {
UPnPDeviceDirectory &parent;
@ -99,10 +100,16 @@ class UPnPDeviceDirectory final : UpnpCallback {
Downloader(UPnPDeviceDirectory &_parent,
const Upnp_Discovery &disco);
void Start();
void Start() {
DeferredMonitor::Schedule();
}
void Destroy();
private:
/* virtual methods from DeferredMonitor */
void RunDeferred() override;
/* virtual methods from CurlResponseHandler */
void OnHeaders(unsigned status,
std::multimap<std::string, std::string> &&headers) override;