p/json-rpc-shell
1
1
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases 2 Wiki Activity

Rename client_vtable::destroy to finalize

Browse Source 
Matches a similar concept from garbage-collected languages.
This commit is contained in:
Přemysl Eric Janouch 2018-10-16 04:12:37 +02:00
parent 7f6db9d39f
commit 7d922352ea
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
demo-json-rpc-server.c
View File

@ -1814,9 +1814,8 @@ struct client_vtable
/// Attempt a graceful shutdown /// Attempt a graceful shutdown
void (*shutdown) (struct client *client); void (*shutdown) (struct client *client);
/// Do any additional cleanup /// Do any additional cleanup for the concrete class before destruction
// TODO: rename to "finalize" or "cleanup"? void (*finalize) (struct client *client);
void (*destroy) (struct client *client);
/// Process incoming data; "len == 0" means EOF /// Process incoming data; "len == 0" means EOF
bool (*push) (struct client *client, const void *data, size_t len); bool (*push) (struct client *client, const void *data, size_t len);
@ -1848,7 +1847,7 @@ client_destroy (struct client *self)
ctx->n_clients--; ctx->n_clients--;
// First uninitialize the higher-level implementation // First uninitialize the higher-level implementation
self->vtable->destroy (self); self->vtable->finalize (self);
ev_io_stop (EV_DEFAULT_ &self->read_watcher); ev_io_stop (EV_DEFAULT_ &self->read_watcher);
ev_io_stop (EV_DEFAULT_ &self->write_watcher); ev_io_stop (EV_DEFAULT_ &self->write_watcher);
@ -2034,7 +2033,7 @@ client_fcgi_shutdown (struct client *client)
} }
static void static void
client_fcgi_destroy (struct client *client) client_fcgi_finalize (struct client *client)
{ {
struct client_fcgi *self = (struct client_fcgi *) client; struct client_fcgi *self = (struct client_fcgi *) client;
fcgi_muxer_free (&self->muxer); fcgi_muxer_free (&self->muxer);
@ -2051,7 +2050,7 @@ client_fcgi_push (struct client *client, const void *data, size_t len)
static struct client_vtable client_fcgi_vtable = static struct client_vtable client_fcgi_vtable =
{ {
.shutdown = client_fcgi_shutdown, .shutdown = client_fcgi_shutdown,
.destroy = client_fcgi_destroy, .finalize = client_fcgi_finalize,
.push = client_fcgi_push, .push = client_fcgi_push,
}; };
@ -2118,7 +2117,7 @@ client_scgi_on_content (void *user_data, const void *data, size_t len)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
static void static void
client_scgi_destroy (struct client *client) client_scgi_finalize (struct client *client)
{ {
struct client_scgi *self = (struct client_scgi *) client; struct client_scgi *self = (struct client_scgi *) client;
request_free (&self->request); request_free (&self->request);
@ -2143,7 +2142,7 @@ client_scgi_push (struct client *client, const void *data, size_t len)
static struct client_vtable client_scgi_vtable = static struct client_vtable client_scgi_vtable =
{ {
.destroy = client_scgi_destroy, .finalize = client_scgi_finalize,
.push = client_scgi_push, .push = client_scgi_push,
}; };
@ -2224,7 +2223,7 @@ client_ws_shutdown (struct client *client)
} }
static void static void
client_ws_destroy (struct client *client) client_ws_finalize (struct client *client)
{ {
FIND_CONTAINER (self, client, struct client_ws, client); FIND_CONTAINER (self, client, struct client_ws, client);
ws_handler_free (&self->handler); ws_handler_free (&self->handler);
@ -2240,7 +2239,7 @@ client_ws_push (struct client *client, const void *data, size_t len)
static struct client_vtable client_ws_vtable = static struct client_vtable client_ws_vtable =
{ {
.shutdown = client_ws_shutdown, .shutdown = client_ws_shutdown,
.destroy = client_ws_destroy, .finalize = client_ws_finalize,
.push = client_ws_push, .push = client_ws_push,
}; };