[MICO/mt-commit] CVS: mico/include/mico mt_manager.h,1.28,1.29 rt_mico_impl.h,1.4,1.5

[Karel G. <kg...@us...>]

Update of /cvsroot/micomt/mico/include/mico
In directory usw-pr-cvs1:/tmp/cvs-serv12215/include/mico

Modified Files:
	mt_manager.h rt_mico_impl.h 
Log Message:
- removed _tpm static value from global MICO:: namespace into MTManager class

Index: mt_manager.h
===================================================================
RCS file: /cvsroot/micomt/mico/include/mico/mt_manager.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** mt_manager.h	2001/11/24 19:45:26	1.28
--- mt_manager.h	2001/12/12 20:29:13	1.29
***************
*** 438,454 ****
      };
  
-     /*!
-      * \ingroup micomt
-      * The global thread pool manager.
-      *
-      * \todo
-      * There shouldn't be any globals in OO. instead, write a function
-      * MICO::get_thread_pool_mgr() that returns the global object.
-      */
-     extern ThreadPoolManager     *_tpm;
  
      class MTManager
      {
  	static CORBA::Long _S_concurrency_model;
      public:
  	enum ConcurrencyModel
--- 438,446 ----
      };
  
  
      class MTManager
      {
  	static CORBA::Long _S_concurrency_model;
+ 	static MICO::ThreadPoolManager* _S_thread_pool_manager;
      public:
  	enum ConcurrencyModel
***************
*** 476,479 ****
--- 468,475 ----
  	static void
  	thread_setup(unsigned int __conn_limit, unsigned int __req_limit);
+ 
+ 	static MICO::ThreadPoolManager*
+ 	thread_pool_manager()
+ 	{ return _S_thread_pool_manager; }
      };
  }

Index: rt_mico_impl.h
===================================================================
RCS file: /cvsroot/micomt/mico/include/mico/rt_mico_impl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** rt_mico_impl.h	2001/10/26 19:59:59	1.4
--- rt_mico_impl.h	2001/12/12 20:29:13	1.5
***************
*** 92,96 ****
  	    ThreadPool *tp = new ThreadPool( static_threads + dynamic_threads, 0, static_threads );
  	    tp->start_threads();
! 	    return _tpm->register_new_tp( *tp );
  	};
      RT_CORBA::ThreadpoolId create_threadpool_with_lanes( CORBA::ULong stacksize,
--- 92,96 ----
  	    ThreadPool *tp = new ThreadPool( static_threads + dynamic_threads, 0, static_threads );
  	    tp->start_threads();
! 	    return MICO::MTManager::thread_pool_manager()->register_new_tp( *tp );
  	};
      RT_CORBA::ThreadpoolId create_threadpool_with_lanes( CORBA::ULong stacksize,