tm: remove obselete parameter delete_timer after cleanup in commit 3eeec9a7ec11ae

src/modules/tm/config.c

@@ -51,7 +51,6 @@ struct cfg_group_tm	default_tm_cfg = {
 	INV_FR_TIME_OUT,	/* fr_inv_timeout */
 	INV_FR_TIME_OUT_NEXT, /* fr_inv_timeout_next */
 	WT_TIME_OUT,	/* wait_timeout */
-	DEL_TIME_OUT,	/* delete_timeout */
 	RETR_T1,	/* rt_t1_timeout_ms */
 	RETR_T2,	/* rt_t2_timeout_ms */
 
@@ -128,9 +127,6 @@ cfg_def_t	tm_cfg_def[] = {
 	{"wt_timer",		CFG_VAR_INT | CFG_ATOMIC,	0, 0, timer_fixup, 0,
 		"time for which a transaction stays in memory to absorb "
 		"delayed messages after it completed"},
-	{"delete_timer",	CFG_VAR_INT | CFG_ATOMIC,	0, 0, timer_fixup, 0,
-		"time after which a to-be-deleted transaction currently "
-		"ref-ed by a process will be tried to be deleted again."},
 	{"retr_timer1",		CFG_VAR_INT | CFG_ATOMIC,	0, 0, timer_fixup_ms, 0,
 		"initial retransmission period (in milliseconds)"},
 	{"retr_timer2",		CFG_VAR_INT | CFG_ATOMIC,	0, 0, timer_fixup_ms, 0,

src/modules/tm/config.h

@@ -56,10 +56,6 @@
    a transaction was finalized*/
 #define WT_TIME_OUT       5000 /* ms */
 
-/* DELETE timer ... tells how long should the transaction persist in memory
-   after it was removed from the hash table and before it will be deleted */
-#define DEL_TIME_OUT      200 /* ms, obsoleted */
-
 /* retransmission timers */
 #define RETR_T1           500 /* ms */
 #define RETR_T2          4000 /* ms */
@@ -109,7 +105,6 @@ struct cfg_group_tm {
 	unsigned int	fr_inv_timeout;
 	unsigned int    fr_inv_timeout_next;
 	unsigned int	wait_timeout;
-	unsigned int	delete_timeout;
 	unsigned int	rt_t1_timeout_ms;
 	unsigned int	rt_t2_timeout_ms;
 	unsigned int	tm_max_inv_lifetime;

src/modules/tm/doc/params.xml

@@ -194,29 +194,6 @@ modparam("tm", "wt_timer", 1000)
 	</example>
     </section>
 
-    <section id="tm.p.delete_timer">
-	<title><varname>delete_timer</varname> (integer)</title>
-	<para>
-	    Time after which a to-be-deleted transaction currently ref-ed by a
-	    process will be tried to be deleted again (in milliseconds).
-	</para>
-	<para>
-	    Note: this parameter is obsolete for SER 2.1 (in 2.1 the transaction
-		 is deleted the moment it's not referenced anymore).
-	</para>
-	<para>
-	    Default value is 200 milliseconds.
-	</para>
-	<example>
-	    <title>Set <varname>delete_timer</varname> parameter</title>
-	    <programlisting>
-...
-modparam("tm", "delete_timer", 100)
-...
-	    </programlisting>
-	</example>
-    </section>
-    
     <section id="tm.p.retr_timer1">
 	<title><varname>retr_timer1</varname> (integer)</title>
 	<para>

src/modules/tm/timer.c

@@ -156,7 +156,6 @@ int tm_init_timers(void)
 	default_tm_cfg.fr_timeout = MS_TO_TICKS(default_tm_cfg.fr_timeout);
 	default_tm_cfg.fr_inv_timeout = MS_TO_TICKS(default_tm_cfg.fr_inv_timeout);
 	default_tm_cfg.wait_timeout = MS_TO_TICKS(default_tm_cfg.wait_timeout);
-	default_tm_cfg.delete_timeout = MS_TO_TICKS(default_tm_cfg.delete_timeout);
 	default_tm_cfg.tm_max_inv_lifetime =
 			MS_TO_TICKS(default_tm_cfg.tm_max_inv_lifetime);
 	default_tm_cfg.tm_max_noninv_lifetime =
@@ -168,8 +167,6 @@ int tm_init_timers(void)
 		default_tm_cfg.fr_inv_timeout = 1;
 	if(default_tm_cfg.wait_timeout == 0)
 		default_tm_cfg.wait_timeout = 1;
-	if(default_tm_cfg.delete_timeout == 0)
-		default_tm_cfg.delete_timeout = 1;
 	if(default_tm_cfg.rt_t2_timeout_ms == 0)
 		default_tm_cfg.rt_t2_timeout_ms = 1;
 	if(default_tm_cfg.rt_t1_timeout_ms == 0)
@@ -203,10 +200,10 @@ int tm_init_timers(void)
 	memset(&user_inv_max_lifetime, 0, sizeof(user_inv_max_lifetime));
 	memset(&user_noninv_max_lifetime, 0, sizeof(user_noninv_max_lifetime));
 
-	LM_DBG("tm init timers - fr=%d fr_inv=%d wait=%d delete=%d t1=%d t2=%d"
+	LM_DBG("tm init timers - fr=%d fr_inv=%d wait=%d t1=%d t2=%d"
 		   " max_inv_lifetime=%d max_noninv_lifetime=%d\n",
 			default_tm_cfg.fr_timeout, default_tm_cfg.fr_inv_timeout,
-			default_tm_cfg.wait_timeout, default_tm_cfg.delete_timeout,
+			default_tm_cfg.wait_timeout,
 			default_tm_cfg.rt_t1_timeout_ms, default_tm_cfg.rt_t2_timeout_ms,
 			default_tm_cfg.tm_max_inv_lifetime,
 			default_tm_cfg.tm_max_noninv_lifetime);

src/modules/tm/tm.c

@@ -429,7 +429,6 @@ static param_export_t params[]={
 	{"fr_timer",            PARAM_INT, &default_tm_cfg.fr_timeout            },
 	{"fr_inv_timer",        PARAM_INT, &default_tm_cfg.fr_inv_timeout        },
 	{"wt_timer",            PARAM_INT, &default_tm_cfg.wait_timeout          },
-	{"delete_timer",        PARAM_INT, &default_tm_cfg.delete_timeout        },
 	{"retr_timer1",         PARAM_INT, &default_tm_cfg.rt_t1_timeout_ms      },
 	{"retr_timer2"  ,       PARAM_INT, &default_tm_cfg.rt_t2_timeout_ms      },
 	{"max_inv_lifetime",    PARAM_INT, &default_tm_cfg.tm_max_inv_lifetime   },