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

client: remember GLib source id

Browse Source 
Remove the event source from the GMainLoop object in
client_set_expired().
This commit is contained in:
Max Kellermann 2008-12-31 00:29:27 +01:00
parent d196ffdf3a
commit 2cdfd93830
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/client.c
View File

@ -79,6 +79,7 @@ struct client {
int fd; /* file descriptor; -1 if expired */ int fd; /* file descriptor; -1 if expired */
GIOChannel *channel; GIOChannel *channel;
guint source_id;
unsigned permission; unsigned permission;
@ -136,6 +137,11 @@ void client_set_permission(struct client *client, unsigned permission)
static inline void client_set_expired(struct client *client) static inline void client_set_expired(struct client *client)
{ {
if (client->source_id != 0) {
g_source_remove(client->source_id);
client->source_id = 0;
}
if (client->channel != NULL) { if (client->channel != NULL) {
g_io_channel_unref(client->channel); g_io_channel_unref(client->channel);
client->channel = NULL; client->channel = NULL;
@ -164,7 +170,8 @@ static void client_init(struct client *client, int fd)
set_nonblocking(fd); set_nonblocking(fd);
client->channel = g_io_channel_unix_new(client->fd); client->channel = g_io_channel_unix_new(client->fd);
g_io_add_watch(client->channel, G_IO_IN, client_in_event, client); client->source_id = g_io_add_watch(client->channel, G_IO_IN,
client_in_event, client);
client->lastTime = time(NULL); client->lastTime = time(NULL);
client->cmd_list = NULL; client->cmd_list = NULL;
@ -463,8 +470,7 @@ client_in_event(G_GNUC_UNUSED GIOChannel *source,
struct client *client = data; struct client *client = data;
int ret; int ret;
if (client_is_expired(client)) assert(!client_is_expired(client));
return false;
client->lastTime = time(NULL); client->lastTime = time(NULL);
@ -487,7 +493,7 @@ client_in_event(G_GNUC_UNUSED GIOChannel *source,
if (!g_queue_is_empty(client->deferred_send)) { if (!g_queue_is_empty(client->deferred_send)) {
/* deferred buffers exist: schedule write */ /* deferred buffers exist: schedule write */
g_io_add_watch(client->channel, G_IO_OUT, client->source_id = g_io_add_watch(client->channel, G_IO_OUT,
client_out_event, client); client_out_event, client);
return false; return false;
} }
@ -503,8 +509,7 @@ client_out_event(G_GNUC_UNUSED GIOChannel *source,
{ {
struct client *client = data; struct client *client = data;
if (client_is_expired(client)) assert(!client_is_expired(client));
return false;
client_write_deferred(client); client_write_deferred(client);
@ -518,7 +523,7 @@ client_out_event(G_GNUC_UNUSED GIOChannel *source,
if (g_queue_is_empty(client->deferred_send)) { if (g_queue_is_empty(client->deferred_send)) {
/* done sending deferred buffers exist: schedule /* done sending deferred buffers exist: schedule
read */ read */
g_io_add_watch(client->channel, G_IO_IN, client->source_id = g_io_add_watch(client->channel, G_IO_IN,
client_in_event, client); client_in_event, client);
return false; return false;
} }