(trunk libT) consistency tweak: rename tr_global{Lock,Unlock,IsLocked} as tr_session...

diff --git a/libtransmission/peer-io.c b/libtransmission/peer-io.c
index 82c219ccda2f2d4da8e1a675bbb44551814ff455..6f7f653b219b15b2f2196495e61ce3b1bc58f02d 100644 (file)
--- a/libtransmission/peer-io.c
+++ b/libtransmission/peer-io.c
@@ -130,7 +130,7 @@ canReadWrapper( tr_peerIo * io )
     /* try to consume the input buffer */
     if( io->canRead )
     {
-        tr_globalLock( session );
+        tr_sessionLock( session );
 
         while( !done && !err )
         {
@@ -168,7 +168,7 @@ canReadWrapper( tr_peerIo * io )
             assert( tr_isPeerIo( io ) );
         }
 
-        tr_globalUnlock( session );
+        tr_sessionUnlock( session );
     }
 
     /* keep the iobuf's excess capacity from growing too large */

diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c
index 1c2b5713ce2d76d7aef51c1f6bdf671df94380f2..371b0fdf6779f0425b9fe281202d938517b091f6 100644 (file)
--- a/libtransmission/peer-mgr.c
+++ b/libtransmission/peer-mgr.c
@@ -217,13 +217,13 @@ struct tr_peerMgr
 static inline void
 managerLock( const struct tr_peerMgr * manager )
 {
-    tr_globalLock( manager->session );
+    tr_sessionLock( manager->session );
 }
 
 static inline void
 managerUnlock( const struct tr_peerMgr * manager )
 {
-    tr_globalUnlock( manager->session );
+    tr_sessionUnlock( manager->session );
 }
 
 static inline void
@@ -241,7 +241,7 @@ torrentUnlock( Torrent * torrent )
 static inline int
 torrentIsLocked( const Torrent * t )
 {
-    return tr_globalIsLocked( t->manager->session );
+    return tr_sessionIsLocked( t->manager->session );
 }
 
 /**

diff --git a/libtransmission/session.c b/libtransmission/session.c
index 9fe5cc8ed24eed0e51d94ad72a22efdaac92b899..f8daf6aa66a13247840f5173286c7da7b0cfc336 100644 (file)
--- a/libtransmission/session.c
+++ b/libtransmission/session.c
@@ -916,7 +916,7 @@ tr_sessionIsIncompleteDirEnabled( const tr_session * session )
 ***/
 
 void
-tr_globalLock( tr_session * session )
+tr_sessionLock( tr_session * session )
 {
     assert( tr_isSession( session ) );
 
@@ -924,7 +924,7 @@ tr_globalLock( tr_session * session )
 }
 
 void
-tr_globalUnlock( tr_session * session )
+tr_sessionUnlock( tr_session * session )
 {
     assert( tr_isSession( session ) );
 
@@ -932,7 +932,7 @@ tr_globalUnlock( tr_session * session )
 }
 
 tr_bool
-tr_globalIsLocked( const tr_session * session )
+tr_sessionIsLocked( const tr_session * session )
 {
     return tr_isSession( session ) && tr_lockHave( session->lock );
 }
@@ -1724,9 +1724,9 @@ tr_sessionSetPortForwardingEnabled( tr_session  * session,
 {
     assert( tr_isSession( session ) );
 
-    tr_globalLock( session );
+    tr_sessionLock( session );
     tr_sharedTraversalEnable( session->shared, enabled );
-    tr_globalUnlock( session );
+    tr_sessionUnlock( session );
 }
 
 tr_bool

diff --git a/libtransmission/session.h b/libtransmission/session.h
index 3a7f6b401b848f583ee45f6dca81626f39f3d84b..a3fc9b9001d1b4983e60b3d71da528a4fc71693f 100644 (file)
--- a/libtransmission/session.h
+++ b/libtransmission/session.h
@@ -153,11 +153,11 @@ void         tr_sessionSetTorrentFile( tr_session * session,
 tr_bool      tr_sessionIsAddressBlocked( const tr_session        * session,
                                          const struct tr_address * addr );
 
-void         tr_globalLock( tr_session * );
+void         tr_sessionLock( tr_session * );
 
-void         tr_globalUnlock( tr_session * );
+void         tr_sessionUnlock( tr_session * );
 
-tr_bool      tr_globalIsLocked( const tr_session * );
+tr_bool      tr_sessionIsLocked( const tr_session * );
 
 const struct tr_address*  tr_sessionGetPublicAddress( const tr_session *, int tr_af_type );
 

diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c
index 281e419b8da5e09ac2ce0a494a0bafc78e9e4f6d..9afe19762f4fa44bd98335fc0b562f56e5a549fc 100644 (file)
--- a/libtransmission/torrent.c
+++ b/libtransmission/torrent.c
@@ -595,7 +595,7 @@ torrentInit( tr_torrent * tor, const tr_ctor * ctor )
 
     assert( session != NULL );
 
-    tr_globalLock( session );
+    tr_sessionLock( session );
 
     tor->session   = session;
     tor->uniqueId = nextUniqueId++;
@@ -687,7 +687,7 @@ torrentInit( tr_torrent * tor, const tr_ctor * ctor )
     if( doStart )
         torrentStart( tor );
 
-    tr_globalUnlock( session );
+    tr_sessionUnlock( session );
 }
 
 tr_parse_result
@@ -1255,7 +1255,7 @@ freeTorrent( tr_torrent * tor )
     assert( tr_isTorrent( tor ) );
     assert( !tor->isRunning );
 
-    tr_globalLock( session );
+    tr_sessionLock( session );
 
     tr_peerMgrRemoveTorrent( tor );
 
@@ -1287,7 +1287,7 @@ freeTorrent( tr_torrent * tor )
     tr_metainfoFree( inf );
     tr_free( tor );
 
-    tr_globalUnlock( session );
+    tr_sessionUnlock( session );
 }
 
 /**
@@ -1301,7 +1301,7 @@ checkAndStartImpl( void * vtor )
 
     assert( tr_isTorrent( tor ) );
 
-    tr_globalLock( tor->session );
+    tr_sessionLock( tor->session );
 
     /** If we had local data before, but it's disappeared,
         stop the torrent and log an error. */
@@ -1327,7 +1327,7 @@ checkAndStartImpl( void * vtor )
         tr_peerMgrStartTorrent( tor );
     }
 
-    tr_globalUnlock( tor->session );
+    tr_sessionUnlock( tor->session );
 }
 
 static void
@@ -1344,7 +1344,7 @@ torrentStart( tr_torrent * tor )
 {
     assert( tr_isTorrent( tor ) );
 
-    tr_globalLock( tor->session );
+    tr_sessionLock( tor->session );
 
     if( !tor->isRunning )
     {
@@ -1364,7 +1364,7 @@ torrentStart( tr_torrent * tor )
         tr_verifyAdd( tor, checkAndStartCB );
     }
 
-    tr_globalUnlock( tor->session );
+    tr_sessionUnlock( tor->session );
 }
 
 void
@@ -1409,7 +1409,7 @@ verifyTorrent( void * vtor )
     tr_torrent * tor = vtor;
 
     assert( tr_isTorrent( tor ) );
-    tr_globalLock( tor->session );
+    tr_sessionLock( tor->session );
 
     /* if the torrent's already being verified, stop it */
     tr_verifyRemove( tor );
@@ -1425,7 +1425,7 @@ verifyTorrent( void * vtor )
     tr_torrentUncheck( tor );
     tr_verifyAdd( tor, torrentRecheckDoneCB );
 
-    tr_globalUnlock( tor->session );
+    tr_sessionUnlock( tor->session );
 }
 
 void
@@ -1471,13 +1471,13 @@ tr_torrentStop( tr_torrent * tor )
 
     if( tr_isTorrent( tor ) )
     {
-        tr_globalLock( tor->session );
+        tr_sessionLock( tor->session );
 
         tor->isRunning = 0;
         tr_torrentSetDirty( tor );
         tr_runInEventThread( tor->session, stopTorrent, tor );
 
-        tr_globalUnlock( tor->session );
+        tr_sessionUnlock( tor->session );
     }
 }
 
@@ -1512,12 +1512,12 @@ tr_torrentFree( tr_torrent * tor )
     {
         tr_session * session = tor->session;
         assert( tr_isSession( session ) );
-        tr_globalLock( session );
+        tr_sessionLock( session );
 
         tr_torrentClearCompletenessCallback( tor );
         tr_runInEventThread( session, closeTorrent, tor );
 
-        tr_globalUnlock( session );
+        tr_sessionUnlock( session );
     }
 }
 

diff --git a/libtransmission/torrent.h b/libtransmission/torrent.h
index 3432b3cce48c55924de65931830b9f7bbe92674b..6c767ba640214c922fb330b88e7a0a2fc8c97dc3 100644 (file)
--- a/libtransmission/torrent.h
+++ b/libtransmission/torrent.h
@@ -18,7 +18,7 @@
 #define TR_TORRENT_H 1
 
 #include "completion.h" /* tr_completion */
-#include "session.h" /* tr_globalLock(), tr_globalUnlock() */
+#include "session.h" /* tr_sessionLock(), tr_sessionUnlock() */
 #include "utils.h" /* TR_GNUC_PRINTF */
 
 struct tr_bandwidth;
@@ -293,12 +293,12 @@ tr_torBlockCountBytes( const tr_torrent * tor, const tr_block_index_t block )
 
 static inline void tr_torrentLock( const tr_torrent * tor )
 {
-    tr_globalLock( tor->session );
+    tr_sessionLock( tor->session );
 }
 
 static inline void tr_torrentUnlock( const tr_torrent * tor )
 {
-    tr_globalUnlock( tor->session );
+    tr_sessionUnlock( tor->session );
 }
 
 static inline tr_bool

diff --git a/libtransmission/tr-dht.c b/libtransmission/tr-dht.c
index ab4c02a15481e7d899c52d46446b69a16e2d0ba2..4aaa4e868d5d83b9e3ac7cb1ef18a3540e6939d1 100644 (file)
--- a/libtransmission/tr-dht.c
+++ b/libtransmission/tr-dht.c
@@ -602,7 +602,7 @@ callback( void *ignore UNUSED, int event,
 {
     if( event == DHT_EVENT_VALUES || event == DHT_EVENT_VALUES6 ) {
         tr_torrent *tor;
-        tr_globalLock( session );
+        tr_sessionLock( session );
         tor = tr_torrentFindFromHash( session, info_hash );
         if( tor && tr_torrentAllowsDHT( tor ))
         {
@@ -619,7 +619,7 @@ callback( void *ignore UNUSED, int event,
                       (int)n,
                       event == DHT_EVENT_VALUES6 ? " IPv6" : "");
         }
-        tr_globalUnlock( session );
+        tr_sessionUnlock( session );
     } else if( event == DHT_EVENT_SEARCH_DONE ||
                event == DHT_EVENT_SEARCH_DONE6) {
         tr_torrent * tor = tr_torrentFindFromHash( session, info_hash );