Changeset 10574 in orxonox.OLD

Timestamp:

Feb 7, 2007, 9:21:02 PM (17 years ago)

Author:

bensch

Message:

added new thread classes

Location:

branches/cleanup/src/lib/util/threads

Files:

• . (added)
• mutex.cc (added)
• mutex.h (added)
• mutex_locker.cc (added)
• mutex_locker.h (added)
• threading.cc (copied) (copied from branches/cleanup/src/lib/util/threading.cc) (1 diff)
• threading.h (copied) (copied from branches/cleanup/src/lib/util/threading.h) (1 diff)

branches/cleanup/src/lib/util/threads/threading.cc

@@ -1 @@
-/*
-   orxonox - the future of 3D-vertical-scrollers
-
-   Copyright (C) 2004 orx
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   ### File Specific:
-   main-programmer: ...
-   co-programmer: ...
-*/
-
-//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
-
-#include "threading.h"
-
-
-
-namespace OrxThread
-{
-
-/**
- * standard constructor
- * @todo this constructor is not jet implemented - do it
-*/
-// Thread::Thread()
-// {
-// }
-
-
-/**
- * standard deconstructor
-*/
-// Thread::~Thread()
-// {
-//   // delete what has to be deleted here
-// }
-
-}

branches/cleanup/src/lib/util/threads/threading.h

@@ -9 +9 @@
 #define _THREADING_H
 
-#ifdef HAVE_SDL_H
- #include <SDL_thread.h>
-#else
- #include <SDL/SDL_thread.h>
-#endif
-
-namespace OrxThread
-{
-  //! A class for Wrapping Threads
-  class Thread
-  {
-  public:
-    Thread(int (*fn)(void *), void *data) { this->thread = SDL_CreateThread(fn, data); };
-    virtual ~Thread() { SDL_KillThread(this->thread); }
-    void exit ( int returnCode = 0 );
-    bool isFinished () const;
-    bool isRunning () const;
-    void wait() { SDL_WaitThread(this->thread, NULL); };
-
-    void start();
-    void terminate();
+#include "thread.h"
+#include "mutex.h"
+#include "mutex_locker.h"
 
 
-  private:
-    SDL_Thread* thread;
-
-  };
-
-  class Mutex
-  {
-  public:
-    Mutex() {  this->mutex = SDL_CreateMutex(); };
-    ~Mutex() { SDL_DestroyMutex(this->mutex); }
-
-    void lock() { SDL_mutexP(mutex); };
-    void unlock() { SDL_mutexV(mutex); };
-
-    SDL_mutex* getMutex() const { return this->mutex; };
-  private:
-    SDL_mutex* mutex;
-  };
-
-  //! A Class that locks a Mutex within its scope
-  class MutexLock
-  {
-  public:
-    //! Locks the Mutex mutex in this Scope.
-    MutexLock(Mutex* mutex) { SDL_mutexP(mutex->getMutex()); this->mutex = mutex; };
-    ~MutexLock() { SDL_mutexV(mutex->getMutex()); };
-  private:
-    Mutex* mutex;         //!< The Mutex to lock.
-  };
-}
 
 #endif /* _THREADING_H */