changeset 2224:4446a9e7bdee trunk

[svn] - memory_pool_alloc_object() - memory_pool_strdup() - controlsocket now uses a memory pool for packet data

--- a/ChangeLog	Fri Dec 29 20:38:02 2006 -0800
+++ b/ChangeLog	Fri Dec 29 21:01:49 2006 -0800
@@ -1,3 +1,13 @@
[phone]:38:02 +0000  William Pitcock <[e-mail]>
+  revision [3451]
+  - MemoryPool, a simple performance-oriented memory pool.
+  
+  trunk/audacious/Makefile     |    3 -
+  trunk/audacious/memorypool.c |  107 +++++++++++++++++++++++++++++++++++++++++++
+  trunk/audacious/memorypool.h |   33 +++++++++++++
+  3 files changed, 142 insertions(+), 1 deletion(-)
+
+
 2006-12-30 03:51:55 +0000  William Pitcock <[e-mail]>
   revision [3449]
   - make SIGTERM work in a threadsafe manner.

--- a/audacious/controlsocket.c	Fri Dec 29 20:38:02 2006 -0800
+++ b/audacious/controlsocket.c	Fri Dec 29 21:01:49 2006 -0800
@@ -1,4 +1,7 @@
-/*  BMP - Cross-platform multimedia player
+/*  Audacious
+ *  Copyright (C) 2005-2007  Audacious development team.
+ *
+ *  BMP - Cross-platform multimedia player
  *  Copyright (C) 2003-2004  BMP development team.
  *
  *  Based on XMMS:
@@ -51,6 +54,7 @@
 #include "ui_playlist.h"
 #include "prefswin.h"
 #include "libaudacious/beepctrl.h"
+#include "memorypool.h"
 
 #define CTRLSOCKET_BACKLOG        100
 #define CTRLSOCKET_TIMEOUT        100000
@@ -71,7 +75,7 @@
 static gboolean going = TRUE;
 static GCond *start_cond = NULL;
 static GMutex *status_mutex = NULL;
-
+static MemoryPool *cs_pool = NULL;
 
 static void
 ctrlsocket_start_thread(void)
@@ -86,6 +90,8 @@
 gboolean
 ctrlsocket_setup(void)
 {
+    cs_pool = memory_pool_new();
+
     if (strcmp(cfg.session_uri_base, ""))
         audacious_set_session_uri(cfg.session_uri_base);
     else
@@ -140,7 +146,7 @@
 
         listen(fd, CTRLSOCKET_BACKLOG);
 
-        socket_name = g_strdup(saddr.sun_path);
+        socket_name = memory_pool_strdup(cs_pool, saddr.sun_path);
         ctrl_fd = fd;
         session_id = i;
         going = TRUE;
@@ -213,7 +219,8 @@
 void
 ctrlsocket_cleanup(void)
 {
-    if (ctrl_fd) {
+    if (ctrl_fd)
+    {
         g_mutex_lock(status_mutex);
         going = FALSE;
         g_cond_signal(start_cond);
@@ -229,13 +236,15 @@
         if (socket_name != NULL)
 	{
             unlink(socket_name);
-            g_free(socket_name);
+            memory_pool_release(cs_pool, socket_name);
 	}
 
         g_cond_free(start_cond);
         g_mutex_free(status_mutex);
         g_mutex_free(packet_list_mutex);
     }
+
+    memory_pool_destroy(cs_pool);
 }
 
 void
@@ -294,8 +303,8 @@
     ctrl_write_packet(pkt->fd, NULL, 0);
     close(pkt->fd);
     if (pkt->data)
-        g_free(pkt->data);
-    g_free(pkt);
+        memory_pool_release(cs_pool, pkt->data);
+    memory_pool_release(cs_pool, pkt);
 }
 
 static gboolean
@@ -339,19 +348,19 @@
         if ((fd = accept(ctrl_fd, (struct sockaddr *) &saddr, &len)) == -1)
             continue;
 
-        pkt = g_new0(PacketNode, 1);
+        pkt = memory_pool_alloc_object(cs_pool, PacketNode);
         if ((size_t)read(fd, &pkt->hdr, sizeof(ClientPktHeader))
             < sizeof(ClientPktHeader)) {
-            g_free(pkt);
+            memory_pool_release(cs_pool, pkt);
             continue;
         }
 
         if (pkt->hdr.data_length) {
             size_t data_length = pkt->hdr.data_length;
-            pkt->data = g_malloc0(data_length);
+            pkt->data = memory_pool_allocate(cs_pool, data_length);
             if ((size_t)read(fd, pkt->data, data_length) < data_length) {
-                g_free(pkt->data);
-                g_free(pkt);
+                memory_pool_release(cs_pool, pkt->data);
+                memory_pool_release(cs_pool, pkt);
                 g_warning("ctrlsocket_func(): Incomplete data packet dropped");
                 continue;
             }
@@ -489,14 +498,14 @@
                     gchar *filename;
 
                     dataptr++;
-                    filename = g_malloc0(len);
+                    filename = memory_pool_allocate(cs_pool, len);
                     memcpy(filename, dataptr, len);
 
                     GDK_THREADS_ENTER();
                     playlist_add_url(playlist_get_active(), filename);
                     GDK_THREADS_LEAVE();
 
-                    g_free(filename);
+                    memory_pool_release(cs_pool, filename);
                     dataptr += (len + 3) / 4;
                 }
             }
@@ -776,8 +785,8 @@
         packet_list = g_list_remove_link(packet_list, pkt_list);
         g_list_free_1(pkt_list);
         if (pkt->data)
-            g_free(pkt->data);
-        g_free(pkt);
+            memory_pool_release(cs_pool, pkt->data);
+        memory_pool_release(cs_pool, pkt);
     }
     g_mutex_unlock(packet_list_mutex);
 }

--- a/audacious/memorypool.c	Fri Dec 29 20:38:02 2006 -0800
+++ b/audacious/memorypool.c	Fri Dec 29 21:01:49 2006 -0800
@@ -16,7 +16,10 @@
  */
 
 #include <glib.h>
+#include <stdlib.h>
+#include <string.h>
 
+#include "util.h"
 #include "memorypool.h"
 
 /* visibility of this object is not available to the outside */
@@ -105,3 +108,15 @@
     g_mutex_free(pool->mutex);
     g_free(pool);
 }
+
+gchar *
+memory_pool_strdup(MemoryPool * pool, gchar * src)
+{
+    gchar *out;
+    gsize sz = strlen(src) + 1;
+
+    out = memory_pool_allocate(pool, sz);
+    g_strlcpy(out, src, sz);
+
+    return out;
+}

--- a/audacious/memorypool.h	Fri Dec 29 20:38:02 2006 -0800
+++ b/audacious/memorypool.h	Fri Dec 29 21:01:49 2006 -0800
@@ -30,4 +30,9 @@
 
 void memory_pool_destroy(MemoryPool * pool);
 
+gchar * memory_pool_strdup(MemoryPool * pool, gchar * src);
+
+#define memory_pool_alloc_object(pool, obj) \
+	memory_pool_allocate(pool, sizeof(obj))
+
 #endif