[mythtv-commits] mythtv/master commit: 3bb4e17f5 by Gavin Hurlbut (Beirdo)

[MythTV]

      Author:  Gavin Hurlbut <ghurlbut at mythtv.org>
 Change Date:  2011-04-17T20:35:42-07:00
   Push Date:  2011/04/17 20:36:50 -0700
  Repository:  mythtv
      Branch:  master
New Revision:  3bb4e17f58bd3bf356373aa2a2ba1526cbe496fd
   Changeset:  https://github.com/MythTV/mythtv/commit/3bb4e17f5

Log:

Merges in AutoExpire changes from mythtv-rec2

Before the QThread porting the threads were shutdown somewhat promptly by use
of a signal. This instead uses the already existing QWaitCondition + a new
wakeable Sleep() function for the sleeps in both threads.

Note: The porting got rid of the sleep() cancelling signal and replaced it with
a QThread::quit(), which tells QThread::exec() to exit; but we never call that,
so this is a no-op. Also, the Sleep() function was supposed to exit early after
expire_thread_running was cleared; but this check was replaced with an
QThread::isRunning() method invocation, which will always return true even
after the expire_thread_run variable is cleared. This old Sleep() early exit
wouldn't necessarily have worked anyway since expire_thread_running was not
declared volatile so the check could have been optimized away.

Merged in from [d8619e6d7e83adb2cffcf39a8b07dcc12f64e43c] on mythtv-rec2

Conflicts:

	mythtv/programs/mythbackend/autoexpire.cpp
	mythtv/programs/mythbackend/autoexpire.h

Modified:

   mythtv/programs/mythbackend/autoexpire.cpp
   mythtv/programs/mythbackend/autoexpire.h