You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zy...@apache.org on 2013/02/06 13:35:43 UTC

git commit: TS-1006: Remove unused InkFreeList->offset

Updated Branches:
  refs/heads/master 26c408071 -> 616203849


TS-1006: Remove unused InkFreeList->offset

I have simplified ink_freelist_init API by removing offset parameter,
but I forgot to remove unused InkFreeList->offset when rebasing code.

So now, the code using an uninitialized value, it would be a bug. Let's
clean it completely.

Signed-off-by: Yunkai Zhang <qi...@taobao.com>
Signed-off-by: Zhao Yongming <mi...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/61620384
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/61620384
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/61620384

Branch: refs/heads/master
Commit: 616203849743e32d446f09a9089da29116982947
Parents: 26c4080
Author: Yunkai Zhang <qi...@taobao.com>
Authored: Wed Feb 6 19:19:43 2013 +0800
Committer: Zhao Yongming <mi...@gmail.com>
Committed: Wed Feb 6 20:24:27 2013 +0800

----------------------------------------------------------------------
 lib/ts/ink_queue.cc |    4 ++--
 lib/ts/ink_queue.h  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/61620384/lib/ts/ink_queue.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_queue.cc b/lib/ts/ink_queue.cc
index c8a203a..d62bd43 100644
--- a/lib/ts/ink_queue.cc
+++ b/lib/ts/ink_queue.cc
@@ -200,7 +200,7 @@ ink_freelist_new(InkFreeList * f)
       ink_atomic_increment(&fastalloc_mem_in_use, (int64_t) f->chunk_size * f->type_size);
 
     } else {
-      SET_FREELIST_POINTER_VERSION(next, *ADDRESS_OF_NEXT(TO_PTR(FREELIST_POINTER(item)), f->offset),
+      SET_FREELIST_POINTER_VERSION(next, *ADDRESS_OF_NEXT(TO_PTR(FREELIST_POINTER(item)), 0),
                                    FREELIST_VERSION(item) + 1);
       result = ink_atomic_cas((int64_t *) & f->head.data, item.data, next.data);
 
@@ -244,7 +244,7 @@ ink_freelist_free(InkFreeList * f, void *item)
 #if TS_USE_RECLAIMABLE_FREELIST
   return reclaimable_freelist_free(f, item);
 #else
-  volatile_void_p *adr_of_next = (volatile_void_p *) ADDRESS_OF_NEXT(item, f->offset);
+  volatile_void_p *adr_of_next = (volatile_void_p *) ADDRESS_OF_NEXT(item, 0);
   head_p h;
   head_p item_pair;
   int result;

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/61620384/lib/ts/ink_queue.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_queue.h b/lib/ts/ink_queue.h
index 7d47e1d..af04656 100644
--- a/lib/ts/ink_queue.h
+++ b/lib/ts/ink_queue.h
@@ -134,7 +134,7 @@ extern "C"
   {
     volatile head_p head;
     const char *name;
-    uint32_t type_size, chunk_size, count, allocated, offset, alignment;
+    uint32_t type_size, chunk_size, count, allocated, alignment;
     uint32_t allocated_base, count_base;
   };