X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FThread.hh;h=3e0bd829a8affabd059f5b7b376779e7971e4fbf;hp=74952fa3411e99e211c971ce005ac36e406dcbb0;hb=41f8dd670e963aad94527ce2be0486268993a477;hpb=a31d65a998121df0651c57bfb68782e2a07d2e2f

diff --git a/src/Moof/Thread.hh b/src/Moof/Thread.hh
index 74952fa..3e0bd82 100644
--- a/src/Moof/Thread.hh
+++ b/src/Moof/Thread.hh
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #ifndef _MOOF_THREAD_HH_
 #define _MOOF_THREAD_HH_
@@ -35,12 +18,12 @@
  */
 
 #include <boost/function.hpp>
-
 #include <SDL/SDL.h>
 
 
 namespace Mf {
 
+
 //
 // The detach function detaches a separate thread by calling 'func' with
 // the 'arg' parameter.
@@ -98,7 +81,42 @@ inline unsigned getThreadIdentifier(Thread thread)
 }
 
 
-// =============================================================================
+class AsyncTask
+{
+public:
+
+	virtual ~AsyncTask() {}
+
+	virtual bool isDone() const = 0;
+
+	virtual void run() = 0;
+	virtual int wait() = 0;
+};
+
+class ThreadedTask
+{
+public:
+
+	ThreadedTask() :
+		mThread(0) {}
+
+	Thread thread() const { return mThread; }
+
+	int wait()
+	{
+		int code = waitOnThread(mThread);
+		mThread = 0;
+		return code;
+	}
+
+
+protected:
+
+	Thread mThread;
+};
+
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 class Mutex
 {
@@ -198,7 +216,8 @@ public:
     bool wait(Mutex::Lock& lock, unsigned ms)
 	{
 		// TODO for consistency, this function should take seconds
-        return (SDL_CondWaitTimeout(condition_, lock.mMutex->mMutex, ms) == 0);
+        return (SDL_CondWaitTimeout(condition_,
+									lock.mMutex->mMutex, ms) == 0);
 	}
 
     bool notify()
@@ -301,8 +320,5 @@ private:
 
 } // namespace Mf
 
-
 #endif // _MOOF_THREAD_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-