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

input/curl: move code to SeekInternal(), simplify DoSeek()

Browse Source 
Simplifies the code and reduces the number of IOThread roundtrips.
This commit is contained in:
Max Kellermann 2017-01-03 08:18:46 +01:00
parent 3e8cc2c670
commit 534e1fa6eb
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/input/plugins/CurlInputPlugin.cxx
View File

@ -108,6 +108,11 @@ struct CurlInputStream final : public AsyncInputStream, CurlRequest {
*/
void FreeEasyIndirect();
/**
* The DoSeek() implementation invoked in the IOThread.
*/
void SeekInternal(offset_type new_offset);
/**
* Called when a new response begins. This is used to discard
* headers from previous responses (for example authentication
@ -497,32 +502,20 @@ CurlInputStream::InitEasy()
}
void
CurlInputStream::DoSeek(offset_type new_offset)
CurlInputStream::SeekInternal(offset_type new_offset)
{
assert(IsReady());
/* close the old connection and open a new one */
mutex.unlock();
FreeEasyIndirect();
FreeEasy();
offset = new_offset;
if (offset == size) {
if (offset == size)
/* seek to EOF: simulate empty result; avoid
triggering a "416 Requested Range Not Satisfiable"
response */
mutex.lock();
SeekDone();
return;
}
try {
InitEasy();
} catch (...) {
mutex.lock();
throw;
}
InitEasy();
/* send the "Range" header */
@ -531,15 +524,19 @@ CurlInputStream::DoSeek(offset_type new_offset)
easy.SetOption(CURLOPT_RANGE, range);
}
try {
input_curl_easy_add_indirect(this);
} catch (...) {
mutex.lock();
throw;
}
curl_global->Add(easy.Get(), *this);
}
mutex.lock();
offset = new_offset;
void
CurlInputStream::DoSeek(offset_type new_offset)
{
assert(IsReady());
const ScopeUnlock unlock(mutex);
BlockingCall(io_thread_get(), [this, new_offset](){
SeekInternal(new_offset);
});
}
inline InputStream *