changeset 12233:02833a0ae716

[gaim-migrate @ 14535] SF Patch #1367116 from Michael Carlson "In profiling gaim, I noticed that on simply starting CVS gaim, xmlnode_insert_child is using up by far the most CPU time. After some testing, I realized the reason why: xmlnode_insert_child is called some 18,000 times on startup, and it is inserting the child at the end of the list each time, simply by traversing through the entire linked list. Sometimes this list can have as many as 800 elements. This patch adds a variable to the _xmlnode struct, lastchild, which simply keeps track of the last node in the list of children. This is then used by xmlnode_insert_child to insert at the end of the list, instead of traversing through the whole list each time. The two relevant functions in xmlnode.c that need to be updated to keep track of this function appropriately have been updated. Running 3 times with and without the change, the results from oprofile say it all. Here are the measured number of clock cycles / % of total clock cycles / function used to simply start and close gaim before the change: 204 60.7143 xmlnode_insert_child 210 61.4035 xmlnode_insert_child 230 61.8280 xmlnode_insert_child And after (note that one time no clock cycles were caught at all) 3 2.5862 xmlnode_insert_child 3 2.5641 xmlnode_insert_child This affects other areas of the program than just starting up, but this seems to be the most noticeable place." Speed is good. As I was verifying this patch, I added some g_return_val_if_fail() checks. committer: Tailor Script <[e-mail]>

--- a/src/xmlnode.c	Sun Nov 27 03:20:35 2005 +0000
+++ b/src/xmlnode.c	Sun Nov 27 03:42:39 2005 +0000
@@ -83,13 +83,13 @@
 
 	child->parent = parent;
 
-	if(parent->child) {
-		xmlnode *x;
-		for(x = parent->child; x->next; x = x->next);
-		x->next = child;
+	if(parent->lastchild) {
+		parent->lastchild->next = child;
 	} else {
 		parent->child = child;
 	}
+
+	parent->lastchild = child;
 }
 
 void
@@ -126,6 +126,8 @@
 				!strcmp(attr_node->name, attr)) {
 			if(node->child == attr_node) {
 				node->child = attr_node->next;
+			} else if (node->lastchild == attr_node) {
+				node->lastchild = sibling;
 			} else {
 				sibling->next = attr_node->next;
 			}
@@ -205,6 +207,7 @@
 	char *parent_name, *child_name;
 
 	g_return_val_if_fail(parent != NULL, NULL);
+	g_return_val_if_fail(name != NULL, NULL);
 
 	names = g_strsplit(name, "/", 2);
 	parent_name = names[0];
@@ -259,6 +262,8 @@
 	char *node_name, *esc, *esc2, *tab = NULL;
 	gboolean need_end = FALSE, pretty = formatting;
 
+	g_return_val_if_fail(node != NULL, NULL);
+
 	if(pretty && depth) {
 		tab = g_strnfill(depth, '\t');
 		text = g_string_append(text, tab);
@@ -328,6 +333,8 @@
 {
 	char *xml, *xml_with_declaration;
 
+	g_return_val_if_fail(node != NULL, NULL);
+
 	xml = xmlnode_to_str_helper(node, len, TRUE, 0);
 	xml_with_declaration =
 		g_strdup_printf("<?xml version='1.0' encoding='UTF-8' ?>" NEWLINE_S NEWLINE_S "%s", xml);
@@ -438,8 +445,7 @@
 	xmlnode *child;
 	xmlnode *sibling = NULL;
 
-	if(!src)
-		return NULL;
+	g_return_val_if_fail(src != NULL, NULL);
 
 	ret = new_node(src->name, src->type);
 	if(src->data) {
@@ -462,6 +468,8 @@
 		sibling->parent = ret;
 	}
 
+	ret->lastchild = sibling;
+
 	return ret;
 }
 

--- a/src/xmlnode.h	Sun Nov 27 03:20:35 2005 +0000
+++ b/src/xmlnode.h	Sun Nov 27 03:42:39 2005 +0000
@@ -46,6 +46,7 @@
 	size_t data_sz;				/**< The size of the data. */
 	struct _xmlnode *parent;	/**< The parent node or @c NULL.*/
 	struct _xmlnode *child;		/**< The child node or @c NULL.*/
+	struct _xmlnode *lastchild;	/**< The last child node or @c NULL.*/
 	struct _xmlnode *next;		/**< The next node or @c NULL. */
 } xmlnode;