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

Merged revisions 175882 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
r175882 | russell | 2009-02-15 15:27:33 -0600 (Sun, 15 Feb 2009) | 2 lines

Make ast_sched_report() and ast_sched_dump() thread safe.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@175890 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-02-15 21:28:55 +00:00
parent 3e2b976fc0
commit ce201230ea
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asterisk/sched.h
View File

@@ -255,7 +255,7 @@ int ast_sched_runq(struct sched_context *con);
* Debugging: Dump the contents of the scheduler to stderr * Debugging: Dump the contents of the scheduler to stderr
* \param con Context to dump * \param con Context to dump
*/ */
void ast_sched_dump(const struct sched_context *con); void ast_sched_dump(struct sched_context *con);
/*! \brief Returns the number of seconds before an event takes place /*! \brief Returns the number of seconds before an event takes place
* \param con Context to use * \param con Context to use

7
main/sched.c
View File

@@ -394,6 +394,7 @@ void ast_sched_report(struct sched_context *con, struct ast_str **buf, struct as
ast_str_set(buf, 0, " Highwater = %d\n schedcnt = %d\n", con->highwater, con->schedcnt); ast_str_set(buf, 0, " Highwater = %d\n schedcnt = %d\n", con->highwater, con->schedcnt);
ast_mutex_lock(&con->lock);
AST_DLLIST_TRAVERSE(&con->schedq, cur, list) { AST_DLLIST_TRAVERSE(&con->schedq, cur, list) {
/* match the callback to the cblist */ /* match the callback to the cblist */
for (i = 0; i < cbnames->numassocs; i++) { for (i = 0; i < cbnames->numassocs; i++) {
@@ -407,6 +408,7 @@ void ast_sched_report(struct sched_context *con, struct ast_str **buf, struct as
countlist[cbnames->numassocs]++; countlist[cbnames->numassocs]++;
} }
} }
ast_mutex_unlock(&con->lock);
for (i = 0; i < cbnames->numassocs; i++) { for (i = 0; i < cbnames->numassocs; i++) {
ast_str_append(buf, 0, " %s : %d\n", cbnames->list[i], countlist[i]); ast_str_append(buf, 0, " %s : %d\n", cbnames->list[i], countlist[i]);
@@ -416,7 +418,7 @@ void ast_sched_report(struct sched_context *con, struct ast_str **buf, struct as
} }
/*! \brief Dump the contents of the scheduler to LOG_DEBUG */ /*! \brief Dump the contents of the scheduler to LOG_DEBUG */
void ast_sched_dump(const struct sched_context *con) void ast_sched_dump(struct sched_context *con)
{ {
struct sched *q; struct sched *q;
struct timeval when = ast_tvnow(); struct timeval when = ast_tvnow();
@@ -429,6 +431,7 @@ void ast_sched_dump(const struct sched_context *con)
ast_debug(1, "=============================================================\n"); ast_debug(1, "=============================================================\n");
ast_debug(1, "|ID Callback Data Time (sec:ms) |\n"); ast_debug(1, "|ID Callback Data Time (sec:ms) |\n");
ast_debug(1, "+-----+-----------------+-----------------+-----------------+\n"); ast_debug(1, "+-----+-----------------+-----------------+-----------------+\n");
ast_mutex_lock(&con->lock);
AST_DLLIST_TRAVERSE(&con->schedq, q, list) { AST_DLLIST_TRAVERSE(&con->schedq, q, list) {
struct timeval delta = ast_tvsub(q->when, when); struct timeval delta = ast_tvsub(q->when, when);
@@ -439,8 +442,8 @@ void ast_sched_dump(const struct sched_context *con)
(long)delta.tv_sec, (long)delta.tv_sec,
(long int)delta.tv_usec); (long int)delta.tv_usec);
} }
ast_mutex_unlock(&con->lock);
ast_debug(1, "=============================================================\n"); ast_debug(1, "=============================================================\n");
} }
/*! \brief /*! \brief