You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by br...@apache.org on 2014/12/17 07:50:53 UTC
trafficserver git commit: TS-3178: Fixing build error related to
reclaimable freelist
Repository: trafficserver
Updated Branches:
refs/heads/master 00307a6f5 -> 8993142d4
TS-3178: Fixing build error related to reclaimable freelist
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/8993142d
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/8993142d
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/8993142d
Branch: refs/heads/master
Commit: 8993142d44253ded76b132535b6886f971483b9f
Parents: 00307a6
Author: Brian Geffon <br...@apache.org>
Authored: Tue Dec 16 22:50:44 2014 -0800
Committer: Brian Geffon <br...@apache.org>
Committed: Tue Dec 16 22:50:44 2014 -0800
----------------------------------------------------------------------
lib/ts/ink_queue.cc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8993142d/lib/ts/ink_queue.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_queue.cc b/lib/ts/ink_queue.cc
index 6741b9b..033f183 100644
--- a/lib/ts/ink_queue.cc
+++ b/lib/ts/ink_queue.cc
@@ -296,10 +296,10 @@ ink_freelist_free(InkFreeList * f, void *item)
}
void
-ink_freelist_free_bulk(InkFreeList *f, void *head, void *tail, size_t num_item)
+ink_freelist_free_bulk(ATS_UNUSED InkFreeList *f, ATS_UNUSED void *head, ATS_UNUSED void *tail, ATS_UNUSED size_t num_item)
{
-
#if TS_USE_FREELIST
+#if !TS_USE_RECLAIMABLE_FREELIST
volatile_void_p *adr_of_next = (volatile_void_p *) ADDRESS_OF_NEXT(tail, 0);
head_p h;
head_p item_pair;
@@ -343,6 +343,7 @@ ink_freelist_free_bulk(InkFreeList *f, void *head, void *tail, size_t num_item)
ink_atomic_increment((int *) &f->used, -1 * num_item);
ink_atomic_increment(&fastalloc_mem_in_use, -(int64_t) f->type_size * num_item);
+#endif
#else
void * item = head;
if (f->alignment) {