You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2016/02/16 05:38:28 UTC
[3/3] trafficserver git commit: TS-4208: Remove unused volatile
globals
TS-4208: Remove unused volatile globals
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2a514773
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2a514773
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2a514773
Branch: refs/heads/master
Commit: 2a5147735a5bff1c52eb38bb71e380716575c718
Parents: 65f4e69
Author: Phil Sorber <so...@apache.org>
Authored: Mon Feb 15 19:27:11 2016 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Mon Feb 15 21:37:08 2016 -0700
----------------------------------------------------------------------
lib/ts/ink_queue.cc | 7 -------
lib/ts/ink_queue.h | 6 ------
2 files changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2a514773/lib/ts/ink_queue.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_queue.cc b/lib/ts/ink_queue.cc
index fb13d61..6786c1f 100644
--- a/lib/ts/ink_queue.cc
+++ b/lib/ts/ink_queue.cc
@@ -54,9 +54,6 @@
#define DEBUG_TAG "freelist"
-inkcoreapi volatile int64_t fastalloc_mem_in_use = 0;
-inkcoreapi volatile int64_t fastalloc_mem_total = 0;
-
/*
* SANITY and DEADBEEF are compute-intensive memory debugging to
* help in diagnosing freelist corruption. We turn them off in
@@ -186,7 +183,6 @@ ink_freelist_new(InkFreeList *f)
if (likely(ptr = freelist_freelist_ops->fl_new(f))) {
ink_atomic_increment((int *)&f->used, 1);
- ink_atomic_increment(&fastalloc_mem_in_use, (int64_t)f->type_size);
}
return ptr;
@@ -221,7 +217,6 @@ freelist_new(InkFreeList *f)
SET_FREELIST_POINTER_VERSION(item, newp, 0);
ink_atomic_increment((int *)&f->allocated, f->chunk_size);
- ink_atomic_increment(&fastalloc_mem_total, (int64_t)f->chunk_size * f->type_size);
/* free each of the new elements */
for (i = 0; i < f->chunk_size; i++) {
@@ -275,7 +270,6 @@ ink_freelist_free(InkFreeList *f, void *item)
ink_assert(f->used != 0);
freelist_freelist_ops->fl_free(f, item);
ink_atomic_decrement((int *)&f->used, 1);
- ink_atomic_decrement(&fastalloc_mem_in_use, f->type_size);
}
}
@@ -332,7 +326,6 @@ ink_freelist_free_bulk(InkFreeList *f, void *head, void *tail, size_t num_item)
freelist_freelist_ops->fl_bulkfree(f, head, tail, num_item);
ink_atomic_decrement((int *)&f->used, num_item);
- ink_atomic_decrement(&fastalloc_mem_in_use, f->type_size * num_item);
}
static void
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2a514773/lib/ts/ink_queue.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_queue.h b/lib/ts/ink_queue.h
index 8fe5d27..7608ae0 100644
--- a/lib/ts/ink_queue.h
+++ b/lib/ts/ink_queue.h
@@ -61,8 +61,6 @@
extern "C" {
#endif /* __cplusplus */
-extern int fastmemtotal;
-
void ink_queue_load_64(void *dst, void *src);
#ifdef __x86_64__
@@ -152,10 +150,6 @@ struct _InkFreeList {
int advice;
};
-inkcoreapi extern volatile int64_t fastalloc_mem_in_use;
-inkcoreapi extern volatile int64_t fastalloc_mem_total;
-inkcoreapi extern volatile int64_t freelist_allocated_mem;
-
typedef struct ink_freelist_ops InkFreeListOps;
typedef struct _InkFreeList InkFreeList;