organize trunk free blocks using AVL tree ok

git-svn-id: http://fastdfs.googlecode.com/svn@971 0d4c4929-bc51-0410-a161-b7c81ae5c018
wangmh · Dec 25, 2011 · cff6bf2 · cff6bf2
1 parent c4760b5
commit cff6bf2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/trunk/common/avl_tree.c b/trunk/common/avl_tree.c
@@ -48,7 +48,7 @@ static AVLTreeNode *createTreeNode(AVLTreeNode *pParentNode, void *target_data)
 	pNewNode = (AVLTreeNode *)malloc(sizeof(AVLTreeNode));
 	if (pNewNode == NULL)
 	{
-		printf("malloc fail!\n");
+		printf("malloc %d bytes fail!\n", (int)sizeof(AVLTreeNode));
 		return NULL;
 	}
 
@@ -87,7 +87,6 @@ static void avlLeftBalanceWhenInsert(AVLTreeNode **pTreeNode, int *taller)
 			*taller = 0;
 			break;
 		case 0 :
-			printf("树已经平衡化!!!!!!!\n");
 			break;
 		case 1 :
 			rightsub = leftsub->right;
@@ -127,7 +126,6 @@ static void avlRightBalanceWhenInsert(AVLTreeNode **pTreeNode, int *taller)
 			*taller = 0;
 			break;
 		case 0: 
-			printf("树已经平衡化!!!!!!!\n");
 			break; 
 		case -1:
 			leftsub = rightsub->left;
@@ -230,7 +228,7 @@ int avl_tree_insert(AVLTreeInfo *tree, void *data)
 
 	taller = 0;
 	return avl_tree_insert_loop(tree->compare_func, &(tree->root), \
-					data, &taller);
+				data, &taller);
 }
 
 static int avl_tree_replace_loop(CompareFunc compare_func, \
@@ -534,7 +532,7 @@ static void *avl_tree_delete_loop(CompareFunc compare_func, \
 			return pResultData;
 		}
 
-		nCompRes = -1;	//在右分支中寻找直接前驱结点
+		nCompRes = -1;
 	}
 	else
 	{
@@ -604,7 +602,6 @@ static void *avl_tree_delete_loop(CompareFunc compare_func, \
 		}
 		else
 		{
-			//printf("find the prior.\n");
 			avl_tree_delete_loop(compare_func, \
 				&((*pCurrentNode)->left), target_data, \
 				shorter, *pCurrentNode);
@@ -661,6 +658,7 @@ static int avl_tree_walk_loop(DataOpFunc data_op_func, \
 		return result;
 	}
 
+	/*
 	if (pCurrentNode->balance >= -1 && pCurrentNode->balance <= 1)
 	{
 		//printf("==%d\n", pCurrentNode->balance);
@@ -669,6 +667,7 @@ static int avl_tree_walk_loop(DataOpFunc data_op_func, \
 	{
 		printf("==bad %d!!!!!!!!!!!!\n", pCurrentNode->balance);
 	}
+	*/
 
 	if (pCurrentNode->right != NULL)
 	{

diff --git a/trunk/storage/trunk_mgr/trunk_mem.c b/trunk/storage/trunk_mgr/trunk_mem.c
@@ -146,7 +146,7 @@ int storage_trunk_init()
 		return result;
 	}
 
-	logInfo("tree node count: %d", avl_tree_count(&tree_info));
+	//logInfo("tree node count: %d", avl_tree_count(&tree_info));
 
 	return 0;
 }
@@ -650,7 +650,16 @@ static int trunk_add_node(FDFSTrunkNode *pNode, const bool bWriteBinLog)
 		chain->size = pNode->trunk.file.size;
 		chain->head = pNode;
 
-		avl_tree_insert(&tree_info, chain);
+		if (avl_tree_insert(&tree_info, chain) != 1)
+		{
+			result = errno != 0 ? errno : ENOMEM;
+			logError("file: "__FILE__", line: %d, " \
+				"avl_tree_insert fail, " \
+				"errno: %d, error info: %s", \
+				__LINE__, result, STRERROR(result));
+			pthread_mutex_unlock(&trunk_mem_lock);
+			return result;
+		}
 	}
 	else
 	{