X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fthread.h;h=ae257078569c47844e0d4502886f5de403371885;hb=8db2c378e1d006afb792d829857e866541bf81a5;hp=59e6e060ce4b77d2e0e69b45f245e6537ca3a70b;hpb=5a9200b48b8455185b0fcbd55c69deca88a1184c;p=libs%2Fcore.git diff --git a/source/core/thread.h b/source/core/thread.h index 59e6e06..ae25707 100644 --- a/source/core/thread.h +++ b/source/core/thread.h @@ -1,10 +1,3 @@ -/* $Id$ - -This file is part of libmspcore -Copyright © 2006 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #ifndef MSP_CORE_THREAD_H_ #define MSP_CORE_THREAD_H_ @@ -33,7 +26,12 @@ private: public: virtual ~Thread(); + /** Waits for the thread to exit. Calling this from the thread will cause a + deadlock. */ void join(); + + /** Violently terminates the thread. This should only be used as a last + resort, as the thread gets no chance to clean up. */ void kill(); protected: void launch();