From 38cb3e2ac941a4c74194075de1e6879c57c79bf2 Mon Sep 17 00:00:00 2001
From: Mark Michelson <mmichelson@digium.com>
Date: Sat, 6 Feb 2010 14:43:03 +0000
Subject: [PATCH] Remove useless sip options related to hash table size.
First off, these options weren't actually doing anything.
By the time the options were parsed, the peer and dialog
containers had already been allocated with their default
values.
Second, hash table size is something that doesn't really
make sense to change in a config file. If a user is that
interested in changing the hashtable size, he can modify
the source itself.
I have removed the parsing of the hash_peer, hash_user,
and hash_dialog options. I have removed the hash_user_size
variable altogether since it is not used at all. I also
changed hash_peer_size and hash_dialog_size to be constant,
and have changed the symbols to be in all caps as constants
typically are. I have also removed the entire section in
sip.conf.sample regarding configurable hashtable sizes.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@245192 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_sip.c | 39 ++++++++-------------------------------
configs/sip.conf.sample | 19 -------------------
2 files changed, 8 insertions(+), 50 deletions(-)
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 4d05b34d38..b45088b0c3 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -841,13 +841,11 @@ static const struct _map_x_s referstatusstrings[] = {
/* --- Hash tables of various objects --------*/
#ifdef LOW_MEMORY
-static int hash_peer_size = 17;
-static int hash_dialog_size = 17;
-static int hash_user_size = 17;
+static const int HASH_PEER_SIZE = 17;
+static const int HASH_DIALOG_SIZE = 17;
#else
-static int hash_peer_size = 563; /*!< Size of peer hash table, prime number preferred! */
-static int hash_dialog_size = 563;
-static int hash_user_size = 563;
+static const int HASH_PEER_SIZE = 563; /*!< Size of peer hash table, prime number preferred! */
+static const int HASH_DIALOG_SIZE = 563;
#endif
/*! \brief
@@ -24205,27 +24203,6 @@ static int reload_config(enum channelreloadreason reason)
} else {
ast_log(LOG_WARNING, "Invalid port number '%s' at line %d of %s\n", v->value, v->lineno, config);
}
- } else if (!strcasecmp(v->name, "hash_user")) {
- int i;
- if (sscanf(v->value, "%30d", &i) == 1 && i > 2) {
- hash_user_size = i;
- } else {
- ast_log(LOG_WARNING, "Invalid hash_user size '%s' at line %d of %s -- should be much larger than 2\n", v->value, v->lineno, config);
- }
- } else if (!strcasecmp(v->name, "hash_peer")) {
- int i;
- if (sscanf(v->value, "%30d", &i) == 1 && i > 2) {
- hash_peer_size = i;
- } else {
- ast_log(LOG_WARNING, "Invalid hash_peer size '%s' at line %d of %s -- should be much larger than 2\n", v->value, v->lineno, config);
- }
- } else if (!strcasecmp(v->name, "hash_dialog")) {
- int i;
- if (sscanf(v->value, "%30d", &i) == 1 && i > 2) {
- hash_dialog_size = i;
- } else {
- ast_log(LOG_WARNING, "Invalid hash_dialog size '%s' at line %d of %s -- should be much larger than 2\n", v->value, v->lineno, config);
- }
} else if (!strcasecmp(v->name, "qualify")) {
if (!strcasecmp(v->value, "no")) {
default_qualify = 0;
@@ -25264,10 +25241,10 @@ static int load_module(void)
ast_verbose("SIP channel loading...\n");
/* the fact that ao2_containers can't resize automatically is a major worry! */
/* if the number of objects gets above MAX_XXX_BUCKETS, things will slow down */
- peers = ao2_t_container_alloc(hash_peer_size, peer_hash_cb, peer_cmp_cb, "allocate peers");
- peers_by_ip = ao2_t_container_alloc(hash_peer_size, peer_iphash_cb, peer_ipcmp_cb, "allocate peers_by_ip");
- dialogs = ao2_t_container_alloc(hash_dialog_size, dialog_hash_cb, dialog_cmp_cb, "allocate dialogs");
- threadt = ao2_t_container_alloc(hash_dialog_size, threadt_hash_cb, threadt_cmp_cb, "allocate threadt table");
+ peers = ao2_t_container_alloc(HASH_PEER_SIZE, peer_hash_cb, peer_cmp_cb, "allocate peers");
+ peers_by_ip = ao2_t_container_alloc(HASH_PEER_SIZE, peer_iphash_cb, peer_ipcmp_cb, "allocate peers_by_ip");
+ dialogs = ao2_t_container_alloc(HASH_DIALOG_SIZE, dialog_hash_cb, dialog_cmp_cb, "allocate dialogs");
+ threadt = ao2_t_container_alloc(HASH_DIALOG_SIZE, threadt_hash_cb, threadt_cmp_cb, "allocate threadt table");
ASTOBJ_CONTAINER_INIT(®l); /* Registry object list -- not searched for anything */
ASTOBJ_CONTAINER_INIT(&submwil); /* MWI subscription object list */
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 8fb7237178..7109935e7f 100644
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -453,25 +453,6 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls
;session-minse=90
;session-refresher=uas
;
-;--------------------------- HASH TABLE SIZES ------------------------------------------------
-; Hash tables are used internally by the SIP driver to locate objects in memory.
-; For every incoming call, Asterisk will match properties of the call with in-memory
-; hash tables to locate a matching device, peer or user.
-;
-; For maximum efficiency, adjust the following
-; values to be slightly larger than the maximum number of in-memory objects (devices).
-; Too large, and space is wasted. Too small, and things will run slower.
-; 563 is probably way too big for small (home) applications, but it
-; should cover most small/medium sites.
-; It is recommended to make the sizes be a prime number!
-; This was internally set to 17 for small-memory applications...
-; All tables default to 563, except when compiled in LOW_MEMORY mode,
-; in which case, they default to 17. You can override this by uncommenting
-; the following, and changing the values.
-;hash_users=563
-;hash_peers=563
-;hash_dialogs=563
-
;--------------------------- SIP DEBUGGING ---------------------------------------------------
;sipdebug = yes ; Turn on SIP debugging by default, from
; the moment the channel loads this configuration
--
GitLab