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 changes from topic 'ASTERISK-27625'

Browse Source 
* changes:
  channel.c: Make CHECK_BLOCKING() save thread LWP id for messages.
  channel.c: Fix usage of CHECK_BLOCKING()
  autoservice: Don't start channel autoservice if the thread is a user interface.
This commit is contained in:
George Joseph
2018-06-21 10:26:31 -05:00
committed by Gerrit Code Review
parent 98bd5908a2 eb8bbe660e
commit d87631d21f
7 changed files with 142 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
include/asterisk/channel.h
View File

@@ -2710,15 +2710,31 @@ static inline enum ast_t38_state ast_channel_get_t38_state(struct ast_channel *c
return state;
}
#define CHECK_BLOCKING(c) do { \
if (ast_test_flag(ast_channel_flags(c), AST_FLAG_BLOCKING)) {\
ast_debug(1, "Thread %p is blocking '%s', already blocked by thread %p in procedure %s\n", \
(void *) pthread_self(), ast_channel_name(c), (void *) ast_channel_blocker(c), ast_channel_blockproc(c)); \
} else { \
/*!
* \brief Set the blocking indication on the channel.
*
* \details
* Indicate that the thread handling the channel is about to do a blocking
* operation to wait for media on the channel. (poll, read, or write)
*
* Masquerading and ast_queue_frame() use this indication to wake up the thread.
*
* \pre The channel needs to be locked
*/
#define CHECK_BLOCKING(c) \
do { \
if (ast_test_flag(ast_channel_flags(c), AST_FLAG_BLOCKING)) { \
/* This should not happen as there should only be one thread handling a channel's media at a time. */ \
ast_log(LOG_DEBUG, "Thread LWP %d is blocking '%s', already blocked by thread LWP %d in procedure %s\n", \
ast_get_tid(), ast_channel_name(c), \
ast_channel_blocker_tid(c), ast_channel_blockproc(c)); \
ast_assert(0); \
} \
ast_channel_blocker_tid_set((c), ast_get_tid()); \
ast_channel_blocker_set((c), pthread_self()); \
ast_channel_blockproc_set((c), __PRETTY_FUNCTION__); \
ast_set_flag(ast_channel_flags(c), AST_FLAG_BLOCKING); \
} } while (0)
} while (0)
ast_group_t ast_get_group(const char *s);
@@ -4354,6 +4370,9 @@ int ast_channel_fd_add(struct ast_channel *chan, int value);
pthread_t ast_channel_blocker(const struct ast_channel *chan);
void ast_channel_blocker_set(struct ast_channel *chan, pthread_t value);
int ast_channel_blocker_tid(const struct ast_channel *chan);
void ast_channel_blocker_tid_set(struct ast_channel *chan, int tid);
ast_timing_func_t ast_channel_timingfunc(const struct ast_channel *chan);
void ast_channel_timingfunc_set(struct ast_channel *chan, ast_timing_func_t value);

18
include/asterisk/utils.h
View File

@@ -913,4 +913,22 @@ enum ast_fd_flag_operation {
int __ast_fd_set_flags(int fd, int flags, enum ast_fd_flag_operation op,
const char *file, int lineno, const char *function);
/*!
* \brief Set the current thread's user interface status.
*
* \param is_user_interface Non-zero to mark the thread as a user interface.
*
* \return 0 if successfuly marked current thread.
* \return Non-zero if marking current thread failed.
*/
int ast_thread_user_interface_set(int is_user_interface);
/*!
* \brief Indicates whether the current thread is a user interface
*
* \return True (non-zero) if thread is a user interface.
* \return False (zero) if thread is not a user interface.
*/
int ast_thread_is_user_interface(void);
#endif /* _ASTERISK_UTILS_H */