One-liners.

diff --git a/mfold/bash_profile b/mfold/bash_profile
new file mode 100755 (executable)
index 0000000..50f96e6
--- /dev/null
+++ b/mfold/bash_profile
@@ -0,0 +1,4 @@
+export PATH=$HOME/bin:$PATH
+export CPPPATH=$CPPPATH:$HOME/include
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/lib
+export LIBPATH=$LD_LIBRARY_PATH

diff --git a/mfold/compile.default.sh b/mfold/compile.default.sh
new file mode 100644 (file)
index 0000000..40db746
--- /dev/null
+++ b/mfold/compile.default.sh
@@ -0,0 +1,18 @@
+cd swift || exit 1
+git pull || exit 2
+rm exec/*-pg exec/*-o3
+
+g++ -I. exec/leecher.cpp *.cpp compat/*.cpp ext/seq_picker.cpp -pg -o exec/leecher-pg &
+g++ -I. exec/seeder.cpp *.cpp compat/*.cpp ext/seq_picker.cpp -pg -o exec/seeder-pg &
+g++ -I. exec/leecher.cpp *.cpp compat/*.cpp ext/seq_picker.cpp -O3 -o exec/leecher-o3 &
+g++ -I. exec/seeder.cpp *.cpp compat/*.cpp ext/seq_picker.cpp -O3 -o exec/seeder-o3 &
+
+wait
+
+cd exec
+
+if [ ! -e leecher-pg ]; then exit 3; fi
+if [ ! -e leecher-o3 ]; then exit 4; fi
+if [ ! -e seeder-pg ]; then exit 5; fi
+if [ ! -e seeder-o3 ]; then exit 6; fi
+

diff --git a/mfold/docmd b/mfold/docmd
index 3db38a9..4b9e102 100755 (executable)
--- a/mfold/docmd
+++ b/mfold/docmd
@@ -18,6 +18,6 @@ if ( cat $ENV $SHSC | ssh $HOST ) > logs/$HOST.$CMD.out 2> logs/$HOST.$CMD.err;
 else
     echo $HOST  $CMD    FAIL
     cat $SHSC
-    cat .$HOST.$CMD.out .$HOST.$CMD.err
+    cat logs/$HOST.$CMD.out logs/$HOST.$CMD.err
     exit 1
 fi

diff --git a/send_control.cpp b/send_control.cpp
index d2052b2..951685f 100644 (file)
--- a/send_control.cpp
+++ b/send_control.cpp
@@ -101,7 +101,7 @@ tint    Channel::CwndRateNextSendTime () {
     if (send_interval_>std::max(rtt_avg_,TINT_SEC)*4)
         return SwitchSendControl(KEEP_ALIVE_CONTROL);
     if (data_out_.size()<cwnd_) {
-        dprintf("%s #%u sendctrl next in %llius (cwnd %f.2, data_out %i)\n",
+        dprintf("%s #%u sendctrl next in %llius (cwnd %.2f, data_out %i)\n",
                 tintstr(),id_,send_interval_,cwnd_,(int)data_out_.size());
         return last_data_out_time_ + send_interval_;
     } else {