fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-05 17:52:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed 'and' and 'or' commands.

Browse Source 
git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@1225 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2011-05-07 04:57:47 +00:00
parent 1f200e7922
commit 2f485cdf42
2 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/log_stats.plot
+21 -7
View File
@@ -31,8 +31,13 @@ gnuplot << EOF
#
# Choke groups:
#
# file.append = (cat,/foo/choke_group_stats.,(system.pid)),"timestamp","\"leech unchoked\"","\"leech queued\"","\"seed unchoked\"","\"seed queued\""
# schedule = log_choke_group_stats,5,10,((file.append,((cat,/foo/choke_group_stats.,((system.pid)))),((system.time_seconds)),((choke_group.up.unchoked,0)),((choke_group.up.queued,0)),((choke_group.up.total,0)),((choke_group.up.unchoked,1)),((choke_group.up.queued,1)),((choke_group.up.total,1))))
# file.append = (cat,/foo/choke_group_stats.,(system.pid)),"timestamp",
# "\"leech up unchoked\"","\"leech up queued\"","\"leech up rate\"","\"leech down unchoked\"","\"leech down queued\"","\"leech down rate\"","\"leech torrents\"",
# "\"seed up unchoked\"","\"seed up queued\"","\"seed up rate\"","\"seed down unchoked\"","\"seed down queued\"","\"seed down rate\"","\"seed torrents\""
#
# schedule = log_choke_group_stats,5,10,((file.append,((cat,/foo/choke_group_stats.,((system.pid)))),((system.time_seconds)),
# ((choke_group.up.unchoked,0)),((choke_group.up.queued,0)),((choke_group.up.rate,0)),((choke_group.down.unchoked,0)),((choke_group.down.queued,0)),((choke_group.down.rate,0)),((choke_group.size,0)),
# ((choke_group.up.unchoked,1)),((choke_group.up.queued,1)),((choke_group.up.rate,1)),((choke_group.down.unchoked,1)),((choke_group.down.queued,1)),((choke_group.down.rate,1)),((choke_group.size,1))))
#
# Mincore stats:
#
@@ -53,7 +58,7 @@ set output "output_$1_sockets.png"
plot "peer_stats.$1" using 1:7 smooth bezier with lines lw 4,\
"peer_stats.$1" using 1:5 smooth bezier with lines lw 4,\
"peer_stats.$1" using 1:6 smooth bezier with lines lw 4,\
"<awk '{x=1000; if (\$4 < 1000) x=\$4; print \$1,x}' peer_stats.$1" using 1:2 smooth bezier with lines lw 2 axis x1y2,\
"<awk '{x=1000; if (\$4 < 1000) x=\$4; print \$1,x}' peer_stats.$1" using 1:2 smooth bezier with lines title "open sockets" lw 2 axis x1y2,\
"peer_stats.$1" using 1:2 smooth bezier with lines lw 2 axis x1y2,\
"peer_stats.$1" using 1:3 smooth bezier with lines lw 2 axis x1y2
@@ -62,6 +67,9 @@ set format y "%.0s %cb"
set output "output_$1_bandwidth.png"
plot "bandwidth_stats.$1" using 1:2 smooth bezier with lines lw 4,\
"bandwidth_stats.$1" using 1:4 smooth bezier with lines lw 4,\
"choke_group_stats.$1" using 1:4 smooth bezier with lines lw 3,\
"choke_group_stats.$1" using 1:7 smooth bezier with lines lw 3,\
"choke_group_stats.$1" using 1:11 smooth bezier with lines lw 3,\
"peer_stats.$1" using 1:2 smooth bezier with lines lw 2 axis x1y2,\
"peer_stats.$1" using 1:3 smooth bezier with lines lw 2 axis x1y2
@@ -96,7 +104,8 @@ set format y "%.0f"
set format y2 "%.0f"
set output "output_$1_incore.png"
plot "bandwidth_stats.$1" using 1:(0) smooth bezier with lines,\
#plot "bandwidth_stats.$1" using 1:(0) smooth bezier with lines,
plot \
"mincore_stats.$1" using 1:2 smooth bezier with lines lw 2 axis x1y1,\
"mincore_stats.$1" using 1:3 smooth bezier with lines lw 4 axis x1y2,\
"mincore_stats.$1" using 1:4 smooth bezier with lines lw 2 axis x1y1,\
@@ -109,9 +118,14 @@ plot "bandwidth_stats.$1" using 1:(0) smooth bezier with lines,\
set output "output_$1_choke.png"
set style histogram columnstacked
plot "choke_group_stats.$1" using 1:2 smooth bezier with lines lw 2,\
"" using 1:4 smooth bezier with lines lw 2,\
plot "choke_group_stats.$1" \
using 1:2 smooth bezier with lines lw 2,\
"" using 1:3 smooth bezier with lines lw 2,\
"" using 1:5 smooth bezier with lines lw 2
"" using 1:5 smooth bezier with lines lw 2,\
"" using 1:6 smooth bezier with lines lw 2,\
"" using 1:9 smooth bezier with lines lw 2,\
"" using 1:10 smooth bezier with lines lw 2,\
"" using 1:8 smooth bezier with lines lw 4 axis x1y2,\
"" using 1:15 smooth bezier with lines lw 4 axis x1y2
EOF
src/command_ui.cc
+9
View File
@@ -214,7 +214,12 @@ apply_and(rpc::target_type target, const torrent::Object& rawArgs) {
if (!as_boolean(rpc::commands.call_command(itr->as_dict_key().c_str(), itr->as_dict_obj(), target)))
return (int64_t)false;
} else if (itr->is_value()) {
if (!itr->as_value())
return (int64_t)false;
} else {
// TODO: Switch to new versions that only accept the new command syntax.
if (!as_boolean(rpc::parse_command_single(target, itr->as_string())))
return (int64_t)false;
}
@@ -232,6 +237,10 @@ apply_or(rpc::target_type target, const torrent::Object& rawArgs) {
if (as_boolean(rpc::commands.call_command(itr->as_dict_key().c_str(), itr->as_dict_obj(), target)))
return (int64_t)true;
} else if (itr->is_value()) {
if (itr->as_value())
return (int64_t)true;
} else {
if (as_boolean(rpc::parse_command_single(target, itr->as_string())))
return (int64_t)true;