[complement-svn] SF.net SVN: complement: [1588] branches/complement-xmt/explore

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

Revision: 1588
          http://svn.sourceforge.net/complement/?rev=1588&view=rev
Author:   complement
Date:     2007-06-29 03:44:29 -0700 (Fri, 29 Jun 2007)

Log Message:
-----------
Mutex was replaced by mutex

Modified Paths:
--------------
    branches/complement-xmt/explore/include/mt/shm.h
    branches/complement-xmt/explore/include/mt/thr_mgr.h
    branches/complement-xmt/explore/include/mt/xmt.h
    branches/complement-xmt/explore/include/sockios/sockmgr.h
    branches/complement-xmt/explore/include/sockios/sockstream
    branches/complement-xmt/explore/include/stem/Cron.h
    branches/complement-xmt/explore/include/stem/EvManager.h
    branches/complement-xmt/explore/include/stem/EventHandler.h
    branches/complement-xmt/explore/lib/mt/ChangeLog
    branches/complement-xmt/explore/lib/mt/time.cc
    branches/complement-xmt/explore/lib/mt/uid.cc
    branches/complement-xmt/explore/lib/mt/xmt.cc
    branches/complement-xmt/explore/lib/sockios/ChangeLog
    branches/complement-xmt/explore/lib/sockios/_sockmgr.cc
    branches/complement-xmt/explore/lib/sockios/_sockstream.cc
    branches/complement-xmt/explore/lib/stem/ChangeLog
    branches/complement-xmt/explore/lib/stem/EvManager.cc
    branches/complement-xmt/explore/lib/stem/_EventHandler.cc
    branches/complement-xmt/explore/test/mt/flck.cc
    branches/complement-xmt/explore/test/mt/lfs.cc
    branches/complement-xmt/explore/test/mt/mt_test.cc
    branches/complement-xmt/explore/test/sockios/bytes_in_socket.cc
    branches/complement-xmt/explore/test/sockios/bytes_in_socket2.cc
    branches/complement-xmt/explore/test/sockios/close_socket.cc
    branches/complement-xmt/explore/test/sockios/message.cc
    branches/complement-xmt/explore/test/sockios/message.h
    branches/complement-xmt/explore/test/sockios/sockios_test.cc

Modified: branches/complement-xmt/explore/include/mt/shm.h
===================================================================
--- branches/complement-xmt/explore/include/mt/shm.h	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/include/mt/shm.h	2007-06-29 10:44:29 UTC (rev 1588)
@@ -88,13 +88,13 @@
 };
 
 template <>
-struct ipc_sharable<xmt::__Mutex<false,true> >
+struct ipc_sharable<xmt::__mutex<false,true> >
 {
   typedef std::__true_type is_ipc_sharable;
 };
 
 template <>
-struct ipc_sharable<xmt::__Mutex<true,true> >
+struct ipc_sharable<xmt::__mutex<true,true> >
 {
   typedef std::__true_type is_ipc_sharable;
 };
@@ -303,7 +303,7 @@
     template <class T>
     void named( const T& obj, int name )
     {
-      xmt::basic_lock<__Mutex<false,true> > lk( _lock );
+      xmt::basic_lock<__mutex<false,true> > lk( _lock );
       if ( _last == 255 ) {
         throw std::range_error( "too many named objects" );
       }
@@ -328,7 +328,7 @@
     template <class T>
     T& named( int name )
     {
-      xmt::basic_lock<__Mutex<false,true> > lk( _lock );
+      xmt::basic_lock<__mutex<false,true> > lk( _lock );
       for ( int i = 0; _nm_table[i].name != -1; ++i ) {
         if ( _nm_table[i].name == name ) {
           ++_nm_table[i].count;
@@ -341,7 +341,7 @@
     template <class T>
     const T& named( int name ) const
     {
-      xmt::basic_lock<__Mutex<false,true> > lk( _lock );
+      xmt::basic_lock<__mutex<false,true> > lk( _lock );
       for ( int i = 0; _nm_table[i].name != -1; ++i ) {
         if ( _nm_table[i].name == name ) {
           ++_nm_table[i].count;
@@ -354,7 +354,7 @@
     template <class T>
     void release( int name )
     {
-      xmt::basic_lock<__Mutex<false,true> > lk( _lock );
+      xmt::basic_lock<__mutex<false,true> > lk( _lock );
       for ( int i = 0; _nm_table[i].name != -1; ++i ) {
         if ( _nm_table[i].name == name ) {
           if ( --_nm_table[i].count == 0 ) {
@@ -371,7 +371,7 @@
 
     int count( int name ) const throw()
     {
-      xmt::basic_lock<__Mutex<false,true> > lk( _lock );
+      xmt::basic_lock<__mutex<false,true> > lk( _lock );
       for ( int i = 0; _nm_table[i].name != -1; ++i ) {
         if ( _nm_table[i].name == name ) {
           return _nm_table[i].count;
@@ -391,7 +391,7 @@
     shm_name_mgr& operator =( const shm_name_mgr& )
       { return *this; }
 
-    xmt::__Mutex<false,true> _lock;
+    xmt::__mutex<false,true> _lock;
     struct _name_rec
     {
       int name;
@@ -420,7 +420,7 @@
     {
         uint64_t _magic;
         size_type _first;
-        xmt::__Mutex<false,true> _lock;
+        xmt::__mutex<false,true> _lock;
         size_type _nm;
     };
 
@@ -463,7 +463,7 @@
 
          if ( p != reinterpret_cast<pointer>(-1) && (force || _seg.count() <= 1) ) {
            _master *m = reinterpret_cast<_master *>( _seg.address() );
-           (&m->_lock)->~__Mutex<false,true>();
+           (&m->_lock)->~__mutex<false,true>();
            if ( m->_nm != 0 ) {
              reinterpret_cast<shm_name_mgr<_Inst> *>(reinterpret_cast<char *>(p) + m->_nm)->~shm_name_mgr<_Inst>();
            }
@@ -480,7 +480,7 @@
         if ( p != reinterpret_cast<pointer>(-1) ) {
           _master *m = reinterpret_cast<_master *>( p );
           if (  m->_nm == 0 ) {
-            xmt::basic_lock<xmt::__Mutex<false,true> > lk( m->_lock );
+            xmt::basic_lock<xmt::__mutex<false,true> > lk( m->_lock );
             void *nm = _traverse( &m->_first, sizeof(shm_name_mgr<_Inst>) );
             m->_nm = reinterpret_cast<char *>(nm) - reinterpret_cast<char *>(p);
             return *new ( nm ) shm_name_mgr<_Inst>();
@@ -496,7 +496,7 @@
       {
         _master *m = reinterpret_cast<_master *>( _seg.address() );
         if ( m != reinterpret_cast<_master *>(-1) ) {
-          xmt::basic_lock<xmt::__Mutex<false,true> > lk( m->_lock );
+          xmt::basic_lock<xmt::__mutex<false,true> > lk( m->_lock );
           return _traverse( &m->_first, n );
         }
 
@@ -512,8 +512,8 @@
     static void init( _master& m )
       {
         m._magic = MAGIC;
-        new ( &m._lock ) xmt::__Mutex<false,true>();
-        xmt::basic_lock<xmt::__Mutex<false,true> > lk( m._lock );
+        new ( &m._lock ) xmt::__mutex<false,true>();
+        xmt::basic_lock<xmt::__mutex<false,true> > lk( m._lock );
         m._first = sizeof( _master );
         m._nm = 0;
         _fheader& h = *new ( reinterpret_cast<char *>(&m) + sizeof(_master) ) _fheader();
@@ -535,7 +535,7 @@
   n = max( n + (__align - n % __align) % __align, sizeof(_fheader) );
   _master *m = reinterpret_cast<_master *>( _seg.address() );
   if ( m != reinterpret_cast<_master *>(-1) && (reinterpret_cast<char *>(p) - reinterpret_cast<char *>(_seg.address())) < (_seg.max_size() + sizeof(_master) + sizeof(_aheader) ) ) {
-    xmt::basic_lock<xmt::__Mutex<false,true> > lk( m->_lock );
+    xmt::basic_lock<xmt::__mutex<false,true> > lk( m->_lock );
     _aheader *a = reinterpret_cast<_aheader *>( reinterpret_cast<char *>(p) - sizeof(_aheader) );
     size_type off = reinterpret_cast<char *>(p) - reinterpret_cast<char *>(_seg.address());
     if ( m->_first == 0 ) {

Modified: branches/complement-xmt/explore/include/mt/thr_mgr.h
===================================================================
--- branches/complement-xmt/explore/include/mt/thr_mgr.h	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/include/mt/thr_mgr.h	2007-06-29 10:44:29 UTC (rev 1588)
@@ -46,7 +46,7 @@
 
   protected:
     _Sequence _M_c;
-    Mutex     _lock;
+    mutex     _lock;
 };
 
 } // namespace xmt

Modified: branches/complement-xmt/explore/include/mt/xmt.h
===================================================================
--- branches/complement-xmt/explore/include/mt/xmt.h	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/include/mt/xmt.h	2007-06-29 10:44:29 UTC (rev 1588)
@@ -314,23 +314,23 @@
 
 #endif // __FIT_PTHREAD_SPINLOCK
 
-// Portable Mutex implementation. If the parameter RECURSIVE_SAFE
-// is true, Mutex will be recursive safe (detect deadlock).
+// Portable mutex implementation. If the parameter RECURSIVE_SAFE
+// is true, mutex will be recursive safe (detect deadlock).
 // If RECURSIVE_SAFE is false, implementation may not to be
 // recursive-safe.
-// The SCOPE parameter designate Mutex scope---shared between
+// The SCOPE parameter designate mutex scope---shared between
 // processes (true), or only inside threads of one process (false).
 // Note, that not all OS support interprocess mutex scope
 // (for example, Windows and Linux).
 template <bool RECURSIVE_SAFE, bool SCOPE>
-class __Mutex :
+class __mutex :
     public __mutex_base<RECURSIVE_SAFE,SCOPE>
 {
   public:
-    __Mutex()
+    __mutex()
       { }
 
-    ~__Mutex()
+    ~__mutex()
       { }
 
     void lock()
@@ -378,7 +378,7 @@
       }
 
   private:
-    __Mutex( const __Mutex& )
+    __mutex( const __mutex& )
       { }
 
 #ifndef __FIT_WIN32THREADS
@@ -531,11 +531,11 @@
 // __mutex_base above).
 
 template <bool SCOPE>
-class __Mutex<true,SCOPE> : // Recursive Safe
+class __mutex<true,SCOPE> : // Recursive Safe
     public __mutex_base<true,SCOPE>
 {
   public:
-    __Mutex() :
+    __mutex() :
         _count( 0 ),
 # ifdef __FIT_UITHREADS
         _id( __STATIC_CAST(thread_t,-1) )
@@ -545,7 +545,7 @@
 # endif
       { }
 
-    ~__Mutex()
+    ~__mutex()
       { }
 
     void lock()
@@ -628,7 +628,7 @@
       }
 
   private:
-    __Mutex( const __Mutex& )
+    __mutex( const __mutex& )
       { }
 
   protected:
@@ -719,14 +719,14 @@
 };
 
 template <bool SCOPE>
-class __MutexRW :
+class __mutexRW :
     public __mutex_rw_base<SCOPE>
 {
   public:
-    __MutexRW()
+    __mutexRW()
       { }
 
-    ~__MutexRW()
+    ~__mutexRW()
       { }
 
     void rdlock()
@@ -816,7 +816,7 @@
       }
 
   private:
-    __MutexRW( const __MutexRW& )
+    __mutexRW( const __mutexRW& )
       { }
 };
 
@@ -902,23 +902,23 @@
 };
 #endif // __FIT_RWLOCK
 
-typedef __Mutex<false,false>  Mutex;
-typedef __Mutex<true,false>   MutexRS;
-typedef __Mutex<true,false>   MutexSDS; // obsolete, use instead MutexRS
+typedef __mutex<false,false>  mutex;
+typedef __mutex<true,false>   mutexRS;
+typedef __mutex<true,false>   mutexSDS; // obsolete, use instead mutexRS
 #ifdef __FIT_RWLOCK
-typedef __MutexRW<false>      MutexRW;
+typedef __mutexRW<false>      mutexRW;
 #endif // __FIT_RWLOCK
 #ifdef __FIT_PTHREAD_SPINLOCK
 typedef __Spinlock<false,false> Spinlock;
 typedef __Spinlock<true,false>  SpinlockRS;
 #endif // __FIT_RWLOCK
 
-typedef basic_lock<Mutex>       scoped_lock;
-typedef basic_lock<MutexRS>     LockerRS;
-typedef basic_lock<MutexRS>     LockerSDS; // obsolete, use instead LockerRS
+typedef basic_lock<mutex>       scoped_lock;
+typedef basic_lock<mutexRS>     LockerRS;
+typedef basic_lock<mutexRS>     LockerSDS; // obsolete, use instead LockerRS
 #ifdef __FIT_RWLOCK
-typedef basic_read_lock<__MutexRW<false> >     LockerRd;
-typedef basic_lock<__MutexRW<false> >     LockerWr;
+typedef basic_read_lock<__mutexRW<false> >     LockerRd;
+typedef basic_lock<__mutexRW<false> >     LockerWr;
 #endif // __FIT_RWLOCK
 #ifdef __FIT_PTHREAD_SPINLOCK
 typedef basic_lock<Spinlock>    LockerSpin;
@@ -1019,7 +1019,7 @@
 
     bool set( bool __v, bool _broadcast = false )
       {
-        basic_lock<__Mutex<false,SCOPE> > _x1( _lock );
+        basic_lock<__mutex<false,SCOPE> > _x1( _lock );
 
         bool tmp = _val;
         _val = __v;
@@ -1060,7 +1060,7 @@
         _lock.lock();
 #endif
 #if defined(__FIT_UITHREADS) || defined(_PTHREADS)
-        basic_lock<__Mutex<false,SCOPE> > _x1( _lock );
+        basic_lock<__mutex<false,SCOPE> > _x1( _lock );
 #endif
         if ( _val == false ) {
 #ifdef __FIT_WIN32THREADS
@@ -1103,7 +1103,7 @@
         return 0;
 #endif
 #if defined(_PTHREADS) || defined(__FIT_UITHREADS)
-        basic_lock<__Mutex<false,SCOPE> > lk( _lock );
+        basic_lock<__mutex<false,SCOPE> > lk( _lock );
         _val = false;
         int ret;
         while ( !_val ) {
@@ -1141,7 +1141,7 @@
 
     int signal( bool _broadcast = false )
       {
-        basic_lock<__Mutex<false,SCOPE> > _x1( _lock );
+        basic_lock<__mutex<false,SCOPE> > _x1( _lock );
 
         _val = true;
 #ifdef __FIT_WIN32THREADS
@@ -1168,7 +1168,7 @@
 #ifdef __FIT_UITHREADS
     cond_t _cond;
 #endif
-    __Mutex<false,SCOPE> _lock;
+    __mutex<false,SCOPE> _lock;
     bool _val;
 
   private:
@@ -1527,7 +1527,7 @@
     static alloc_type alloc;
     static int _idx; // user words index
     static int _self_idx; // user words index, that word point to self
-    static Mutex _idx_lock;
+    static mutex _idx_lock;
     static thread_key_type& _mt_key;
     size_t uw_alloc_size;
 
@@ -1548,7 +1548,7 @@
     size_t _param_sz;
     unsigned _flags;
     size_t _stack_sz; // stack size, if not 0
-    // Mutex _llock;
+    // mutex _llock;
     friend class Init;
     // extern "C", wrap for thread_create
 #ifdef __unix

Modified: branches/complement-xmt/explore/include/sockios/sockmgr.h
===================================================================
--- branches/complement-xmt/explore/include/sockios/sockmgr.h	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/include/sockios/sockmgr.h	2007-06-29 10:44:29 UTC (rev 1588)
@@ -113,7 +113,7 @@
     friend class Init;
 
   protected:
-    xmt::Mutex _fd_lck;
+    xmt::mutex _fd_lck;
     xmt::Condition _loop_cnd;
 };
 
@@ -288,16 +288,16 @@
     _Sequence _M_c;
     _Compare  _M_comp;
     pfd_equal _pfdcomp;
-    xmt::Mutex _c_lock;
+    xmt::mutex _c_lock;
 
     _fd_sequence _pfd;
     int _cfd; // sock_base::socket_type
     _connect_pool_sequence _conn_pool;
     xmt::Condition _pool_cnd;
-    xmt::Mutex _dlock;
+    xmt::mutex _dlock;
     timespec _tpop;
 
-    xmt::Mutex _flock;
+    xmt::mutex _flock;
     bool _follow;
 
     xmt::Condition _observer_cnd;
@@ -419,7 +419,7 @@
     _Sequence _M_c;
     _Compare  _M_comp;
     in_buf_avail _M_av;
-    xmt::Mutex _c_lock;
+    xmt::mutex _c_lock;
 
     fd_set _pfdr;
     fd_set _pfde;

Modified: branches/complement-xmt/explore/include/sockios/sockstream
===================================================================
--- branches/complement-xmt/explore/include/sockios/sockstream	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/include/sockios/sockstream	2007-06-29 10:44:29 UTC (rev 1588)
@@ -546,8 +546,8 @@
     virtual streamsize xsputn(const char_type *s, streamsize n);
 
   public:
-    xmt::Mutex _M_lock_w; // lock for writing
-    // _STL_mutex_base _M_lock; used for read lock
+    xmt::mutex _M_lock_w; // lock for writing
+
   private: // Helper functions
     charT* _bbuf;
     charT* _ebuf;

Modified: branches/complement-xmt/explore/include/stem/Cron.h
===================================================================
--- branches/complement-xmt/explore/include/stem/Cron.h	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/include/stem/Cron.h	2007-06-29 10:44:29 UTC (rev 1588)
@@ -165,7 +165,7 @@
       std::greater<value_type> > container_type;
 
     container_type _M_c;
-    xmt::Mutex _M_l;
+    xmt::mutex _M_l;
 
   private:
     DECLARE_RESPONSE_TABLE( Cron, EventHandler );

Modified: branches/complement-xmt/explore/include/stem/EvManager.h
===================================================================
--- branches/complement-xmt/explore/include/stem/EvManager.h	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/include/stem/EvManager.h	2007-06-29 10:44:29 UTC (rev 1588)
@@ -248,15 +248,15 @@
     xmt::Thread _ev_queue_thr;
     xmt::Spinlock _ev_queue_dispatch_guard;
 
-    xmt::Mutex _lock_heap;
-    xmt::Mutex _lock_iheap;
-    xmt::Mutex _lock_xheap;
+    xmt::mutex _lock_heap;
+    xmt::mutex _lock_iheap;
+    xmt::mutex _lock_xheap;
 
-    xmt::Mutex _lock_queue;
+    xmt::mutex _lock_queue;
     xmt::Condition _cnd_queue;
 
     static std::string inv_key_str;
-    xmt::Mutex _lock_tr;
+    xmt::mutex _lock_tr;
     unsigned _trflags;
     std::ostream *_trs;
 

Modified: branches/complement-xmt/explore/include/stem/EventHandler.h
===================================================================
--- branches/complement-xmt/explore/include/stem/EventHandler.h	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/include/stem/EventHandler.h	2007-06-29 10:44:29 UTC (rev 1588)
@@ -542,7 +542,7 @@
     // See comment near EventHandler::EventHandler() implementation
     // HistoryContainer& theHistory;
     HistoryContainer theHistory;
-    xmt::MutexRS _theHistory_lock;
+    xmt::mutexRS _theHistory_lock;
 
   public:
 

Modified: branches/complement-xmt/explore/lib/mt/ChangeLog
===================================================================
--- branches/complement-xmt/explore/lib/mt/ChangeLog	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/lib/mt/ChangeLog	2007-06-29 10:44:29 UTC (rev 1588)
@@ -2,6 +2,8 @@
 
 	* xmt.h, xmt.cc, uid.cc, thr_mgr.cc: replace Locker by scoped_lock.
 
+	* shm.h, xmt.h, xmt.cc, thr_mgr.h, uid.cc, time.cc: all Mutex replaced by mutex
+
 2007-06-14  Petr Ovtchenkov  <pt...@is...>
 
 	* xmt.h, xmt.cc, shm.h: step to interface like boost or

Modified: branches/complement-xmt/explore/lib/mt/time.cc
===================================================================
--- branches/complement-xmt/explore/lib/mt/time.cc	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/lib/mt/time.cc	2007-06-29 10:44:29 UTC (rev 1588)
@@ -14,7 +14,7 @@
 #include <sys/time.h>
 
 #ifdef _WIN32
-xmt::Mutex _l;
+xmt::mutex _l;
 #endif
 
 std::string calendar_time( time_t t )

Modified: branches/complement-xmt/explore/lib/mt/uid.cc
===================================================================
--- branches/complement-xmt/explore/lib/mt/uid.cc	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/lib/mt/uid.cc	2007-06-29 10:44:29 UTC (rev 1588)
@@ -36,7 +36,7 @@
 
 __uid_init::__uid_init()
 {
-  static Mutex _lk;
+  static mutex _lk;
 
   scoped_lock lock( _lk );
   ifstream f( "/proc/sys/kernel/random/boot_id" );

Modified: branches/complement-xmt/explore/lib/mt/xmt.cc
===================================================================
--- branches/complement-xmt/explore/lib/mt/xmt.cc	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/lib/mt/xmt.cc	2007-06-29 10:44:29 UTC (rev 1588)
@@ -88,7 +88,7 @@
 # endif
 
 #ifdef _PTHREADS
-xmt::Mutex _F_lock;
+xmt::mutex _F_lock;
 #  define _F_locklock  xmt::detail::_F_lock.lock();
 #  define _F_lockunlock xmt::detail::_F_lock.unlock();
 #endif
@@ -220,7 +220,7 @@
 Thread::alloc_type Thread::alloc;
 int Thread::_idx = 0;
 int Thread::_self_idx = 0;
-Mutex Thread::_idx_lock;
+mutex Thread::_idx_lock;
 
 #ifdef __FIT_WIN32THREADS
 const Thread::thread_id_type Thread::bad_thread_id = INVALID_HANDLE_VALUE;

Modified: branches/complement-xmt/explore/lib/sockios/ChangeLog
===================================================================
--- branches/complement-xmt/explore/lib/sockios/ChangeLog	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/lib/sockios/ChangeLog	2007-06-29 10:44:29 UTC (rev 1588)
@@ -2,6 +2,9 @@
 
 	* sockmgr.cc, sockios_test.cc: replace Locker by scoped_lock.
 
+	* sockmgr.h, sockstream, _sockmgr.cc, _sockstream.cc: all
+	Mutex replaced by mutex
+
 2007-02-12  Petr Ovtchenkov  <pt...@is...>
 
 	* sockmgr.h, _sockmgr.cc: use Init technique to initialize

Modified: branches/complement-xmt/explore/lib/sockios/_sockmgr.cc
===================================================================
--- branches/complement-xmt/explore/lib/sockios/_sockmgr.cc	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/lib/sockios/_sockmgr.cc	2007-06-29 10:44:29 UTC (rev 1588)
@@ -51,7 +51,7 @@
 
 void basic_sockmgr::Init::_guard( int direction )
 {
-  static xmt::Mutex _init_lock;
+  static xmt::mutex _init_lock;
   static int _count = 0;
 
   if ( direction ) {

Modified: branches/complement-xmt/explore/lib/sockios/_sockstream.cc
===================================================================
--- branches/complement-xmt/explore/lib/sockios/_sockstream.cc	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/lib/sockios/_sockstream.cc	2007-06-29 10:44:29 UTC (rev 1588)
@@ -66,7 +66,7 @@
 static int __glob_init_cnt = 0;
 static int __glob_init_wsock2 = 0;
 
-static xmt::Mutex _SI_lock;
+static xmt::mutex _SI_lock;
 
 enum {
   WINDOWS_NT_4,

Modified: branches/complement-xmt/explore/lib/stem/ChangeLog
===================================================================
--- branches/complement-xmt/explore/lib/stem/ChangeLog	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/lib/stem/ChangeLog	2007-06-29 10:44:29 UTC (rev 1588)
@@ -2,6 +2,9 @@
 
 	* NetTransport.cc, EvManager.cc: replace Locker by scoped_lock.
 
+	* EvManager.cc, _EventHandler.cc, EventHandler.h, EvManager.h, Cron.h:
+	all Mutex replaced by mutex
+
 2007-03-12  Petr Ovtchenkov  <pt...@is...>
 
 	* EvManager.h, EvManager.cc: trace-related locks, flags and

Modified: branches/complement-xmt/explore/lib/stem/EvManager.cc
===================================================================
--- branches/complement-xmt/explore/lib/stem/EvManager.cc	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/lib/stem/EvManager.cc	2007-06-29 10:44:29 UTC (rev 1588)
@@ -81,7 +81,7 @@
   EvManager& me = *reinterpret_cast<EvManager *>(p);
   xmt::Thread::ret_code rt;
   rt.iword = 0;
-  xmt::Mutex& lq = me._lock_queue;
+  xmt::mutex& lq = me._lock_queue;
   queue_type& in_ev_queue = me.in_ev_queue;
   queue_type& out_ev_queue = me.out_ev_queue;
 

Modified: branches/complement-xmt/explore/lib/stem/_EventHandler.cc
===================================================================
--- branches/complement-xmt/explore/lib/stem/_EventHandler.cc	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/lib/stem/_EventHandler.cc	2007-06-29 10:44:29 UTC (rev 1588)
@@ -50,7 +50,7 @@
 
 void EventHandler::Init::_guard( int direction )
 {
-  static xmt::MutexRS _init_lock;
+  static xmt::mutexRS _init_lock;
   static int _count = 0;
 
   if ( direction ) {

Modified: branches/complement-xmt/explore/test/mt/flck.cc
===================================================================
--- branches/complement-xmt/explore/test/mt/flck.cc	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/test/mt/flck.cc	2007-06-29 10:44:29 UTC (rev 1588)
@@ -27,8 +27,8 @@
 using namespace std;
 
 static const char *fname = "myfile";
-static Mutex m;
-static Mutex b;
+static mutex m;
+static mutex b;
 static int cnt = 0;
 
 static Thread::ret_code thread_func( void * )

Modified: branches/complement-xmt/explore/test/mt/lfs.cc
===================================================================
--- branches/complement-xmt/explore/test/mt/lfs.cc	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/test/mt/lfs.cc	2007-06-29 10:44:29 UTC (rev 1588)
@@ -27,8 +27,8 @@
 using namespace std;
 
 static const char *fname = "myfile";
-static Mutex m;
-static Mutex b;
+static mutex m;
+static mutex b;
 static int cnt = 0;
 static Condition cnd;
 

Modified: branches/complement-xmt/explore/test/mt/mt_test.cc
===================================================================
--- branches/complement-xmt/explore/test/mt/mt_test.cc	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/test/mt/mt_test.cc	2007-06-29 10:44:29 UTC (rev 1588)
@@ -131,7 +131,7 @@
  * Correct order checked by values of x.
  */
 
-static xmt::Mutex m1;
+static xmt::mutex m1;
 
 xmt::Thread::ret_code thr1( void *p )
 {
@@ -287,7 +287,7 @@
  * 
  */
 
-xmt::__Mutex<true,false> m2;
+xmt::__mutex<true,false> m2;
 
 void recursive()
 {
@@ -895,7 +895,7 @@
 
 static int my_thr_cnt = 0;
 static int my_thr_scnt = 0;
-static xmt::Mutex lock;
+static xmt::mutex lock;
 
 xmt::Thread::ret_code thread_mgr_entry_call( void * )
 {

Modified: branches/complement-xmt/explore/test/sockios/bytes_in_socket.cc
===================================================================
--- branches/complement-xmt/explore/test/sockios/bytes_in_socket.cc	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/test/sockios/bytes_in_socket.cc	2007-06-29 10:44:29 UTC (rev 1588)
@@ -41,7 +41,7 @@
  */
 
 extern int port;
-extern xmt::Mutex pr_lock;
+extern xmt::mutex pr_lock;
 
 static Condition cnd;
 

Modified: branches/complement-xmt/explore/test/sockios/bytes_in_socket2.cc
===================================================================
--- branches/complement-xmt/explore/test/sockios/bytes_in_socket2.cc	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/test/sockios/bytes_in_socket2.cc	2007-06-29 10:44:29 UTC (rev 1588)
@@ -32,7 +32,7 @@
  */
 
 extern int port;
-extern xmt::Mutex pr_lock;
+extern xmt::mutex pr_lock;
 
 static Condition cnd;
 

Modified: branches/complement-xmt/explore/test/sockios/close_socket.cc
===================================================================
--- branches/complement-xmt/explore/test/sockios/close_socket.cc	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/test/sockios/close_socket.cc	2007-06-29 10:44:29 UTC (rev 1588)
@@ -41,7 +41,7 @@
  */
 
 extern int port;
-extern xmt::Mutex pr_lock;
+extern xmt::mutex pr_lock;
 
 class ConnectionProcessor3 // dummy variant
 {

Modified: branches/complement-xmt/explore/test/sockios/message.cc
===================================================================
--- branches/complement-xmt/explore/test/sockios/message.cc	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/test/sockios/message.cc	2007-06-29 10:44:29 UTC (rev 1588)
@@ -33,7 +33,7 @@
 
 int port = 2048;
 
-xmt::Mutex pr_lock;
+xmt::mutex pr_lock;
 
 namespace test_area {
 

Modified: branches/complement-xmt/explore/test/sockios/message.h
===================================================================
--- branches/complement-xmt/explore/test/sockios/message.h	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/test/sockios/message.h	2007-06-29 10:44:29 UTC (rev 1588)
@@ -37,7 +37,7 @@
 
 extern int port;
 
-extern xmt::Mutex pr_lock;
+extern xmt::mutex pr_lock;
 
 #define OUT_MSG(msg) pr_lock.lock(); cerr << msg << endl; pr_lock.unlock()
 

Modified: branches/complement-xmt/explore/test/sockios/sockios_test.cc
===================================================================
--- branches/complement-xmt/explore/test/sockios/sockios_test.cc	2007-06-29 09:52:17 UTC (rev 1587)
+++ branches/complement-xmt/explore/test/sockios/sockios_test.cc	2007-06-29 10:44:29 UTC (rev 1588)
@@ -73,12 +73,12 @@
     static int get_visits()
       { xmt::scoped_lock lk(lock); return visits; }
 
-    static xmt::Mutex lock;
+    static xmt::mutex lock;
     static int cnt;
     static int visits;
 };
 
-xmt::Mutex Cnt::lock;
+xmt::mutex Cnt::lock;
 int Cnt::cnt = 0;
 int Cnt::visits = 0;
 


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