sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Fix: Simplify write-again logic

This commit is contained in:
Denis Kenzior 2010-02-26 16:17:10 -06:00
parent 988fed5951
commit 7be80ef131
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gatchat/gatserver.c
View File

@ -485,7 +485,6 @@ static gboolean can_write_data(GIOChannel *channel, GIOCondition cond,
gsize towrite;
struct ring_buffer *write_buf;
unsigned char *buf;
gboolean write_again = FALSE;
#ifdef WRITE_SCHEDULER_DEBUG
int limiter;
#endif
@ -502,8 +501,6 @@ static gboolean can_write_data(GIOChannel *channel, GIOCondition cond,
buf = ring_buffer_read_ptr(write_buf, 0);
towrite = ring_buffer_len_no_wrap(write_buf);
if (towrite < (gsize)ring_buffer_len(write_buf))
write_again = TRUE;
#ifdef WRITE_SCHEDULER_DEBUG
limiter = towrite;
@ -535,13 +532,13 @@ static gboolean can_write_data(GIOChannel *channel, GIOCondition cond,
* unless it's the last buffer in the queue.
*/
if ((ring_buffer_len(write_buf) == 0) &&
(g_queue_get_length(server->write_queue) != 1)) {
(g_queue_get_length(server->write_queue) > 1)) {
write_buf = g_queue_pop_head(server->write_queue);
ring_buffer_free(write_buf);
return TRUE;
write_buf = g_queue_peek_head(server->write_queue);
}
if (bytes_written < towrite || write_again == TRUE)
if (ring_buffer_len(write_buf) > 0)
return TRUE;
return FALSE;