[mythtv-commits] mythtv branch fixes/0.25 updated by gigem. v0.25.1-61-g4386e90

[Git Repo Owner]

The branch, fixes/0.25 has been updated on the
mythtv repository by gitolite user gigem.
       via  4386e90e25ed40948bb208e8a325a8b072411e88 (commit)
       via  157fe18bf710b4b35d0756503712f3d7e93b5024 (commit)
      from  61e7a0e94652b798a9283f280908f1dabb371f55 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4386e90e25ed40948bb208e8a325a8b072411e88
Author:    David Engel <dengel at mythtv.org> at Fri, 6 Jul 2012 10:10:50 -0500
Committer: David Engel <dengel at mythtv.org> at Tue, 10 Jul 2012 11:23:12 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=4386e90e25ed40948bb208e8a325a8b072411e88

Hopefully remove more scheduler/recorder deadlocks.
Change the scheduler to unlock schedLock when calling the recorder
synchronously.  If the recorder happens to be calling the scheduler at
the same time, this allows the recorder's call to grab the lock as
needed.

Refs #10647, #10770 and #10771 .
(cherry picked from commit ca273324961b95e300890ed40e833249b5460bd8)

Conflicts:
	mythtv/programs/mythbackend/scheduler.cpp



commit 157fe18bf710b4b35d0756503712f3d7e93b5024
Author:    David Engel <dengel at mythtv.org> at Tue, 10 Jul 2012 10:53:49 -0500
Committer: David Engel <dengel at mythtv.org> at Tue, 10 Jul 2012 11:00:39 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=157fe18bf710b4b35d0756503712f3d7e93b5024

Fix 0ms sleep time calculation in scheduler.
Don't check the pending list for programs that won't record.  They'll
never be there and don't need the 30 second padding.

Fixes #10279 .
(cherry picked from commit 88817964d66d0a18c43f3ff370994108ebe46c13)



-----------------------------------------------------------------------

Summary of changes:
 mythtv/programs/mythbackend/scheduler.cpp |   62 ++++++++++++++++++++---------
 1 files changed, 43 insertions(+), 19 deletions(-)

--