Updated Branches: refs/heads/master 7c40179e7 -> 4fa8350ec
TS-1243 Eliminate unused code in ink_isolatin_table.cc Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/4fa8350e Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4fa8350e Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4fa8350e Branch: refs/heads/master Commit: 4fa8350ecc3daa6174e78d828acc8c8db7fec852 Parents: 7c40179 Author: Leif Hedstrom <[email protected]> Authored: Wed May 2 21:10:25 2012 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Wed May 2 21:10:25 2012 -0600 ---------------------------------------------------------------------- CHANGES | 2 + lib/ts/Makefile.am | 2 - lib/ts/ink_isolatin_table.cc | 579 ------------------------------------- lib/ts/ink_isolatin_table.h | 51 ---- lib/ts/libts.h | 1 - proxy/Plugin.cc | 7 - 6 files changed, 2 insertions(+), 640 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4fa8350e/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index c5bd3f6..b21c020 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,7 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 3.1.4 + *) [TS-1238] RAM cache hit rate unexpectedly low with CLFUS. + *) [TS-1242] Make it build with some more recent automake versions. *) [TS-1241] Memory leaks when using TSHttpSchedule(). http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4fa8350e/lib/ts/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/ts/Makefile.am b/lib/ts/Makefile.am index 903a6a1..4195d3d 100644 --- a/lib/ts/Makefile.am +++ b/lib/ts/Makefile.am @@ -71,8 +71,6 @@ libtsutil_la_SOURCES = \ ink_inet.cc \ ink_inet.h \ ink_inout.h \ - ink_isolatin_table.cc \ - ink_isolatin_table.h \ ink_killall.cc \ ink_killall.h \ ink_llqueue.h \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4fa8350e/lib/ts/ink_isolatin_table.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_isolatin_table.cc b/lib/ts/ink_isolatin_table.cc deleted file mode 100644 index a65ae41..0000000 --- a/lib/ts/ink_isolatin_table.cc +++ /dev/null @@ -1,579 +0,0 @@ -/** @file - - A brief file description - - @section license License - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - -/* - * - * ink_isolatin_table.h - * The eight bit table used by the isolatin macros. - * - * $Date: 2003-06-01 18:36:44 $ - * - * - */ - -#include "ink_isolatin_table.h" -#include "ink_unused.h" /* MAGIC_EDITING_TAG */ -#include "ink_apidefs.h" - -#define UNDEF 0 -#define DIGIT 1 -#define ALPHL 2 -#define ALPHU 3 -#define PUNCT 4 -#define WHSPC 5 - -/* - * The eight bit table. - */ -ink_undoc_liapi int eight_bit_table[] = { - /* 000 */ UNDEF, - /* ^@ NUL */ - /* 001 */ UNDEF, - /* ^A SOH */ - /* 002 */ UNDEF, - /* ^B STX */ - /* 003 */ UNDEF, - /* ^C ETX */ - /* 004 */ UNDEF, - /* ^D EOT */ - /* 005 */ UNDEF, - /* ^E ENQ */ - /* 006 */ UNDEF, - /* ^F ACK */ - /* 007 */ UNDEF, - /* ^G BEL */ - /* 008 */ UNDEF, - /* ^H BS */ - - /* 009 */ WHSPC, - /* " " HT */ - /* 010 */ WHSPC, - /* " " LF */ - /* 011 */ WHSPC, - /* VT */ - /* 012 */ WHSPC, - /* ^L NP */ - /* 013 */ WHSPC, - /* ^M CR */ - - /* 014 */ UNDEF, - /* ^N SO */ - /* 015 */ UNDEF, - /* ^O SI */ - /* 016 */ UNDEF, - /* ^P DLE */ - /* 017 */ UNDEF, - /* ^Q DC1 */ - /* 018 */ UNDEF, - /* ^R DC2 */ - /* 019 */ UNDEF, - /* ^S DC3 */ - /* 020 */ UNDEF, - /* ^T DC4 */ - /* 021 */ UNDEF, - /* ^U NAK */ - /* 022 */ UNDEF, - /* ^V SYN */ - /* 023 */ UNDEF, - /* ^W ETB */ - /* 024 */ UNDEF, - /* ^X CAN */ - /* 025 */ UNDEF, - /* ^Y EM */ - /* 026 */ UNDEF, - /* ^Z SUB */ - /* 027 */ UNDEF, - /* ^[ ESC */ - /* 028 */ UNDEF, - /* ^\ FS */ - /* 029 */ UNDEF, - /* ^] GS */ - /* 030 */ UNDEF, - /* ^^ RS */ - /* 031 */ UNDEF, - /* ^_ US */ - - /* 032 */ WHSPC, - /* " " SP */ - - /* 033 */ PUNCT, - /* ! */ - /* 034 */ PUNCT, - /* " */ - /* 035 */ PUNCT, - /* # */ - /* 036 */ PUNCT, - /* $ */ - /* 037 */ PUNCT, - /* % */ - /* 038 */ PUNCT, - /* & */ - /* 039 */ PUNCT, - /* ' */ - /* 040 */ PUNCT, - /* ( */ - /* 041 */ PUNCT, - /* ) */ - /* 042 */ PUNCT, - /* * */ - /* 043 */ PUNCT, - /* + */ - /* 044 */ PUNCT, - /* , */ - /* 045 */ PUNCT, - /* - */ - /* 046 */ PUNCT, - /* . */ - /* 047 */ PUNCT, - /* / */ - - /* 048 */ DIGIT, - /* 0 */ - /* 049 */ DIGIT, - /* 1 */ - /* 050 */ DIGIT, - /* 2 */ - /* 051 */ DIGIT, - /* 3 */ - /* 052 */ DIGIT, - /* 4 */ - /* 053 */ DIGIT, - /* 5 */ - /* 054 */ DIGIT, - /* 6 */ - /* 055 */ DIGIT, - /* 7 */ - /* 056 */ DIGIT, - /* 8 */ - /* 057 */ DIGIT, - /* 9 */ - - /* 058 */ PUNCT, - /* : */ - /* 059 */ PUNCT, - /* ; */ - /* 060 */ PUNCT, - /* < */ - /* 061 */ PUNCT, - /* = */ - /* 062 */ PUNCT, - /* > */ - /* 063 */ PUNCT, - /* ? */ - /* 064 */ PUNCT, - /* @ */ - - /* 065 */ ALPHU, - /* A */ - /* 066 */ ALPHU, - /* B */ - /* 067 */ ALPHU, - /* C */ - /* 068 */ ALPHU, - /* D */ - /* 069 */ ALPHU, - /* E */ - /* 070 */ ALPHU, - /* F */ - /* 071 */ ALPHU, - /* G */ - /* 072 */ ALPHU, - /* H */ - /* 073 */ ALPHU, - /* I */ - /* 074 */ ALPHU, - /* J */ - /* 075 */ ALPHU, - /* K */ - /* 076 */ ALPHU, - /* L */ - /* 077 */ ALPHU, - /* M */ - /* 078 */ ALPHU, - /* N */ - /* 079 */ ALPHU, - /* O */ - /* 080 */ ALPHU, - /* P */ - /* 081 */ ALPHU, - /* Q */ - /* 082 */ ALPHU, - /* R */ - /* 083 */ ALPHU, - /* S */ - /* 084 */ ALPHU, - /* T */ - /* 085 */ ALPHU, - /* U */ - /* 086 */ ALPHU, - /* V */ - /* 087 */ ALPHU, - /* W */ - /* 088 */ ALPHU, - /* X */ - /* 089 */ ALPHU, - /* Y */ - /* 090 */ ALPHU, - /* Z */ - - /* 091 */ PUNCT, - /* [ */ - /* 092 */ PUNCT, - /* \ */ - /* 093 */ PUNCT, - /* ] */ - /* 094 */ PUNCT, - /* ^ */ - /* 095 */ PUNCT, - /* _ */ - /* 096 */ PUNCT, - /* ` */ - - /* 097 */ ALPHL, - /* a */ - /* 098 */ ALPHL, - /* b */ - /* 099 */ ALPHL, - /* c */ - /* 100 */ ALPHL, - /* d */ - /* 101 */ ALPHL, - /* e */ - /* 102 */ ALPHL, - /* f */ - /* 103 */ ALPHL, - /* g */ - /* 104 */ ALPHL, - /* h */ - /* 105 */ ALPHL, - /* i */ - /* 106 */ ALPHL, - /* j */ - /* 107 */ ALPHL, - /* k */ - /* 108 */ ALPHL, - /* l */ - /* 109 */ ALPHL, - /* m */ - /* 110 */ ALPHL, - /* n */ - /* 111 */ ALPHL, - /* o */ - /* 112 */ ALPHL, - /* p */ - /* 113 */ ALPHL, - /* q */ - /* 114 */ ALPHL, - /* r */ - /* 115 */ ALPHL, - /* s */ - /* 116 */ ALPHL, - /* t */ - /* 117 */ ALPHL, - /* u */ - /* 118 */ ALPHL, - /* v */ - /* 119 */ ALPHL, - /* w */ - /* 120 */ ALPHL, - /* x */ - /* 121 */ ALPHL, - /* y */ - /* 122 */ ALPHL, - /* z */ - - /* 123 */ PUNCT, - /* { */ - /* 124 */ PUNCT, - /* | */ - /* 125 */ PUNCT, - /* } */ - /* 126 */ PUNCT, - /* ~ */ - - /* 127 */ UNDEF, - /* ^? DEL */ - /* 128 */ UNDEF, - /* � */ - /* 129 */ UNDEF, - /* � */ - /* 130 */ UNDEF, - /* � */ - /* 131 */ UNDEF, - /* � */ - /* 132 */ UNDEF, - /* � */ - /* 133 */ UNDEF, - /* � */ - /* 134 */ UNDEF, - /* � */ - /* 135 */ UNDEF, - /* � */ - /* 136 */ UNDEF, - /* � */ - /* 137 */ UNDEF, - /* � */ - /* 138 */ UNDEF, - /* � */ - /* 139 */ UNDEF, - /* � */ - /* 140 */ UNDEF, - /* � */ - /* 141 */ UNDEF, - /* � */ - /* 142 */ UNDEF, - /* � */ - /* 143 */ UNDEF, - /* � */ - /* 144 */ UNDEF, - /* � */ - /* 145 */ UNDEF, - /* � */ - /* 146 */ UNDEF, - /* � */ - /* 147 */ UNDEF, - /* � */ - /* 148 */ UNDEF, - /* � */ - /* 149 */ UNDEF, - /* � */ - /* 150 */ UNDEF, - /* � */ - /* 151 */ UNDEF, - /* � */ - /* 152 */ UNDEF, - /* � */ - /* 153 */ UNDEF, - /* � */ - /* 154 */ UNDEF, - /* � */ - /* 155 */ UNDEF, - /* � */ - /* 156 */ UNDEF, - /* � */ - /* 157 */ UNDEF, - /* � */ - /* 158 */ UNDEF, - /* � */ - /* 159 */ UNDEF, - /* � */ - /* 160 */ UNDEF, - /* */ - - /* 161 */ PUNCT, - /* � */ - /* 162 */ PUNCT, - /* � */ - /* 163 */ PUNCT, - /* � */ - /* 164 */ PUNCT, - /* � */ - /* 165 */ PUNCT, - /* � */ - /* 166 */ PUNCT, - /* � */ - /* 167 */ PUNCT, - /* � */ - /* 168 */ PUNCT, - /* � */ - /* 169 */ PUNCT, - /* � */ - /* 170 */ PUNCT, - /* � */ - /* 171 */ PUNCT, - /* � */ - /* 172 */ PUNCT, - /* � */ - /* 173 */ PUNCT, - /* � */ - /* 174 */ PUNCT, - /* � */ - /* 175 */ PUNCT, - /* � */ - /* 176 */ PUNCT, - /* � */ - /* 177 */ PUNCT, - /* � */ - /* 178 */ PUNCT, - /* � */ - /* 179 */ PUNCT, - /* � */ - /* 180 */ PUNCT, - /* � */ - /* 181 */ PUNCT, - /* � */ - /* 182 */ PUNCT, - /* � */ - /* 183 */ PUNCT, - /* � */ - /* 184 */ PUNCT, - /* � */ - /* 185 */ PUNCT, - /* � */ - /* 186 */ PUNCT, - /* � */ - /* 187 */ PUNCT, - /* � */ - /* 188 */ PUNCT, - /* � */ - /* 189 */ PUNCT, - /* � */ - /* 190 */ PUNCT, - /* � */ - /* 191 */ PUNCT, - /* � */ - - /* 192 */ ALPHU, - /* � */ - /* 193 */ ALPHU, - /* � */ - /* 194 */ ALPHU, - /* � */ - /* 195 */ ALPHU, - /* � */ - /* 196 */ ALPHU, - /* � */ - /* 197 */ ALPHU, - /* � */ - /* 198 */ ALPHU, - /* � */ - /* 199 */ ALPHU, - /* � */ - /* 200 */ ALPHU, - /* � */ - /* 201 */ ALPHU, - /* � */ - /* 202 */ ALPHU, - /* � */ - /* 203 */ ALPHU, - /* � */ - /* 204 */ ALPHU, - /* � */ - /* 205 */ ALPHU, - /* � */ - /* 206 */ ALPHU, - /* � */ - /* 207 */ ALPHU, - /* � */ - /* 208 */ ALPHU, - /* � */ - /* 209 */ ALPHU, - /* � */ - /* 210 */ ALPHU, - /* � */ - /* 211 */ ALPHU, - /* � */ - /* 212 */ ALPHU, - /* � */ - /* 213 */ ALPHU, - /* � */ - /* 214 */ ALPHU, - /* � */ - - /* 215 */ PUNCT, - /* � */ - - /* 216 */ ALPHU, - /* � */ - /* 217 */ ALPHU, - /* � */ - /* 218 */ ALPHU, - /* � */ - /* 219 */ ALPHU, - /* � */ - /* 220 */ ALPHU, - /* � */ - /* 221 */ ALPHU, - /* � */ - /* 222 */ ALPHU, - /* � */ - - /* 223 */ ALPHL, - /* � */ - /* 224 */ ALPHL, - /* � */ - /* 225 */ ALPHL, - /* � */ - /* 226 */ ALPHL, - /* � */ - /* 227 */ ALPHL, - /* � */ - /* 228 */ ALPHL, - /* � */ - /* 229 */ ALPHL, - /* � */ - /* 230 */ ALPHL, - /* � */ - /* 231 */ ALPHL, - /* � */ - /* 232 */ ALPHL, - /* � */ - /* 233 */ ALPHL, - /* � */ - /* 234 */ ALPHL, - /* � */ - /* 235 */ ALPHL, - /* � */ - /* 236 */ ALPHL, - /* � */ - /* 237 */ ALPHL, - /* � */ - /* 238 */ ALPHL, - /* � */ - /* 239 */ ALPHL, - /* � */ - /* 240 */ ALPHL, - /* � */ - /* 241 */ ALPHL, - /* � */ - /* 242 */ ALPHL, - /* � */ - /* 243 */ ALPHL, - /* � */ - /* 244 */ ALPHL, - /* � */ - /* 245 */ ALPHL, - /* � */ - /* 246 */ ALPHL, - /* � */ - - /* 247 */ PUNCT, - /* � */ - - /* 248 */ ALPHL, - /* � */ - /* 249 */ ALPHL, - /* � */ - /* 250 */ ALPHL, - /* � */ - /* 251 */ ALPHL, - /* � */ - /* 252 */ ALPHL, - /* � */ - /* 253 */ ALPHL, - /* � */ - /* 254 */ ALPHL, - /* � */ - /* 255 */ ALPHL - /* \377 */ -}; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4fa8350e/lib/ts/ink_isolatin_table.h ---------------------------------------------------------------------- diff --git a/lib/ts/ink_isolatin_table.h b/lib/ts/ink_isolatin_table.h deleted file mode 100644 index 3290df8..0000000 --- a/lib/ts/ink_isolatin_table.h +++ /dev/null @@ -1,51 +0,0 @@ -/** @file - - A brief file description - - @section license License - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - -/* - * - * ink_isolatin_table.h - * The eight bit table used by the isolatin macros. - * - * $Date: 2003-06-01 18:36:44 $ - * - * - */ - -#ifndef _INK_ISOLATIN_TABLE_H -#define _INK_ISOLATIN_TABLE_H - -#include "ink_apidefs.h" - -#define UNDEF 0 -#define DIGIT 1 -#define ALPHL 2 -#define ALPHU 3 -#define PUNCT 4 -#define WHSPC 5 - -/* - * The eight bit table. - */ -extern inkcoreapi int eight_bit_table[]; - -#endif /* _INK_ISOLATIN_TABLE_H */ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4fa8350e/lib/ts/libts.h ---------------------------------------------------------------------- diff --git a/lib/ts/libts.h b/lib/ts/libts.h index cc98fb3..833cdf9 100644 --- a/lib/ts/libts.h +++ b/lib/ts/libts.h @@ -60,7 +60,6 @@ #include "ink_hash_table.h" #include "ink_hrtime.h" #include "ink_inout.h" -#include "ink_isolatin_table.h" #include "ink_killall.h" #include "ink_llqueue.h" #include "ink_lockfile.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4fa8350e/proxy/Plugin.cc ---------------------------------------------------------------------- diff --git a/proxy/Plugin.cc b/proxy/Plugin.cc index e0a1bff..4a909c9 100644 --- a/proxy/Plugin.cc +++ b/proxy/Plugin.cc @@ -56,13 +56,6 @@ typedef void (*init_func_t) (int argc, char *argv[]); typedef void (*init_func_w_handle_t) (void *handle, int argc, char *argv[]); typedef int (*lic_req_func_t) (void); -tsapi int -load_in_export_symbols(int j) -{ - int i = eight_bit_table[j]; - return i; -} - // Plugin registration vars // // plugin_reg_list has an entry for each plugin
