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

lib/curl/Global: move code to UpdateTimeout()

Browse Source
This commit is contained in:
Max Kellermann
2017-01-08 12:41:59 +01:00
parent 3cba76552b
commit 9f5eddcd13
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib/curl/Global.cxx
View File

@@ -217,15 +217,12 @@ CurlGlobal::ReadInfo()
} }
} }
int inline void
CurlGlobal::TimerFunction(gcc_unused CURLM *_global, long timeout_ms, void *userp) CurlGlobal::UpdateTimeout(long timeout_ms)
{ {
auto &global = *(CurlGlobal *)userp;
assert(_global == global.multi.Get());
if (timeout_ms < 0) { if (timeout_ms < 0) {
global.Cancel(); TimeoutMonitor::Cancel();
return 0; return;
} }
if (timeout_ms < 10) if (timeout_ms < 10)
@@ -235,7 +232,16 @@ CurlGlobal::TimerFunction(gcc_unused CURLM *_global, long timeout_ms, void *user
of 10ms. */ of 10ms. */
timeout_ms = 10; timeout_ms = 10;
global.Schedule(std::chrono::milliseconds(timeout_ms)); TimeoutMonitor::Schedule(std::chrono::milliseconds(timeout_ms));
}
int
CurlGlobal::TimerFunction(gcc_unused CURLM *_global, long timeout_ms, void *userp)
{
auto &global = *(CurlGlobal *)userp;
assert(_global == global.multi.Get());
global.UpdateTimeout(timeout_ms);
return 0; return 0;
} }

1
src/lib/curl/Global.hxx
View File

@@ -76,6 +76,7 @@ public:
} }
private: private:
void UpdateTimeout(long timeout_ms);
static int TimerFunction(CURLM *global, long timeout_ms, void *userp); static int TimerFunction(CURLM *global, long timeout_ms, void *userp);
/* virtual methods from class TimeoutMonitor */ /* virtual methods from class TimeoutMonitor */