zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-21 09:32:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Instead of trying to send data to server every 1/10th of second, send

Browse source 
it whenever there's space in buffer using g_input_add() with G_IO_WRITE


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1023 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-12-28 17:22:35 +00:00 • committed by cras
commit 1a536c204c
1 changed files with 17 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/core/net-sendbuffer.c
View file

@ -26,13 +26,13 @@
struct _NET_SENDBUF_REC { struct _NET_SENDBUF_REC {
GIOChannel *handle; GIOChannel *handle;
int send_tag;
int bufsize; int bufsize;
int bufpos; int bufpos;
char *buffer; /* Buffer is NULL until it's actually needed. */ char *buffer; /* Buffer is NULL until it's actually needed. */
}; };
static GSList *buffers; static GSList *buffers;
static int timeout_tag;
/* Create new buffer - if `bufsize' is zero or less, DEFAULT_BUFFER_SIZE /* Create new buffer - if `bufsize' is zero or less, DEFAULT_BUFFER_SIZE
is used */ is used */
@ -43,6 +43,7 @@ NET_SENDBUF_REC *net_sendbuffer_create(GIOChannel *handle, int bufsize)
g_return_val_if_fail(handle != NULL, NULL); g_return_val_if_fail(handle != NULL, NULL);
rec = g_new0(NET_SENDBUF_REC, 1); rec = g_new0(NET_SENDBUF_REC, 1);
rec->send_tag = -1;
rec->handle = handle; rec->handle = handle;
rec->bufsize = bufsize > 0 ? bufsize : DEFAULT_BUFFER_SIZE; rec->bufsize = bufsize > 0 ? bufsize : DEFAULT_BUFFER_SIZE;
@ -55,6 +56,7 @@ void net_sendbuffer_destroy(NET_SENDBUF_REC *rec, int close)
{ {
buffers = g_slist_remove(buffers, rec); buffers = g_slist_remove(buffers, rec);
if (rec->send_tag != -1) g_source_remove(rec->send_tag);
if (close) net_disconnect(rec->handle); if (close) net_disconnect(rec->handle);
g_free_not_null(rec->buffer); g_free_not_null(rec->buffer);
g_free(rec); g_free(rec);
@ -79,23 +81,15 @@ static int buffer_send(NET_SENDBUF_REC *rec)
return FALSE; return FALSE;
} }
static int sig_sendbuffer(void) static void sig_sendbuffer(NET_SENDBUF_REC *rec)
{ {
GSList *tmp; if (rec->buffer != NULL) {
int stop; if (!buffer_send(rec))
return;
stop = TRUE;
for (tmp = buffers; tmp != NULL; tmp = tmp->next) {
NET_SENDBUF_REC *rec = tmp->data;
if (rec->buffer != NULL) {
if (!buffer_send(rec))
stop = FALSE;
}
} }
if (stop) timeout_tag = -1; g_source_remove(rec->send_tag);
return !stop; rec->send_tag = -1;
} }
/* Add `data' to transmit buffer - return FALSE if buffer is full */ /* Add `data' to transmit buffer - return FALSE if buffer is full */
@ -133,18 +127,17 @@ int net_sendbuffer_send(NET_SENDBUF_REC *rec, const void *data, int size)
data = ((char *) data) + ret; data = ((char *) data) + ret;
} }
if (size > 0) { if (size <= 0)
/* everything couldn't be sent. */ return 0;
if (timeout_tag == -1) {
timeout_tag = g_timeout_add(100, (GSourceFunc)
sig_sendbuffer, NULL);
}
if (!buffer_add(rec, data, size)) /* everything couldn't be sent. */
return -1; if (rec->send_tag == -1) {
rec->send_tag =
g_input_add(rec->handle, G_INPUT_WRITE,
(GInputFunction) sig_sendbuffer, rec);
} }
return 0; return buffer_add(rec, data, size) ? 0 : -1;
} }
/* Returns the socket handle */ /* Returns the socket handle */
@ -157,11 +150,9 @@ GIOChannel *net_sendbuffer_handle(NET_SENDBUF_REC *rec)
void net_sendbuffer_init(void) void net_sendbuffer_init(void)
{ {
timeout_tag = -1;
buffers = NULL; buffers = NULL;
} }
void net_sendbuffer_deinit(void) void net_sendbuffer_deinit(void)
{ {
if (timeout_tag != -1) g_source_remove(timeout_tag);
} }