You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/12/14 22:51:34 UTC
[25/50] git commit: TS-2082: remove FIXME_NONMODULAR defines
TS-2082: remove FIXME_NONMODULAR defines
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0b3367a8
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0b3367a8
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0b3367a8
Branch: refs/heads/5.0.x
Commit: 0b3367a8e1f52cf2ac3ca8c458156f11e89bfa70
Parents: db8052d
Author: Zhao Yongming <mi...@gmail.com>
Authored: Sat Dec 7 15:11:39 2013 +0800
Committer: Zhao Yongming <mi...@gmail.com>
Committed: Sat Dec 7 15:19:16 2013 +0800
----------------------------------------------------------------------
CHANGES | 2 +-
iocore/cache/CacheRead.cc | 10 ----------
iocore/cache/Notes | 3 ---
lib/ts/ink_config.h.in | 1 -
4 files changed, 1 insertion(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0b3367a8/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 6745047..be9c8c7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 4.2.0
- *) [TS-2082] remove STANDALONE_IOCORE and NON_MODULAR defines
+ *) [TS-2082] remove STANDALONE_IOCORE FIXME_NONMODULAR and NON_MODULAR defines
*) [TS-312] Add option to always share keep-alive connections to the origin server
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0b3367a8/iocore/cache/CacheRead.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/CacheRead.cc b/iocore/cache/CacheRead.cc
index 6121668..5e8c6ac 100644
--- a/iocore/cache/CacheRead.cc
+++ b/iocore/cache/CacheRead.cc
@@ -241,13 +241,11 @@ CacheVC::openReadChooseWriter(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSE
}
return -ECACHE_NO_DOC;
}
-#ifdef FIXME_NONMODULAR
if (cache_config_select_alternate) {
alternate_index = HttpTransactCache::SelectFromAlternates(&vector, &request, params);
if (alternate_index < 0)
return -ECACHE_ALT_MISS;
} else
-#endif
alternate_index = 0;
CacheHTTPInfo *obj = vector.get(alternate_index);
for (w = (CacheVC *) od->writers.head; w; w = (CacheVC *) w->opendir_link.next) {
@@ -969,11 +967,7 @@ CacheVC::openReadVecWrite(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */
dir_overwrite(&first_key, vol, &dir, &od->first_dir);
if (od->move_resident_alt)
dir_insert(&od->single_doc_key, vol, &od->single_doc_dir);
-#ifdef FIXME_NONMODULAR
int alt_ndx = HttpTransactCache::SelectFromAlternates(write_vector, &request, params);
-#else
- int alt_ndx = 0;
-#endif
vol->close_write(this);
if (alt_ndx >= 0) {
vector.clear();
@@ -1079,11 +1073,7 @@ CacheVC::openReadStartHead(int event, Event * e)
goto Ldone;
}
if (cache_config_select_alternate) {
-#ifdef FIXME_NONMODULAR
alternate_index = HttpTransactCache::SelectFromAlternates(&vector, &request, params);
-#else
- alternate_index = 0;
-#endif
if (alternate_index < 0) {
err = ECACHE_ALT_MISS;
goto Ldone;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0b3367a8/iocore/cache/Notes
----------------------------------------------------------------------
diff --git a/iocore/cache/Notes b/iocore/cache/Notes
index 0992d25..54d35c8 100644
--- a/iocore/cache/Notes
+++ b/iocore/cache/Notes
@@ -22,9 +22,6 @@ TS because there are a lot of stuff required for clustering in proxy/http.
cache ifdefs
-FIXME_NONMODULAR -> this flaf needs to be turned on when compiling along
-with the entire TS. Turning this flag on should automatically turn the
-HTTP cache flag on.
FIXME_HOSTDB -> Store ifdef to be turned off when HostDB stops using Store
FIXME_MGMT -> Interface for warnings on the manager
FIXME_CLUSTER_ARGUMENTS -> runtime arguments for clustering etc. Needs
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0b3367a8/lib/ts/ink_config.h.in
----------------------------------------------------------------------
diff --git a/lib/ts/ink_config.h.in b/lib/ts/ink_config.h.in
index e158a2d..ba6fd53 100644
--- a/lib/ts/ink_config.h.in
+++ b/lib/ts/ink_config.h.in
@@ -92,7 +92,6 @@
# define TS_MAX_API_STATS @max_api_stats@
-# define FIXME_NONMODULAR 1
# define SPLIT_DNS 1
# define HTTP_CACHE 1