linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2829
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Fri 2012-01-20 23:57:52 +0100
message:
  overlapped read by default when hashing
modified:
  dcpp/FileReader.cpp
  dcpp/HashManager.cpp
  dcpp/OnlineUser.h
  help/settings_styles.html


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'dcpp/FileReader.cpp'
--- dcpp/FileReader.cpp	2012-01-13 20:55:20 +0000
+++ dcpp/FileReader.cpp	2012-01-20 22:57:52 +0000
@@ -20,6 +20,7 @@
 
 #include "FileReader.h"
 
+#include "debug.h"
 #include "File.h"
 #include "Text.h"
 #include "Util.h"
@@ -37,13 +38,16 @@
 	size_t ret = READ_FAILED;
 
 	if(direct) {
+		dcdebug("Reading [overlapped] %s\n", file.c_str());
 		ret = readDirect(file, callback);
 	}
 
 	if(ret == READ_FAILED) {
+		dcdebug("Reading [mapped] %s\n", file.c_str());
 		ret = readMapped(file, callback);
 
 		if(ret == READ_FAILED) {
+			dcdebug("Reading [full] %s\n", file.c_str());
 			ret = readCached(file, callback);
 		}
 	}

=== modified file 'dcpp/HashManager.cpp'
--- dcpp/HashManager.cpp	2012-01-13 20:55:20 +0000
+++ dcpp/HashManager.cpp	2012-01-20 22:57:52 +0000
@@ -575,7 +575,7 @@
 
 				auto lastRead = GET_TICK();
 
-				FileReader fr;
+				FileReader fr(true);
 
 				fr.read(fname, [&](const void* buf, size_t n) -> bool {
 					if(SETTING(MAX_HASH_SPEED)> 0) {

=== modified file 'dcpp/OnlineUser.h'
--- dcpp/OnlineUser.h	2012-01-13 20:55:20 +0000
+++ dcpp/OnlineUser.h	2012-01-20 22:57:52 +0000
@@ -27,9 +27,9 @@
 #include "Flags.h"
 #include "FastAlloc.h"
 #include "GetSet.h"
+#include "Style.h"
 #include "Util.h"
 #include "User.h"
-#include "UserMatch.h"
 
 namespace dcpp {
 

=== modified file 'help/settings_styles.html'
--- help/settings_styles.html	2011-12-18 17:04:43 +0000
+++ help/settings_styles.html	2012-01-20 22:57:52 +0000
@@ -35,12 +35,6 @@
 	<p cshelp="IDH_SETTINGS_STYLES_USER_MATCH">
 	The styles used to paint users that match user matching definitions.
 	</p>
-	<h3>No user matching definition has been set yet</h3>
-	<p cshelp="IDH_SETTINGS_STYLES_NO_USER_MATCH">
-	This message appears when no user matching definition is available. They can be configured on
-	the <placeholder><a href="settings_user_matching.html">User matching</a></placeholder> settings
-	page.
-	</p>
 
 	<h2>Preview line</h2>
 	<p cshelp="IDH_SETTINGS_STYLES_PREVIEW">