diff options
| author | Russell Bryant <russell@russellbryant.com> | 2013-05-06 15:58:32 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2013-05-06 15:58:32 +0000 |
| commit | 049345c323200041c7c7395114850d7f5eac6c13 (patch) | |
| tree | ba7add8b35302dbd38828d55d033b77080090e54 /apps/app_meetme.c | |
| parent | 40074542bf517a751061d7cf6f9ff83431e35ff8 (diff) | |
Make SLA reload more paranoid.
Reload support was originally not included for SLA. It was added later,
but in a fairly non-traditional way. It basically sets a flag
indicating that a reload is pending, and then waits for a time where it
thinks everything SLA related is idle and unused, and *then* executes
the reload. It does this because the reload process is destructive. It
starts by throwing everything away and starting over.
There are a number of problems with this approach. One of them is that
the check to see if anything in use was incomplete. This patch makes it
more complete and thus less likely for a crash to occur during reload
processing. However, this approach still has problems so some much more
significant reworking of this code will need to come in as a next step.
Patch credit and testing by CoreDial, LLC.
........
Merged revisions 387688 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 387689 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@387690 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 0ff035afc..def1e74f1 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -6447,8 +6447,8 @@ static void sla_check_reload(void) struct sla_station *station; struct sla_trunk *trunk; - if (!AST_LIST_EMPTY(&sla.event_q) || !AST_LIST_EMPTY(&sla.ringing_trunks) - || !AST_LIST_EMPTY(&sla.ringing_stations)) { + if (!AST_LIST_EMPTY(&sla.event_q) || !AST_LIST_EMPTY(&sla.ringing_trunks) + || !AST_LIST_EMPTY(&sla.ringing_stations) || !AST_LIST_EMPTY(&sla.failed_stations)) { return; } @@ -6464,8 +6464,9 @@ static void sla_check_reload(void) AST_RWLIST_RDLOCK(&sla_trunks); AST_RWLIST_TRAVERSE(&sla_trunks, trunk, entry) { - if (trunk->ref_count) + if (trunk->ref_count || trunk->chan || trunk->active_stations || trunk->hold_stations) { break; + } } AST_RWLIST_UNLOCK(&sla_trunks); if (trunk) { @@ -6718,7 +6719,7 @@ static int sla_station_exec(struct ast_channel *chan, const char *data) return 0; } - AST_RWLIST_RDLOCK(&sla_stations); + AST_RWLIST_WRLOCK(&sla_stations); station = sla_find_station(station_name); if (station) ast_atomic_fetchadd_int((int *) &station->ref_count, 1); @@ -6930,7 +6931,7 @@ static int sla_trunk_exec(struct ast_channel *chan, const char *data) } } - AST_RWLIST_RDLOCK(&sla_trunks); + AST_RWLIST_WRLOCK(&sla_trunks); trunk = sla_find_trunk(args.trunk_name); if (trunk) ast_atomic_fetchadd_int((int *) &trunk->ref_count, 1); |