Skip to content

Add data closure to the cycle_callback of deferred response #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
etr merged 4 commits into from
Feb 11, 2019
Merged

Add data closure to the cycle_callback of deferred response #145

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e52ed01
Added closure_data to deferred_response
etr Feb 11, 2019
cd9839e
Added example file
etr Feb 11, 2019
a7a52ce
Fix documentation
etr Feb 11, 2019
ed0841d
Remove completed flag from code
etr Feb 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Remove completed flag from code
  • Loading branch information
@etr
etr committed Feb 11, 2019
commit ed0841d177d88dada6e21e4dd5c36f8b670c1ee0
11 changes: 2 additions & 9 deletions src/deferred_response.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,9 @@ namespace httpserver
namespace details
{

MHD_Response* get_raw_response_helper(void* cls, bool completed, ssize_t (*cb)(void*, uint64_t, char*, size_t))
MHD_Response* get_raw_response_helper(void* cls, ssize_t (*cb)(void*, uint64_t, char*, size_t))
{
if(!completed)
{
return MHD_create_response_from_callback(MHD_SIZE_UNKNOWN, 1024, cb, cls, NULL);
}
else
{
return static_cast<string_response*>(cls)->get_raw_response();
}
return MHD_create_response_from_callback(MHD_SIZE_UNKNOWN, 1024, cb, cls, NULL);
}

}
Expand Down
32 changes: 6 additions & 26 deletions src/httpserver/deferred_response.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace httpserver

namespace details
{
MHD_Response* get_raw_response_helper(void* cls, bool completed, ssize_t (*cb)(void*, uint64_t, char*, size_t));
MHD_Response* get_raw_response_helper(void* cls, ssize_t (*cb)(void*, uint64_t, char*, size_t));
}

template <class T>
Expand All @@ -49,24 +49,21 @@ class deferred_response : public string_response
):
string_response(content, response_code, content_type),
cycle_callback(cycle_callback),
closure_data(closure_data),
completed(false)
closure_data(closure_data)
{
}

deferred_response(const deferred_response& other):
string_response(other),
cycle_callback(other.cycle_callback),
closure_data(other.closure_data),
completed(other.completed)
closure_data(other.closure_data)
{
}

deferred_response(deferred_response&& other) noexcept:
string_response(std::move(other)),
cycle_callback(std::move(other.cycle_callback)),
closure_data(std::move(other.closure_data)),
completed(other.completed)
closure_data(std::move(other.closure_data))
{
}

Expand All @@ -77,7 +74,6 @@ class deferred_response : public string_response
(string_response&) (*this) = b;
this->cycle_callback = b.cycle_callback;
this->closure_data = b.closure_data;
this->completed = b.completed;

return *this;
}
Expand All @@ -89,7 +85,6 @@ class deferred_response : public string_response
(string_response&) (*this) = std::move(b);
this->cycle_callback = std::move(b.cycle_callback);
this->closure_data = std::move(b.closure_data);
this->completed = b.completed;

return *this;
}
Expand All @@ -100,32 +95,17 @@ class deferred_response : public string_response

MHD_Response* get_raw_response()
{
return details::get_raw_response_helper((void*) this, completed, &(this->cb));
}

void decorate_response(MHD_Response* response)
{
if(completed)
{
static_cast<string_response*>(this)->decorate_response(response);
}
return details::get_raw_response_helper((void*) this, &(this->cb));
}

private:
ssize_t (*cycle_callback)(std::shared_ptr<T>, char*, size_t);
std::shared_ptr<T> closure_data;
bool completed;

static ssize_t cb(void* cls, uint64_t pos, char* buf, size_t max)
{
deferred_response<T>* dfr = static_cast<deferred_response<T>*>(cls);
ssize_t val = dfr->cycle_callback(dfr->closure_data, buf, max);
if(val == -1)
{
dfr->completed = true;
}

return val;
return dfr->cycle_callback(dfr->closure_data, buf, max);
}
};

Expand Down