Updated Branches: refs/heads/master 64a6c828d -> f45c2c8ae
Remove unused --lock_memory traffic_server option Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f45c2c8a Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f45c2c8a Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f45c2c8a Branch: refs/heads/master Commit: f45c2c8ae86697d49d381bf46c807052ea775f13 Parents: 5b260ef Author: James Peach <[email protected]> Authored: Wed Jul 17 22:07:26 2013 -0700 Committer: James Peach <[email protected]> Committed: Wed Jul 17 22:07:34 2013 -0700 ---------------------------------------------------------------------- proxy/Main.cc | 3 --- proxy/Main.h | 1 - 2 files changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f45c2c8a/proxy/Main.cc ---------------------------------------------------------------------- diff --git a/proxy/Main.cc b/proxy/Main.cc index 4928c01..9e9b4db 100644 --- a/proxy/Main.cc +++ b/proxy/Main.cc @@ -99,7 +99,6 @@ extern "C" int plock(int); // #define DEFAULT_HTTP_ACCEPT_PORT_NUMBER 0 #define DEFAULT_COMMAND_FLAG 0 -#define DEFAULT_LOCK_PROCESS 0 #define DEFAULT_VERBOSE_FLAG 0 #define DEFAULT_VERSION_FLAG 0 @@ -136,7 +135,6 @@ int command_flag = DEFAULT_COMMAND_FLAG; static char regression_test[1024] = ""; #endif int auto_clear_hostdb_flag = 0; -int lock_process = DEFAULT_LOCK_PROCESS; extern int fds_limit; extern int cluster_port_number; extern int cache_clustering_enabled; @@ -173,7 +171,6 @@ const Version version = { }; static const ArgumentDescription argument_descriptions[] = { - {"lock_memory", 'l', "Lock process in memory (must be root)", "I", &lock_process, "PROXY_LOCK_PROCESS", NULL}, {"net_threads", 'n', "Number of Net Threads", "I", &num_of_net_threads, "PROXY_NET_THREADS", NULL}, {"cluster_threads", 'Z', "Number of Cluster Threads", "I", &num_of_cluster_threads, "PROXY_CLUSTER_THREADS", NULL}, {"udp_threads", 'U', "Number of UDP Threads", "I", &num_of_udp_threads, "PROXY_UDP_THREADS", NULL}, http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f45c2c8a/proxy/Main.h ---------------------------------------------------------------------- diff --git a/proxy/Main.h b/proxy/Main.h index 6d151b4..867ddb3 100644 --- a/proxy/Main.h +++ b/proxy/Main.h @@ -49,7 +49,6 @@ extern int http_accept_file_descriptor; extern int command_flag; extern int auto_clear_hostdb_flag; extern int auto_clear_cache_flag; -extern int lock_process; extern int fds_limit; extern int debug_level; extern char cluster_host[MAXDNAME + 1];
