kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-06-09 03:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge team/russell/frame_caching

Browse Source 
There are some situations in Asterisk where ast_frame and/or iax_frame
structures are rapidly allocatted and freed (at least 50 times per second
for one call).

This code significantly improves the performance of ast_frame_header_new(), 
ast_frdup(), ast_frfree(), iax_frame_new(), and iax_frame_free() by keeping
a thread-local cache of these structures and using frames from the cache 
whenever possible instead of calling malloc/free every time.

This commit also converts the ast_frame and iax_frame structures to use the
linked list macros.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41278 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-08-29 20:50:36 +00:00
parent d22476348a
commit f7e7161607
16 changed files with 345 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asterisk/channel.h
View File

@@ -410,7 +410,7 @@ struct ast_channel {
unsigned int pickupgroup; /*!< Pickup group - which calls groups can be picked up? */
unsigned int flags; /*!< channel flags of AST_FLAG_ type */
unsigned short transfercapability; /*!< ISDN Transfer Capbility - AST_FLAG_DIGITAL is not enough */
struct ast_frame *readq;
AST_LIST_HEAD_NOLOCK(, ast_frame) readq;
int alertpipe[2];
int nativeformats; /*!< Kinds of data this channel can natively handle */

2
include/asterisk/chanspy.h
View File

@@ -49,7 +49,7 @@ enum chanspy_flags {
};
struct ast_channel_spy_queue {
struct ast_frame *head;
AST_LIST_HEAD_NOLOCK(, ast_frame) list;
unsigned int samples;
unsigned int format;
};

9
include/asterisk/frame.h
View File

@@ -32,6 +32,7 @@ extern "C" {
#include <sys/types.h>
#include <sys/time.h>
#include "asterisk/endian.h"
#include "asterisk/linkedlists.h"
struct ast_codec_pref {
char order[32];
@@ -97,6 +98,8 @@ struct ast_frame {
int samples;
/*! Was the data malloc'd? i.e. should we free it when we discard the frame? */
int mallocd;
/*! The number of bytes allocated for a malloc'd frame header */
size_t mallocd_hdr_len;
/*! How many bytes exist _before_ "data" that can be used if needed */
int offset;
/*! Optional source of frame for debugging */
@@ -105,10 +108,8 @@ struct ast_frame {
void *data;
/*! Global delivery time */
struct timeval delivery;
/*! Next/Prev for linking stand alone frames */
struct ast_frame *prev;
/*! Next/Prev for linking stand alone frames */
struct ast_frame *next;
/*! For placing in a linked list */
AST_LIST_ENTRY(ast_frame) frame_list;
/*! Timing data flag */
int has_timing_info;
/*! Timestamp in milliseconds */

2
include/asterisk/slinfactory.h
View File

@@ -32,7 +32,7 @@ extern "C" {
#endif
struct ast_slinfactory {
struct ast_frame *queue;
AST_LIST_HEAD_NOLOCK(, ast_frame) queue;
struct ast_trans_pvt *trans;
short hold[1280];
short *offset;