Browse Source

mem Remove SVN ID, remove history

Olle E. Johansson 10 years ago
parent
commit
4c4e576648
16 changed files with 26 additions and 197 deletions
  1. 1 25
      mem/f_malloc.c
  2. 1 12
      mem/f_malloc.h
  3. 3 21
      mem/ll_malloc.c
  4. 3 13
      mem/ll_malloc.h
  5. 1 5
      mem/mem.c
  6. 1 11
      mem/mem.h
  7. 2 6
      mem/memdbg.h
  8. 1 8
      mem/meminfo.h
  9. 1 3
      mem/memtest.c
  10. 1 20
      mem/q_malloc.c
  11. 1 11
      mem/q_malloc.h
  12. 3 20
      mem/sf_malloc.c
  13. 3 12
      mem/sf_malloc.h
  14. 1 13
      mem/shm_mem.c
  15. 1 11
      mem/shm_mem.h
  16. 2 6
      mem/src_loc.h

+ 1 - 25
mem/f_malloc.c

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of sip-router, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -16,30 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
- * History:
- * --------
- *              created by andrei
- *  2003-07-06  added fm_realloc (andrei)
- *  2004-07-19  fragments book keeping code and support for 64 bits
- *               memory blocks (64 bits machine & size >=2^32) 
- *              GET_HASH s/</<=/ (avoids waste of 1 hash cell)   (andrei)
- *  2004-11-10  support for > 4Gb mem., switched to long (andrei)
- *  2005-03-02  added fm_info() (andrei)
- *  2005-12-12  fixed realloc shrink real_used accounting (andrei)
- *              fixed initial size (andrei)
- *  2006-02-03  fixed realloc out of mem. free bug (andrei)
- *  2006-04-07  s/DBG/MDBG (andrei)
- *  2007-02-23  added fm_available() (andrei)
- *  2007-06-23  added hash bitmap (andrei)
- *  2009-09-28  added fm_sums() (patch from Dragos Vingarzan)
- *  2010-03-11  fix big fragments bug (smaller fragment was wrongly
- *               returned sometimes) (andrei)
- *  2010-03-12  fix real_used stats for realloc: a realloc that shrank an
- *               allocation accounted twice fro the frag. overhead (andrei)
- *  2010-09-30  fixed search for big fragments using the hash bitmap
- *               (only the first bucket was tried) (andrei)
- */
 
 /**
  * \file

+ 1 - 12
mem/f_malloc.h

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of sip-router, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -16,17 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
- * History:
- * --------
- *  2003-05-21  on sparc64 roundto 8 even in debugging mode (so malloc'ed
- *               long longs will be 64 bit aligned) (andrei)
- *  2004-07-19  support for 64 bit (2^64 mem. block) and more info
- *               for the future de-fragmentation support (andrei)
- *  2004-11-10  support for > 4Gb mem., switched to long (andrei)
- *  2007-06-23  added hash bitmap (andrei)
- */
-
 /**
  * \file
  * \brief Simple, very fast, malloc library

+ 3 - 21
mem/ll_malloc.c

@@ -1,8 +1,9 @@
-/* $Id$
- *
+/*
  * shared memory, multi-process safe, pool based, mostly lockless version of 
  *  f_malloc
  *
+ * This file is part of Kamailio, a free SIP server.
+ *
  * Copyright (C) 2007 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -17,25 +18,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- * History:
- * --------
- *              created by andrei
- *  2003-07-06  added fm_realloc (andrei)
- *  2004-07-19  fragments book keeping code and support for 64 bits
- *               memory blocks (64 bits machine & size >=2^32) 
- *              GET_HASH s/</<=/ (avoids waste of 1 hash cell)   (andrei)
- *  2004-11-10  support for > 4Gb mem., switched to long (andrei)
- *  2005-03-02  added fm_info() (andrei)
- *  2005-12-12  fixed realloc shrink real_used accounting (andrei)
- *              fixed initial size (andrei)
- *  2006-02-03  fixed realloc out of mem. free bug (andrei)
- *  2006-04-07  s/DBG/MDBG (andrei)
- *  2007-02-23  added fm_available() (andrei)
- *  2007-06-09  forked from the fm_maloc code (andrei)
- *  2007-06-11  forked from the sfm_maloc code (andrei)
- */
-
 
 #ifdef LL_MALLOC
 

+ 3 - 13
mem/ll_malloc.h

@@ -1,8 +1,9 @@
-/* $Id$
- *
+/*
  * shared memory, multi-process safe, pool based, mostly lockless version of 
  *  f_malloc
  *
+ * This file is part of Kamailio, a free SIP server.
+ *
  * Copyright (C) 2007 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -17,17 +18,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- * History:
- * --------
- *  2003-05-21  on sparc64 roundto 8 even in debugging mode (so malloc'ed
- *               long longs will be 64 bit aligned) (andrei)
- *  2004-07-19  support for 64 bit (2^64 mem. block) and more info
- *               for the future de-fragmentation support (andrei)
- *  2004-11-10  support for > 4Gb mem., switched to long (andrei)
- *  2007-06-11  forked from the sf_malloc code (andrei)
- */
-
 
 #if !defined(ll_malloc_h)  
 #define ll_malloc_h

+ 1 - 5
mem/mem.c

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of sip-router, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -16,10 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  *
- * History:
- * --------
- *  2003-04-08  init_mallocs split into init_{pkg,shm}_malloc (andrei)
- * 
  */
 
 /**

+ 1 - 11
mem/mem.h

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of sip-router, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -16,16 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
- * History:
- * --------
- *  2003-03-10  __FUNCTION__ is a gcc-ism, defined it to "" for sun cc
- *               (andrei)
- *  2003-03-07  split init_malloc into init_pkg_mallocs & init_shm_mallocs 
- *               (andrei)
- *  2007-02-23   added pkg_info() and pkg_available() (andrei)
- */
-
 /**
  * \defgroup mem SIP-router memory manager
  * \brief  SIP-router internal memory manager

+ 2 - 6
mem/memdbg.h

@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2006 iptelorg GmbH
  *
+ * This file is part of Kamailio, a free SIP server.
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
@@ -14,12 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
- * History:
- * --------
- *  2006-04-07             created by andrei
- */
-
 /**
  * \file
  * \brief Malloc debug messages

+ 1 - 8
mem/meminfo.h

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of sip-router, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -16,13 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
- * History:
- * --------
- *  2005-03-02  created (andrei)
- *  2005-07-25  renamed meminfo to mem_info due to name conflict on solaris
- */
-
 /**
  * \file
  * \brief Memory manager (malloc) informations and statistics

+ 1 - 3
mem/memtest.c

@@ -1,9 +1,7 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of sip-router, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

+ 1 - 20
mem/q_malloc.c

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of sip-router, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -16,25 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
- * History:
- * --------
- *  ????-??-??  created by andrei
- *  2003-04-14  more debugging added in DBG_QM_MALLOC mode (andrei)
- *  2003-06-29  added qm_realloc (andrei)
- *  2004-07-19  fragments book keeping code and support for 64 bits
- *               memory blocks (64 bits machine & size>=2^32) (andrei)
- *              GET_HASH s/</<=/ (avoids waste of 1 hash cell) (andrei)
- *  2004-11-10  support for > 4Gb mem., switched to long (andrei)
- *  2005-03-02  added qm_info() (andrei)
- *  2005-12-12  fixed realloc shrink real_used & used accounting;
- *              fixed initial size (andrei)
- *  2006-02-03  fixed realloc out of mem. free bug (andrei)
- *  2006-04-07  s/DBG/MDBG (andrei)
- *  2007-02-23  added fm_available() (andrei)
- *  2009-09-28  added fm_sums() (patch from Dragos Vingarzan)
- */
-
 /**
  * \file
  * \brief Simple & fast malloc library

+ 1 - 11
mem/q_malloc.h

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of sip-router, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -16,16 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
- * History:
- * --------
- *  2003-05-21  on sparc64 roundto 8 even in debugging mode (so malloc'ed
- *               long longs will be 64 bit aligned) (andrei)
- *  2004-07-19  support for 64 bit (2^64 mem. block) and more info
- *               for the future de-fragmentation support (andrei)
- *  2004-11-10  support for > 4Gb mem. (switched to long) (andrei)
- */
-
 /**
  * \file
  * \brief Simple & fast malloc library

+ 3 - 20
mem/sf_malloc.c

@@ -1,7 +1,8 @@
-/* $Id$
- *
+/*
  * shared memory, multi-process safe, pool based version of f_malloc
  *
+ * This file is part of Kamailio, a free SIP server.
+ *
  * Copyright (C) 2007 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,24 +17,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- * History:
- * --------
- *              created by andrei
- *  2003-07-06  added fm_realloc (andrei)
- *  2004-07-19  fragments book keeping code and support for 64 bits
- *               memory blocks (64 bits machine & size >=2^32) 
- *              GET_HASH s/</<=/ (avoids waste of 1 hash cell)   (andrei)
- *  2004-11-10  support for > 4Gb mem., switched to long (andrei)
- *  2005-03-02  added fm_info() (andrei)
- *  2005-12-12  fixed realloc shrink real_used accounting (andrei)
- *              fixed initial size (andrei)
- *  2006-02-03  fixed realloc out of mem. free bug (andrei)
- *  2006-04-07  s/DBG/MDBG (andrei)
- *  2007-02-23  added fm_available() (andrei)
- *  2007-06-09  forked from the fm_maloc code (andrei)
- */
-
 
 #ifdef SF_MALLOC
 

+ 3 - 12
mem/sf_malloc.h

@@ -1,7 +1,8 @@
-/* $Id$
- *
+/*
  * shared memory, multi-process safe, pool based version of f_malloc
  *
+ * This file is part of Kamailio, a free SIP server.
+ *
  * Copyright (C) 2007 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,16 +17,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- * History:
- * --------
- *  2003-05-21  on sparc64 roundto 8 even in debugging mode (so malloc'ed
- *               long longs will be 64 bit aligned) (andrei)
- *  2004-07-19  support for 64 bit (2^64 mem. block) and more info
- *               for the future de-fragmentation support (andrei)
- *  2004-11-10  support for > 4Gb mem., switched to long (andrei)
- *  2007-06-09  forked from the f_malloc code (andrei)
- */
 
 
 #if !defined(sf_malloc_h)  

+ 1 - 13
mem/shm_mem.c

@@ -1,9 +1,7 @@
 /*
-
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of sip-router, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -18,16 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
- * History:
- * --------
- *  2003-03-12  split shm_mem_init in shm_getmem & shm_mem_init_mallocs
- *               (andrei)
- *  2004-07-27  ANON mmap support, needed on darwin (andrei)
- *  2004-09-19  shm_mem_destroy: destroy first the lock & then unmap (andrei)
- *  2007-06-10   support for sfm_malloc & shm_malloc_destroy() (andrei)
- */
-
 /**
  * \file
  * \brief  Shared memory functions

+ 1 - 11
mem/shm_mem.h

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2001-2003 FhG Fokus
  *
- * This file is part of sip-router, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -18,16 +18,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
- * History:
- * --------
- *  2003-06-29  added shm_realloc & replaced shm_resize (andrei)
- *  2003-11-19  reverted shm_resize to the old version, using
- *               realloc causes terrible fragmentation  (andrei)
- *  2005-03-02   added shm_info() & re-eneabled locking on shm_status (andrei)
- *  2007-02-23   added shm_available() (andrei)
- *  2007-06-10   support for sf_malloc (andrei)
- */
 
 /**
  * \file

+ 2 - 6
mem/src_loc.h

@@ -1,6 +1,8 @@
 /* 
  * Copyright (C) 2009 iptelorg GmbH
  *
+ * This file is part of Kamailio, a free SIP server.
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
@@ -14,12 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
- * History:
- * --------
- *  2009-10-08  initial version (andrei)
-*/
-
 /**
  * \file
  * \brief Helper definitions for internal memory manager