[complement-svn] SF.net SVN: complement: [1446] trunk/complement/explore

[<com...@us...>]

Revision: 1446
          http://svn.sourceforge.net/complement/?rev=1446&view=rev
Author:   complement
Date:     2006-12-13 10:25:00 -0800 (Wed, 13 Dec 2006)

Log Message:
-----------
add join method

Modified Paths:
--------------
    trunk/complement/explore/include/mt/thr_mgr.h
    trunk/complement/explore/lib/mt/ChangeLog
    trunk/complement/explore/lib/mt/thr_mgr.cc

Modified: trunk/complement/explore/include/mt/thr_mgr.h
===================================================================
--- trunk/complement/explore/include/mt/thr_mgr.h	2006-12-13 09:43:33 UTC (rev 1445)
+++ trunk/complement/explore/include/mt/thr_mgr.h	2006-12-13 18:25:00 UTC (rev 1446)
@@ -1,4 +1,4 @@
-// -*- C++ -*- Time-stamp: <06/09/22 20:01:52 ptr>
+// -*- C++ -*- Time-stamp: <06/12/13 17:41:15 ptr>
 
 /*
  * Copyright (c) 1997-1999, 2002, 2005, 2006
@@ -39,6 +39,7 @@
     __FIT_DECLSPEC
     void launch( Thread::entrance_type entrance, const void *p = 0, size_t psz = 0, unsigned flags = 0, size_t stack_sz = 0 );    
     __FIT_DECLSPEC void garbage_collector();
+    __FIT_DECLSPEC void join();
 
     container_type::size_type size();
 

Modified: trunk/complement/explore/lib/mt/ChangeLog
===================================================================
--- trunk/complement/explore/lib/mt/ChangeLog	2006-12-13 09:43:33 UTC (rev 1445)
+++ trunk/complement/explore/lib/mt/ChangeLog	2006-12-13 18:25:00 UTC (rev 1446)
@@ -1,3 +1,7 @@
+2006-12-13  Petr Ovtchenkov  <pt...@is...>
+
+	* thr_mgr.h, thr_mgr.cc: add join method.
+
 2006-11-29  Petr Ovtchenkov  <pt...@is...>
 
 	* xmt.h, xmt.cc: added xmt::getpid() and xmt:getppid(); ::getpid()

Modified: trunk/complement/explore/lib/mt/thr_mgr.cc
===================================================================
--- trunk/complement/explore/lib/mt/thr_mgr.cc	2006-12-13 09:43:33 UTC (rev 1445)
+++ trunk/complement/explore/lib/mt/thr_mgr.cc	2006-12-13 18:25:00 UTC (rev 1446)
@@ -1,4 +1,4 @@
-// -*- C++ -*- Time-stamp: <06/10/10 19:33:54 ptr>
+// -*- C++ -*- Time-stamp: <06/12/13 17:54:09 ptr>
 
 /*
  * Copyright (c) 1997-1999, 2002, 2005, 2006
@@ -28,7 +28,12 @@
 
 __FIT_DECLSPEC ThreadMgr::~ThreadMgr()
 {
-  MT_REENTRANT( _lock, _x1 );
+  ThreadMgr::join();
+}
+
+__FIT_DECLSPEC void ThreadMgr::join()
+{
+  Locker lk( _lock );
   container_type::iterator i = _M_c.begin();
 
   while ( i != _M_c.end() ) {
@@ -41,6 +46,7 @@
   }
 }
 
+
 __FIT_DECLSPEC
 void ThreadMgr::launch( Thread::entrance_type entrance, const void *p, size_t psz, unsigned flags, size_t stack_sz )
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.