kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 20:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 304950 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r304950 | tilghman | 2011-01-31 00:41:36 -0600 (Mon, 31 Jan 2011) | 18 lines
  
  Change mutex tracking so that it only consumes memory in the core mutex object when it's actually being used.
  
  This reduces the overall size of a mutex which was 3016 bytes before this back
  down to 216 bytes (this is on 64-bit Linux with a glibc-implemented mutex).
  The exactness of the numbers here may vary slightly based upon how mutexes are
  implemented on a platform, but the long and short of it is that prior to this
  commit, chan_iax2 held down 98MB of memory on a 64-bit system for nothing more
  than a table of 32767 locks.  After this commit, the same table occupies a mere
  7MB of memory.
  
  (closes issue #18194)
   Reported by: job
   Patches: 
         20110124__issue18194.diff.txt uploaded by tilghman (license 14)
   Tested by: tilghman
   
  Review: https://reviewboard.asterisk.org/r/1066
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@304951 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2011-01-31 06:50:49 +00:00
parent f9c3b26241
commit 16c3ea3d42
5 changed files with 337 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/heap.c
View File

@@ -308,15 +308,15 @@ size_t ast_heap_size(struct ast_heap *h)
int __ast_heap_wrlock(struct ast_heap *h, const char *file, const char *func, int line)
{
return __ast_rwlock_wrlock(&h->lock, "&h->lock", file, line, func);
return __ast_rwlock_wrlock(file, line, func, &h->lock, "&h->lock");
}
int __ast_heap_rdlock(struct ast_heap *h, const char *file, const char *func, int line)
{
return __ast_rwlock_rdlock(&h->lock, "&h->lock", file, line, func);
return __ast_rwlock_rdlock(file, line, func, &h->lock, "&h->lock");
}
int __ast_heap_unlock(struct ast_heap *h, const char *file, const char *func, int line)
{
return __ast_rwlock_unlock(&h->lock, "&h->lock", file, line, func);
return __ast_rwlock_unlock(file, line, func, &h->lock, "&h->lock");
}