Changeset 625 for trunk

Timestamp:

11/08/08 23:09:02 (11 years ago)

Author:

Eoin

Message:

Cache setting GUI in progress

Location:

trunk

Files:

• res/Halite.rc (modified) (1 diff)
• src/ConfigOptions.hpp (modified) (3 diffs)
• src/halConfig.hpp (modified) (2 diffs)
• src/halSession.hpp (modified) (1 diff)
• src/halTorrent.hpp (modified) (2 diffs)

trunk/res/Halite.rc

@@ -157 +157 @@
 
     GROUPBOX        "Current Cache Status",HAL_BC_CACHE_GROUP,5,6,315,54
+        RTEXT           "Max Size (MB) :",HAL_BC_CACHE_MS_L,12,91,80,12,SS_WORDELLIPSIS|SS_CENTERIMAGE//|SS_BLACKFRAME  
+    EDITTEXT        HAL_BC_CACHE_MS_E,135,29,65,12,ES_AUTOHSCROLL
+    RTEXT           "Piece Expiry :",HAL_BC_CACHE_PE_L,12,91,80,12,SS_WORDELLIPSIS|SS_CENTERIMAGE//|SS_BLACKFRAME       
+    EDITTEXT        HAL_BC_CACHE_PE_E,135,29,65,12,ES_AUTOHSCROLL
+
     RTEXT           "Cache Read Size :",HAL_BC_CACHE_RS_L,12,91,80,12,SS_WORDELLIPSIS|SS_CENTERIMAGE//|SS_BLACKFRAME
     LTEXT           "N/A",HAL_BC_CACHE_RS_T,141,28,90,8,SS_WORDELLIPSIS | SS_CENTERIMAGE//|SS_BLACKFRAME

trunk/src/ConfigOptions.hpp

@@ -84 +84 @@
 #define HAL_BC_CACHE_TOTAL_L            ID_CONFIG_BEGIN + 74
 #define HAL_BC_CACHE_TOTAL_T            ID_CONFIG_BEGIN + 75
+#define HAL_BC_CACHE_MS_L                       ID_CONFIG_BEGIN + 76
+#define HAL_BC_CACHE_MS_E                       ID_CONFIG_BEGIN + 77
+#define HAL_BC_CACHE_PE_L                       ID_CONFIG_BEGIN + 78
+#define HAL_BC_CACHE_PE_E                       ID_CONFIG_BEGIN + 79
 
 
@@ -214 +218 @@
         DDX_INT(HAL_BC_CACHE_WS_T, cache_.write_cache_size)
         DDX_INT(HAL_BC_CACHE_TOTAL_T, cache_.cache_size)
+
+        DDX_INT(HAL_BC_CACHE_MS_E, hal::config().cache_settings_.cache_size)
+        DDX_INT(HAL_BC_CACHE_PE_E, hal::config().cache_settings_.cache_expiry)          
     END_DDX_MAP()
 
@@ -229 +236 @@
                 WMB_HEAD(WMB_COL(_gap), WMB_COLNOMAX(_exp), WMB_COLNOMAX(_exp|80), WMB_COLNOMAX(_exp|60), WMB_COLNOMAX(_exp|80), WMB_COLNOMAX(_exp|60), WMB_COLNOMAX(_exp|80), WMB_COL(_gap)), \
                 WMB_ROW(_gap|3, HAL_BC_CACHE_GROUP, _r, _r, _r, _r, _r, _r, _r), \
+                WMB_ROW(_auto,  _d, HAL_BC_CACHE_MS_L, HAL_BC_CACHE_MS_E, HAL_BC_CACHE_PE_L, HAL_BC_CACHE_PE_E), \
                 WMB_ROW(_auto,  _d, HAL_BC_CACHE_RS_L, HAL_BC_CACHE_RS_T, HAL_BC_CACHE_WS_L, HAL_BC_CACHE_WS_T, HAL_BC_CACHE_TOTAL_L, HAL_BC_CACHE_TOTAL_T), \
                 WMB_ROW(_gap,   _d), \

trunk/src/halConfig.hpp

@@ -78 +78 @@
                         & make_nvp("half_connections_limit", half_connections_limit_)
                         & make_nvp("mapping_upnp", mapping_upnp_)
-                        & make_nvp("mapping_nat_pmp", mapping_nat_pmp_);
+                        & make_nvp("mapping_nat_pmp", mapping_nat_pmp_)
+                        & make_nvp("cache_settings", cache_settings_);
+
                 break;
 
@@ -172 +174 @@
         bool mapping_nat_pmp_;
 
+        hal::cache_settings cache_settings_;
+
         hal::queue_settings queue_settings_;
         hal::timeouts timeouts_;

trunk/src/halSession.hpp

@@ -435 +435 @@
                 event_log.post(shared_ptr<EventDetail>(new EventMsg(
                         hal::wform(L"Set Timeouts, peer %1%, tracker %2%.") % peers % tracker)));
+        }
+
+        cache_settings get_cache_settings()
+        {
+                libt::session_settings settings = session_.settings();
+                cache_settings cache;
+
+                cache.cache_size = settings.cache_size;
+                cache.cache_expiry = settings.cache_expiry;
+
+                return cache;
+        }
+
+        void set_cache_settings(const cache_settings& cache)
+        {
+                libt::session_settings settings = session_.settings();
+
+                settings.cache_size = cache.cache_size;
+                settings.cache_expiry = cache.cache_expiry;
+
+                session_.set_settings(settings);
+
+                event_log.post(shared_ptr<EventDetail>(new EventMsg(
+                        hal::wform(L"Set cache parameters, %1% size and %2% expiry.") 
+                                % settings.cache_size % settings.cache_expiry)));
         }
 

trunk/src/halTorrent.hpp

@@ -173 +173 @@
         int service_port;
         int max_fail_count;
+};
+
+struct cache_settings
+{
+        cache_settings() :
+                cache_size(512),
+                cache_expiry(60)
+        {}
+
+        friend class boost::serialization::access;
+        template<class Archive>
+        void serialize(Archive& ar, const unsigned int version)
+        {       
+                ar & BOOST_SERIALIZATION_NVP(cache_size);
+                ar & BOOST_SERIALIZATION_NVP(cache_expiry);
+        }
+
+        int cache_size;
+        int cache_expiry;
 };
 
@@ -868 +887 @@
 
         const cache_details get_cache_details() const;
+
+        void set_cache_settings(const cache_settings& cache);
+        cache_settings get_cache_settings() const;
         
         const SessionDetail getSessionDetails();