Changeset c82e4ca

Timestamp:

2018-07-31T03:40:26Z (6 years ago)

Author:

dx <dx@…>

Branches:

master

Children:

921ea8b, f7cc734

Parents:

5c90890

git-author:

dequis <dx@…> (12-07-18 08:30:59)

git-committer:

dx <dx@…> (31-07-18 03:40:26)

Message:

Use GString for irc->sendbuffer (simpler and faster)

The old code managed growing the buffer manually and called strlen()
very often. GString has a length field and the logic to grow the buffer
is none of our business. Probably smarter, too.

This takes a "blist all" of 14k users from 8.2 to 1.3 seconds.

Files:

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

bitlbee.c

@@ -236 +236 @@
         irc_t *irc = data;
         int st, size;
-        char *temp;
-
-        if (irc->sendbuffer == NULL) {
-                return FALSE;
-        }
-
-        size = strlen(irc->sendbuffer);
-        st = write(irc->fd, irc->sendbuffer, size);
+
+        size = irc->sendbuffer->len;
+
+        if (size == 0) {
+                return FALSE;
+        }
+
+        st = write(irc->fd, irc->sendbuffer->str, size);
 
         if (st == 0 || (st < 0 && !sockerr_again())) {
@@ -253 +253 @@
 
         if (st == size) {
-                g_free(irc->sendbuffer);
-                irc->sendbuffer = NULL;
+                g_string_truncate(irc->sendbuffer, 0);
                 irc->w_watch_source_id = 0;
 
                 return FALSE;
         } else {
-                temp = g_strdup(irc->sendbuffer + st);
-                g_free(irc->sendbuffer);
-                irc->sendbuffer = temp;
+                g_string_erase(irc->sendbuffer, 0, st);
 
                 return TRUE;

irc.c

@@ -62 +62 @@
         irc->iconv = (GIConv) - 1;
         irc->oconv = (GIConv) - 1;
+
+        irc->sendbuffer = g_string_sized_new(IRC_MAX_LINE * 2);
 
         if (global.conf->ping_interval > 0 && global.conf->ping_timeout > 0) {
@@ -309 +311 @@
         }
 
-        g_free(irc->sendbuffer);
+        g_string_free(irc->sendbuffer, TRUE);
         g_free(irc->readbuffer);
         g_free(irc->password);
@@ -599 +601 @@
 
                 if (now) {
-                        g_free(irc->sendbuffer);
-                        irc->sendbuffer = g_strdup("\r\n");
+                        g_string_assign(irc->sendbuffer, "\r\n");
                 }
                 irc_vawrite(temp->data, format, params);
@@ -615 +616 @@
 void irc_vawrite(irc_t *irc, char *format, va_list params)
 {
-        int size;
         char line[IRC_MAX_LINE + 1];
 
@@ -642 +642 @@
         g_strlcat(line, "\r\n", IRC_MAX_LINE + 1);
 
-        if (irc->sendbuffer != NULL) {
-                gsize line_len = strlen(line);
-                gsize buffer_len = strlen(irc->sendbuffer);
-
-                size = buffer_len + line_len;
-                irc->sendbuffer = g_renew(char, irc->sendbuffer, size + 1);
-                strcpy((irc->sendbuffer + buffer_len), line);
-        } else {
-                irc->sendbuffer = g_strdup(line);
-        }
+        g_string_append(irc->sendbuffer, line);
 
         if (irc->w_watch_source_id == 0) {
@@ -673 +664 @@
 {
         ssize_t n;
-        size_t len;
-
-        if (irc->sendbuffer == NULL) {
+        size_t len = irc->sendbuffer->len;
+
+        if (len == 0) {
                 return;
         }
 
-        len = strlen(irc->sendbuffer);
-        if ((n = send(irc->fd, irc->sendbuffer, len, 0)) == len) {
-                g_free(irc->sendbuffer);
-                irc->sendbuffer = NULL;
+        if ((n = send(irc->fd, irc->sendbuffer->str, len, 0)) == len) {
+                g_string_truncate(irc->sendbuffer, 0);
 
                 b_event_remove(irc->w_watch_source_id);
                 irc->w_watch_source_id = 0;
         } else if (n > 0) {
-                char *s = g_strdup(irc->sendbuffer + n);
-                g_free(irc->sendbuffer);
-                irc->sendbuffer = s;
+                g_string_erase(irc->sendbuffer, 0, n);
         }
         /* Otherwise something went wrong and we don't currently care
@@ -706 +693 @@
                 b_event_remove(irc->w_watch_source_id);
                 irc->w_watch_source_id = 0;
-                g_free(irc->sendbuffer);
-                irc->sendbuffer = NULL;
+                g_string_truncate(irc->sendbuffer, 0);
         }
 

irc.h

@@ -85 +85 @@
         double last_pong;
         int pinging;
-        char *sendbuffer;
+        GString *sendbuffer;
         char *readbuffer;
         GIConv iconv, oconv;

unix.c

@@ -373 +373 @@
                 sock_make_blocking(irc->fd);
                 if (irc->sendbuffer) {
-                        (void) write(irc->fd, irc->sendbuffer, strlen(irc->sendbuffer));
+                        (void) write(irc->fd, irc->sendbuffer->str, irc->sendbuffer->len);
                 }
                 (void) write(irc->fd, message, sizeof(message) - 1);