- Timestamp:
- 11/08/08 23:09:02 (11 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/res/Halite.rc
r624 r625 157 157 158 158 GROUPBOX "Current Cache Status",HAL_BC_CACHE_GROUP,5,6,315,54 159 RTEXT "Max Size (MB) :",HAL_BC_CACHE_MS_L,12,91,80,12,SS_WORDELLIPSIS|SS_CENTERIMAGE//|SS_BLACKFRAME 160 EDITTEXT HAL_BC_CACHE_MS_E,135,29,65,12,ES_AUTOHSCROLL 161 RTEXT "Piece Expiry :",HAL_BC_CACHE_PE_L,12,91,80,12,SS_WORDELLIPSIS|SS_CENTERIMAGE//|SS_BLACKFRAME 162 EDITTEXT HAL_BC_CACHE_PE_E,135,29,65,12,ES_AUTOHSCROLL 163 159 164 RTEXT "Cache Read Size :",HAL_BC_CACHE_RS_L,12,91,80,12,SS_WORDELLIPSIS|SS_CENTERIMAGE//|SS_BLACKFRAME 160 165 LTEXT "N/A",HAL_BC_CACHE_RS_T,141,28,90,8,SS_WORDELLIPSIS | SS_CENTERIMAGE//|SS_BLACKFRAME -
trunk/src/ConfigOptions.hpp
r624 r625 84 84 #define HAL_BC_CACHE_TOTAL_L ID_CONFIG_BEGIN + 74 85 85 #define HAL_BC_CACHE_TOTAL_T ID_CONFIG_BEGIN + 75 86 #define HAL_BC_CACHE_MS_L ID_CONFIG_BEGIN + 76 87 #define HAL_BC_CACHE_MS_E ID_CONFIG_BEGIN + 77 88 #define HAL_BC_CACHE_PE_L ID_CONFIG_BEGIN + 78 89 #define HAL_BC_CACHE_PE_E ID_CONFIG_BEGIN + 79 86 90 87 91 … … 214 218 DDX_INT(HAL_BC_CACHE_WS_T, cache_.write_cache_size) 215 219 DDX_INT(HAL_BC_CACHE_TOTAL_T, cache_.cache_size) 220 221 DDX_INT(HAL_BC_CACHE_MS_E, hal::config().cache_settings_.cache_size) 222 DDX_INT(HAL_BC_CACHE_PE_E, hal::config().cache_settings_.cache_expiry) 216 223 END_DDX_MAP() 217 224 … … 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)), \ 230 237 WMB_ROW(_gap|3, HAL_BC_CACHE_GROUP, _r, _r, _r, _r, _r, _r, _r), \ 238 WMB_ROW(_auto, _d, HAL_BC_CACHE_MS_L, HAL_BC_CACHE_MS_E, HAL_BC_CACHE_PE_L, HAL_BC_CACHE_PE_E), \ 231 239 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), \ 232 240 WMB_ROW(_gap, _d), \ -
trunk/src/halConfig.hpp
r618 r625 78 78 & make_nvp("half_connections_limit", half_connections_limit_) 79 79 & make_nvp("mapping_upnp", mapping_upnp_) 80 & make_nvp("mapping_nat_pmp", mapping_nat_pmp_); 80 & make_nvp("mapping_nat_pmp", mapping_nat_pmp_) 81 & make_nvp("cache_settings", cache_settings_); 82 81 83 break; 82 84 … … 172 174 bool mapping_nat_pmp_; 173 175 176 hal::cache_settings cache_settings_; 177 174 178 hal::queue_settings queue_settings_; 175 179 hal::timeouts timeouts_; -
trunk/src/halSession.hpp
r624 r625 435 435 event_log.post(shared_ptr<EventDetail>(new EventMsg( 436 436 hal::wform(L"Set Timeouts, peer %1%, tracker %2%.") % peers % tracker))); 437 } 438 439 cache_settings get_cache_settings() 440 { 441 libt::session_settings settings = session_.settings(); 442 cache_settings cache; 443 444 cache.cache_size = settings.cache_size; 445 cache.cache_expiry = settings.cache_expiry; 446 447 return cache; 448 } 449 450 void set_cache_settings(const cache_settings& cache) 451 { 452 libt::session_settings settings = session_.settings(); 453 454 settings.cache_size = cache.cache_size; 455 settings.cache_expiry = cache.cache_expiry; 456 457 session_.set_settings(settings); 458 459 event_log.post(shared_ptr<EventDetail>(new EventMsg( 460 hal::wform(L"Set cache parameters, %1% size and %2% expiry.") 461 % settings.cache_size % settings.cache_expiry))); 437 462 } 438 463 -
trunk/src/halTorrent.hpp
r624 r625 173 173 int service_port; 174 174 int max_fail_count; 175 }; 176 177 struct cache_settings 178 { 179 cache_settings() : 180 cache_size(512), 181 cache_expiry(60) 182 {} 183 184 friend class boost::serialization::access; 185 template<class Archive> 186 void serialize(Archive& ar, const unsigned int version) 187 { 188 ar & BOOST_SERIALIZATION_NVP(cache_size); 189 ar & BOOST_SERIALIZATION_NVP(cache_expiry); 190 } 191 192 int cache_size; 193 int cache_expiry; 175 194 }; 176 195 … … 868 887 869 888 const cache_details get_cache_details() const; 889 890 void set_cache_settings(const cache_settings& cache); 891 cache_settings get_cache_settings() const; 870 892 871 893 const SessionDetail getSessionDetails();
Note: See TracChangeset
for help on using the changeset viewer.