Skip to content

Make cycle_callback a functor (+ rename cycle_callback -> data_callback) #73

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

Closed
vozhyk- wants to merge 7 commits into from
Closed

Make cycle_callback a functor (+ rename cycle_callback -> data_callback) #73

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d83de8b
Merge pull request #1 from etr/master
vozhyk- Apr 10, 2015
1419fec
Rename cycle_callback -> data_callback; make data_callback a functor
vozhyk- Apr 10, 2015
ef45cd1
Use MHD_ContentReaderFreeCallback free_cb to delete data_callback
vozhyk- Apr 10, 2015
149f936
Fix http_response::data_callback declaration
vozhyk- Apr 10, 2015
a0fedda
Add CMake module to Makefile.am to be installed
vozhyk- Jul 5, 2015
818ef2a
Add ebuild
vozhyk- Jul 9, 2015
a495f45
ebuild: Change repo URI to github
vozhyk- Jul 9, 2015
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
11 changes: 8 additions & 3 deletions src/http_response.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ http_response::http_response(const http_response_builder& builder):
ca(0x0),
closure_data(0x0),
ce(builder._ce),
cycle_callback(builder._cycle_callback),
data_callback(builder._data_callback),
get_raw_response(this, builder._get_raw_response),
decorate_response(this, builder._decorate_response),
enqueue_response(this, builder._enqueue_response),
Expand Down Expand Up @@ -207,12 +207,17 @@ namespace details

ssize_t cb(void* cls, uint64_t pos, char* buf, size_t max)
{
ssize_t val = static_cast<http_response*>(cls)->cycle_callback(buf, max);
ssize_t val = (*static_cast<http_response*>(cls)->data_callback)(buf, max);
if(val == -1)
static_cast<http_response*>(cls)->completed = true;
return val;
}

void free_cb(void* cls)
{
delete static_cast<http_response*>(cls)->data_callback;
}

}

void http_response::get_raw_response_deferred(
Expand All @@ -226,7 +231,7 @@ void http_response::get_raw_response_deferred(
1024,
&details::cb,
this,
NULL
&details::free_cb
);
else
static_cast<http_response*>(this)->get_raw_response(response, ws);
Expand Down
24 changes: 21 additions & 3 deletions src/httpserver/http_response.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ namespace details
{
struct http_response_ptr;
ssize_t cb(void*, uint64_t, char*, size_t);
void free_cb(void*);
struct cache_entry;
};

Expand All @@ -62,7 +63,23 @@ class bad_caching_attempt: public std::exception
}
};

typedef ssize_t(*cycle_callback_ptr)(char*, size_t);
/**
* Callback called to obtain data from a deferred_response
**/
class data_callback
{
public:
/**
* @param buf Buffer to copy data to
* @param max Maximum number of bytes allowed to be copied
* @return number of bytes copied, or
Copy link
Copy Markdown
Contributor Author

@vozhyk- vozhyk- Apr 10, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be improved by mirroring MHD documentation

* -1 for end of stream, or
* -2 for end with error
**/
virtual ssize_t operator() (char* buf, size_t max) = 0;

virtual ~data_callback() {}
};

/**
* Class representing an abstraction for an Http Response. It is used from classes using these apis to send information through http protocol.
Expand Down Expand Up @@ -97,7 +114,7 @@ class http_response
ca(0x0),
closure_data(0x0),
ce(b.ce),
cycle_callback(b.cycle_callback),
data_callback(b.data_callback),
get_raw_response(b.get_raw_response),
decorate_response(b.decorate_response),
enqueue_response(b.enqueue_response),
Expand Down Expand Up @@ -259,7 +276,7 @@ class http_response
void(*ca)(void*);
void* closure_data;
details::cache_entry* ce;
cycle_callback_ptr cycle_callback;
data_callback* data_callback;

const get_raw_response_t get_raw_response;
const decorate_response_t decorate_response;
Expand Down Expand Up @@ -298,6 +315,7 @@ class http_response
friend class http_response_builder;
friend void clone_response(const http_response& hr, http_response** dhr);
friend ssize_t details::cb(void* cls, uint64_t pos, char* buf, size_t max);
friend void details::free_cb(void* cls);
friend std::ostream &operator<< (std::ostream &os, const http_response &r);
private:
http_response& operator=(const http_response& b);
Expand Down
12 changes: 9 additions & 3 deletions src/httpserver/http_response_builder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ class http_response_builder
_keepalive_secs(-1),
_keepalive_msg(""),
_send_topic(""),
_data_callback(NULL),
_ce(0x0),
_get_raw_response(&http_response::get_raw_response_str),
_decorate_response(&http_response::decorate_response_str),
Expand Down Expand Up @@ -120,6 +121,7 @@ class http_response_builder
_keepalive_secs(-1),
_keepalive_msg(""),
_send_topic(""),
_data_callback(NULL),
_ce(0x0),
_get_raw_response(&http_response::get_raw_response_str),
_decorate_response(&http_response::decorate_response_str),
Expand All @@ -142,6 +144,9 @@ class http_response_builder
_keepalive_secs(b._keepalive_secs),
_keepalive_msg(b._keepalive_msg),
_send_topic(b._send_topic),
// Is copying the pointer a good idea?
// (since it is deleted in details::free_cb)
_data_callback(b._data_callback),
_ce(b._ce),
_get_raw_response(b._get_raw_response),
_decorate_response(b._decorate_response),
Expand All @@ -164,6 +169,7 @@ class http_response_builder
_keepalive_secs = b._keepalive_secs;
_keepalive_msg = b._keepalive_msg;
_send_topic = b._send_topic;
_data_callback = b._data_callback;
_ce = b._ce;
_get_raw_response = b._get_raw_response;
_decorate_response = b._decorate_response;
Expand Down Expand Up @@ -233,9 +239,9 @@ class http_response_builder
return *this;
}

http_response_builder& deferred_response(cycle_callback_ptr cycle_callback)
http_response_builder& deferred_response(data_callback* data_callback)
{
_cycle_callback = cycle_callback;
_data_callback = data_callback;
_get_raw_response = &http_response::get_raw_response_deferred;
_decorate_response = &http_response::decorate_response_deferred;
return *this;
Expand Down Expand Up @@ -276,7 +282,7 @@ class http_response_builder
int _keepalive_secs;
std::string _keepalive_msg;
std::string _send_topic;
cycle_callback_ptr _cycle_callback;
data_callback* _data_callback;
details::cache_entry* _ce;

void (http_response::*_get_raw_response)(MHD_Response**, webserver*);
Expand Down