[asterisk-commits] dlee: branch group/performance r399769 - /team/group/performance/main/astobj2.c

[SVN commits to the Asterisk project]

Author: dlee
Date: Tue Sep 24 18:41:33 2013
New Revision: 399769

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=399769
Log:
Didn't mean to put that in there

Modified:
    team/group/performance/main/astobj2.c

Modified: team/group/performance/main/astobj2.c
URL: http://svnview.digium.com/svn/asterisk/team/group/performance/main/astobj2.c?view=diff&rev=399769&r1=399768&r2=399769
==============================================================================
--- team/group/performance/main/astobj2.c (original)
+++ team/group/performance/main/astobj2.c Tue Sep 24 18:41:33 2013
@@ -1948,8 +1948,6 @@
 struct hash_bucket {
 	/*! List of objects held in the bucket. */
 	AST_DLLIST_HEAD_NOLOCK(, hash_bucket_node) list;
-	/*! Next node links for the bucket skip list */
-	AST_DLLIST_ENTRY(hash_bucket) skip_links;
 #if defined(AST_DEVMODE)
 	/*! Number of elements currently in the bucket. */
 	int elements;
@@ -1970,8 +1968,6 @@
 	 */
 	struct ao2_container common;
 	ao2_hash_fn *hash_fn;
-	/*! Buckets with contents */
-	AST_DLLIST_HEAD_NOLOCK(, hash_bucket) skip_list;
 	/*! Number of hash buckets in this container. */
 	int n_buckets;
 	/*! Hash bucket array of n_buckets.  Variable size. */
@@ -2092,11 +2088,6 @@
 		bucket = &my_container->buckets[doomed->my_bucket];
 		AST_DLLIST_REMOVE(&bucket->list, doomed, links);
 		AO2_DEVMODE_STAT(--my_container->common.nodes);
-
-		/* If this bucket is empty, remove it from the skiplist */
-		if (AST_DLLIST_EMPTY(&bucket->list)) {
-			AST_DLLIST_REMOVE(&my_container->skip_list, bucket, skip_links);
-		}
 	}
 
 	/*
@@ -2170,11 +2161,6 @@
 	bucket = &self->buckets[node->my_bucket];
 	sort_fn = self->common.sort_fn;
 	options = self->common.options;
-
-	/* Add ourselves to the skip list, if needed */
-	if (AST_DLLIST_EMPTY(&bucket->list)) {
-		AST_DLLIST_INSERT_TAIL(&self->skip_list, bucket, skip_links);
-	}
 
 	if (options & AO2_CONTAINER_ALLOC_OPT_INSERT_BEGIN) {
 		if (sort_fn) {