- malloc debugging on by default (warning: lots of debugging info)

- malloc hash size adjusted
- avpops:  64 bit warnings fixed
- tm: log messages

Makefile.defs

@@ -50,7 +50,7 @@ MAIN_NAME=ser
 VERSION = 0
 PATCHLEVEL = 8
 SUBLEVEL =   99
-EXTRAVERSION = -dev15
+EXTRAVERSION = -dev16
 
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 OS = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")
@@ -293,7 +293,8 @@ DEFS+= $(extra_defs) \
 	 -DUSE_MCAST \
 	 -DUSE_TCP \
 	 -DDISABLE_NAGLE \
-	 -DF_MALLOC \
+	 -DDBG_QM_MALLOC \
+	# -DF_MALLOC \
 	# -DDBG_QM_MALLOC \
 	# -DDBG_F_MALLOC \
 	 #-DF_MALLOC \

mem/f_malloc.h

@@ -60,7 +60,7 @@
 
 
 
-#define F_MALLOC_OPTIMIZE_FACTOR 11UL /*used below */
+#define F_MALLOC_OPTIMIZE_FACTOR 14UL /*used below */
 #define F_MALLOC_OPTIMIZE  (1UL<<F_MALLOC_OPTIMIZE_FACTOR)
 								/* size to optimize for,
 									(most allocs <= this size),

mem/q_malloc.h

@@ -62,7 +62,7 @@
 
 
 
-#define QM_MALLOC_OPTIMIZE_FACTOR 11UL /*used below */
+#define QM_MALLOC_OPTIMIZE_FACTOR 14UL /*used below */
 #define QM_MALLOC_OPTIMIZE  ((unsigned long)(1UL<<QM_MALLOC_OPTIMIZE_FACTOR))
 								/* size to optimize for,
 									(most allocs <= this size),

modules/tm/t_reply.c

@@ -228,7 +228,7 @@ inline static int update_totag_set(struct cell *t, struct sip_msg *ok)
 	}
 	tag=&get_to(ok)->tag_value;
 	if (!tag->s) {
-		LOG(L_ERR, "ERROR: update_totag_set: no tag in to\n");
+		DBG("ERROR: update_totag_set: no tag in to\n");
 		return 0;
 	}
 

modules/tm/tm.c

@@ -439,8 +439,8 @@ static int script_init( struct sip_msg *foo, void *bar)
 
 static int mod_init(void)
 {
-	DBG( "TM - (size of cell=%ld) initializing...\n", 
-			(long)sizeof(struct cell));
+	DBG( "TM - (size of cell=%ld, sip_msg=%ld) initializing...\n", 
+			(long)sizeof(struct cell), (long)sizeof(struct sip_msg));
 	/* checking if we have sufficient bitmap capacity for given
 	   maximum number of  branches */
 	if (MAX_BRANCHES+1>31) {