Changeset 10972

Timestamp:

Jul 7, 2010, 11:37:03 PM (12 years ago)

Author:

charles

Message:

(trunk libt) #3402 "cache-size parameter not retained in settings.json after a restart" -- fixed

Location:

trunk/libtransmission

Files:

• session.c (modified) (2 diffs)
• session.h (modified) (1 diff)

trunk/libtransmission/session.c

@@ -315 +315 @@
     tr_bencDictReserve( d, 60 );
     tr_bencDictAddBool( d, TR_PREFS_KEY_BLOCKLIST_ENABLED,        tr_blocklistIsEnabled( s ) );
-    tr_bencDictAddInt ( d, TR_PREFS_KEY_MAX_CACHE_SIZE_MB,        tr_cacheGetLimit( s->cache ) );
+    tr_bencDictAddInt ( d, TR_PREFS_KEY_MAX_CACHE_SIZE_MB,        tr_sessionGetCacheLimit_MB( s ) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_DHT_ENABLED,              s->isDHTEnabled );
     tr_bencDictAddBool( d, TR_PREFS_KEY_LPD_ENABLED,              s->isLPDEnabled );
@@ -1894 +1894 @@
 
 void
-tr_sessionSetCacheLimit_B( tr_session * session, uint64_t max_bytes )
-{
-    assert( tr_isSession( session ) );
-
-    tr_cacheSetLimit( session->cache, max_bytes );
-}
-void
-tr_sessionSetCacheLimit_MB( tr_session * session, int MB )
-{
-    tr_sessionSetCacheLimit_B( session, toMemBytes( MB ) );
-}
-
-uint64_t
-tr_sessionGetCacheLimit_B( const tr_session * session )
-{
-    assert( tr_isSession( session ) );
-
-    return tr_cacheGetLimit( session->cache );
-}
+tr_sessionSetCacheLimit_MB( tr_session * session, int max_bytes )
+{
+    assert( tr_isSession( session ) );
+
+    tr_cacheSetLimit( session->cache, toMemBytes( max_bytes ) );
+}
+
 int
 tr_sessionGetCacheLimit_MB( const tr_session * session )
 {
-    return toMemMB( tr_sessionGetCacheLimit_B( session ) );
-}
-
+    assert( tr_isSession( session ) );
+
+    return toMemMB( tr_cacheGetLimit( session->cache ) );
+}
 
 /***

trunk/libtransmission/session.h

@@ -274 +274 @@
 
 static inline uint64_t toMemBytes ( unsigned int MB ) { uint64_t B = tr_mem_K * tr_mem_K; B *= MB; return B; }
-static inline int      toMemMB    ( uint64_t B )      { return B / tr_mem_K; }
+static inline int      toMemMB    ( uint64_t B )      { return B / ( tr_mem_K * tr_mem_K ); }
 
 /**
 **/
-
-void     tr_sessionSetCacheLimit_B ( tr_session * session, uint64_t B );
-uint64_t tr_sessionGetCacheLimit_B ( const tr_session * session );
 
 int  tr_sessionGetSpeedLimit_Bps( const tr_session *, tr_direction );