Repository: trafficserver
Updated Branches:
  refs/heads/5.2.x 9f528f52b -> 22d17d810


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/22d17d81
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/22d17d81
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/22d17d81

Branch: refs/heads/5.2.x
Commit: 22d17d81062b38c324e9252f888ff6b71c68db08
Parents: 9f528f5
Author: Brian Geffon <[email protected]>
Authored: Tue Dec 16 22:50:44 2014 -0800
Committer: Leif Hedstrom <[email protected]>
Committed: Wed Dec 17 08:07:56 2014 -0700

----------------------------------------------------------------------
 lib/ts/ink_queue.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/22d17d81/lib/ts/ink_queue.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_queue.cc b/lib/ts/ink_queue.cc
index 6203ecd..9328cff 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) {

Reply via email to