Merged revisions 376308,376315 via svnmerge from

Merged revisions 376308,376315 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r376308 | jrose | 2012-11-15 16:55:04 -0600 (Thu, 15 Nov 2012) | 17 lines

  app_meetme: Fix channels lingering when hung up under certain conditions

  Channels would get stuck and MeetMe would repeatedly display an Unable
  to write frame to channel error in the conf_run function if hung up
  during certain sound prompts such as during user count announcements.
  This patch fixes that by reintroducing a hangup check in the meetme's
  main loop (also in conf_run).

  (closes issue ASTERISK-20486)
  Reported by: Michael Cargile
  Review: https://reviewboard.asterisk.org/r/2187/
  Patches:
      meetme_hangup_patch_ASTERISK-20486_v3.diff uploaded by Jonathan Rose (license 6182)
  ........

  Merged revisions 376307 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................
  r376315 | dlee | 2012-11-15 17:17:54 -0600 (Thu, 15 Nov 2012) | 28 lines

  Migrate hashtest/hashtest2 to be unit tests.

  Both hashtest and hashtest2 are manual testing apps that thrash hash
  tables (hashtab and ao2 containers, respectively), by spinning up
  several threads that randomly insert, delete, lookup and iterate over
  the hash table. If the app doesn't crash, the hash table probably passes
  the test. Those utils are not a part of the typical Asterisk build, so
  they do not usually get compiled. This all makes them less that useful.

  This patch removes those manual test programs and replaces them with
  Asterisk unit test modules (test_{hashtab,astobj2}_thrash.so). It also
  attempts to make the tests more deterministic.

  * Rather than spinning up some number of threads that operate on the
    hash table randomly, spin up four threads that concurrenly add,
    remove, lookup and iterate over the hash table.
  * Each thread checks the state of the hash table both during and after
    execution, and indicates a test failure if things are not as expected.
  * Each thread times out after 60 seconds to prevent deadlocking the unit
    test run.

  (closes issue ASTERISK-20505)
  Reported by: Matt Jordan
  Review: https://reviewboard.asterisk.org/r/2189/
  ........

  Merged revisions 376306 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@376338 65c4cc65-6c06-0410-ace0-fbb531ad65f3