Changeset 0356ae3

Timestamp:

2006-05-13T22:30:51Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3f199fc

Parents:

19ac9c5

Message:

irc_vawrite() now first attempts to write() immediately (because that's
usually not a problem) and only touches the event queue when the write()
doesn't write everything. And got rid of a quit element in the irc_t
structure that actually wasn't even used.

Files:

• irc.c (modified) (2 diffs)
• irc.h (modified) (1 diff)

irc.c

@@ -576 +576 @@
         char line[IRC_MAX_LINE+1], *cs;
                 
-        if( irc->quit )
+        /* Don't try to write anything new anymore when shutting down. */
+        if( irc->status == USTATUS_SHUTDOWN )
                 return;
         
@@ -605 +606 @@
         
         if( irc->w_watch_source_id == 0 )
-                irc->w_watch_source_id = b_input_add( irc->fd, GAIM_INPUT_WRITE, bitlbee_io_current_client_write, irc );
+        {
+                /* If the buffer is empty we can probably write, so call the write event handler
+                   immediately. If it returns TRUE, it should be called again, so add the event to
+                   the queue. If it's FALSE, we emptied the buffer and saved ourselves some work
+                   in the event queue. */
+                if( bitlbee_io_current_client_write( irc, irc->fd, GAIM_INPUT_WRITE ) )
+                        irc->w_watch_source_id = b_input_add( irc->fd, GAIM_INPUT_WRITE, bitlbee_io_current_client_write, irc );
+        }
         
         return;

irc.h

@@ -61 +61 @@
         char *sendbuffer;
         char *readbuffer;
-        int quit;
 
         int sentbytes;