diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-01-12 18:11:49 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-01-12 18:11:49 +0000 |
| commit | 24e25db8a9f9262425beb29ed40410b02af27051 (patch) | |
| tree | cd70baec5c4d0b863c055344aa8cfc45304a4e8f /main | |
| parent | 3418ee0e6a9a03c87b578ac2fef501abb1050e72 (diff) | |
Merged revisions 301502 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r301502 | jpeeler | 2011-01-12 12:10:42 -0600 (Wed, 12 Jan 2011) | 12 lines
Fix CPU spike when pressing DTMF after agent login.
The problem here is that DTMF was being continuously deferred and requeued
since ast_safe_sleep is called in a loop. There are serveral other places in the
code that sleeps and then loops in a similar fashion. Because of this fact I
opted to not defer DTMF any more, which will not affect the original fix:
https://reviewboard.asterisk.org/r/674
(closes issue #18130)
Reported by: rgj
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@301503 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index ee4db262c..d70c0ea7d 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1372,13 +1372,13 @@ int ast_is_deferrable_frame(const struct ast_frame *frame) * be queued up or not. */ switch (frame->frametype) { - case AST_FRAME_DTMF_END: case AST_FRAME_CONTROL: case AST_FRAME_TEXT: case AST_FRAME_IMAGE: case AST_FRAME_HTML: return 1; + case AST_FRAME_DTMF_END: case AST_FRAME_DTMF_BEGIN: case AST_FRAME_VOICE: case AST_FRAME_VIDEO: |