aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-11-08 21:58:13 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-11-08 21:58:13 +0000
commitf4712005a561e9013107147531ad776ad6e40283 (patch)
tree6f0c518abfe9845e32f0c56cf6b719e895ce7be3 /include
parent3679c2b1c4768cb384968d345ad6c62a306768f0 (diff)
Fix playback failure when using IAX with the timerfd module.
To fix this issue the alert pipe will now be used when the timerfd module is in use. There appeared to be a race that was not solved by adding locking in the timerfd module, but needed to be there anyway. The race was between the timer being put in non-continuous mode in ast_read on the channel thread and the IAX frame scheduler queuing a frame which would enable continuous mode before the non-continuous mode event was read. This race for now is simply avoided. (closes issue #18110) Reported by: tpanton Tested by: tpanton I put tested by tpanton because it was tested on his hardware. Thanks for the remote access to debug this issue! git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@294277 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/timing.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/include/asterisk/timing.h b/include/asterisk/timing.h
index d93f4f408..dd2a95d90 100644
--- a/include/asterisk/timing.h
+++ b/include/asterisk/timing.h
@@ -216,6 +216,16 @@ enum ast_timer_event ast_timer_get_event(const struct ast_timer *handle);
*/
unsigned int ast_timer_get_max_rate(const struct ast_timer *handle);
+/*!
+ * \brief Get name of timer in use
+ *
+ * \param handle timer handle returned by timer_open()
+ *
+ * \return name of timer
+ * \since 1.6.2
+ */
+const char *ast_timer_get_name(const struct ast_timer *handle);
+
#if defined(__cplusplus) || defined(c_plusplus)
}
#endif