[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co... |
Date: |
Sun, 03 Feb 2008 23:09:20 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 08/02/03 23:09:19
Modified files:
distrib : ChangeLog
src/daemon/common: commonSwarming.ml
Log message:
patch #6401
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1353&r2=1.1354
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonSwarming.ml?cvsroot=mldonkey&r1=1.65&r2=1.66
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1353
retrieving revision 1.1354
diff -u -b -r1.1353 -r1.1354
--- distrib/ChangeLog 3 Feb 2008 23:08:45 -0000 1.1353
+++ distrib/ChangeLog 3 Feb 2008 23:09:19 -0000 1.1354
@@ -15,6 +15,7 @@
=========
2008/02/04
+6401: Swarmer: Correctly update file_downloaded during recover_temp (pango)
6400: EDK: Correctly update filename after recover_temp
6396: Log: Print user:group when starting a download
6395: Makefile: Do not strip shared linked binaries on Mac OS X, clean Makefile
Index: src/daemon/common/commonSwarming.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonSwarming.ml,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- src/daemon/common/commonSwarming.ml 15 Jan 2008 09:08:31 -0000 1.65
+++ src/daemon/common/commonSwarming.ml 3 Feb 2008 23:09:19 -0000 1.66
@@ -1327,7 +1327,7 @@
let set_frontend_state_complete t j =
match VB.get t.t_converted_verified_bitmap j with
| VB.State_missing | VB.State_partial ->
- if !verbose_swarming || !verbose then
+ if (not !CommonGlobals.is_startup_phase) && (!verbose_swarming ||
!verbose) then
lprintf_nl "Completed block %d/%d of %s"
(j + 1) t.t_nchunks (file_best_name t.t_file);
let s = t.t_s in
@@ -1444,7 +1444,12 @@
let s = t.t_s in
VB.iteri (fun i state ->
match state with
- | VB.State_missing | VB.State_verified ->
+ | VB.State_verified ->
+ must_verify_block s i
+ | VB.State_missing ->
+ let block_begin = compute_block_begin s i in
+ let block_end = compute_block_end s i in
+ add_file_downloaded None s (block_end -- block_begin);
must_verify_block s i
| VB.State_partial | VB.State_complete -> ()
) s.s_verified_bitmap