[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[freehaven-cvs] Add 3r and 4r tests.
Update of /home/freehaven/cvsroot/doc/e2e-traffic/src
In directory moria.mit.edu:/tmp/cvs-serv3741
Modified Files:
PLAN.2 simmain.cpp
Log Message:
Add 3r and 4r tests.
Index: PLAN.2
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/PLAN.2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PLAN.2 13 Jan 2004 18:51:29 -0000 1.4
+++ PLAN.2 14 Jan 2004 04:39:05 -0000 1.5
@@ -28,20 +28,20 @@
N = 32, 256, 2048, 16384
m = 1,2,4,8,16,32,64
pMA = 0.9
- strat = SG
+ strat = SG
case 1.1.1: dhcp14-49
3 b = 5, 25, 125
HAVE = 32, 256, 2048, 16384, 1048576
- WANT = 16, 256, 4096, 65536, 1048576
+ WANT = 16, 256, 4096, 65536, 1048576
3 N = 16, 4096, 65536
4 m = 1,4,16,64
36
-
A: 10 Jan, 15:10
B: 13 Jan, 13:34
+
wanted:
===case 2.1.1: (moria)
1 b = 5
@@ -49,9 +49,10 @@
WANT = 16, 256, 4096, 65536, 1048576
4 N = 16, 4096, 65536, 1048576
4 m = 1,4,16,64
-16
-A: 4.00 done,
+16
+A: 4.00 done,
B: 4.04 done! <ow!>
+ (done 65535)
===case 2.1.2: (ariddoch)
1 b = 5
@@ -60,6 +61,7 @@
4
started 18:00, 10 Jan
B: .09 done!
+ (not gonna finish -- just too slow.)
===case2.2.1: (totoro)
1 b = 25
@@ -67,9 +69,10 @@
WANT = 16, 256, 4096, 65536, 1048576
4 N = 16, 4096, 65536, 1048576
4 m = 1,4,16,64
-16
+16
A: 10.02 done
B: 10.10 done
+ (done through 65536)
===case2.2.2: (dhcp14-49)
1 b = 125
@@ -78,6 +81,7 @@
20
A: 10.04 done
B: 10.16 done <ow!>
+ (done through 65536)
===case 3: timed dyn-pool mix. (cassandra)
@@ -88,6 +92,7 @@
-> 48 (stop after 12.)
A: 5.31 done
B: 8.20 done
+ (done pMAlice=.6; pDelay=0.1,.3, .6(partial))
===case 3.1: timed dyn-pool mix. (esox)
@@ -95,9 +100,10 @@
4 Vary mix alg: pDelay = .1, .3, .6, .9
1 Vary Alice freq: .3
3 Vary background volume: 320, 3200, 32000
- -> 12
+ -> 12
A: 2.03 done
B: 2.23 done
+ (done pMAlice=.3,pDelay=.1(partial))
===case 3.2: timed dyn-pool mix. (esox)
@@ -108,6 +114,7 @@
-> 12
A: 1.12 done
B: 1.70
+ (done pMAlice=.3,pDelay=.1(partial))
===case 3.3: timed dyn-pool mix. (opus)
@@ -117,7 +124,8 @@
3 Vary background volume: 320, 3200, 32000
-> 12
A: 0 done, started
-B: 592 done
+B: 5.92 done
+ (done pMA=.9,pDelay=0.1,0.3(most))
===case 4: mixnet
Fix N=65536, m=32, strategy=SG
@@ -125,7 +133,7 @@
3 Vary path length: 2, 4, 8
3 Vary Alice freq: .1, .6, .9
bgvol=320
- ->
+ ->
===case 4.1: (cannabis)
N=65536, m=32, strategy=SG, bgvol=320
@@ -135,6 +143,7 @@
3
started 18:00, 10 Jan
B: 2.03 done
+ (pDelay=.1,len=2,4--8 is stalled)
===case 4.2: (sekrit)
N=65536, m=32, strategy=SG, bgvol=320
@@ -142,7 +151,8 @@
pdelay = .1, .6
3 path len = 2, 4, 8
started 18:00, 10 Jan
-B: 5.05 done <slowed down!>
+B: 5.05 done <slowed down!>
+ (all but pdelay=.6,len=8; call this one done.)
===case 5: impact of dummies
Index: simmain.cpp
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/simmain.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- simmain.cpp 10 Jan 2004 23:13:17 -0000 1.17
+++ simmain.cpp 14 Jan 2004 04:39:05 -0000 1.18
@@ -364,7 +364,54 @@
}
-void trial4_base(double pMsgA, double pDel, int pathlen)
+void trial3r_1() {
+ const double pAlice[] = { .1, .3, .6, .9 };
+ const double pDelay[] = { .1, .3, .6, .9 };
+
+ for (int pAi = 0; pAi <= 3; ++pAi) {
+ for (int pDi = 0; pDi <= 3; ++pDi) {
+ trial3_base(pAlice[pAi], pDelay[pDi], 25);
+ }
+ }
+}
+
+void trial3r_2() {
+ const double pAlice[] = { .1, .3, .6, .9 };
+ const double pDelay[] = { .1, .3, .6, .9 };
+
+ for (int pAi = 0; pAi <= 3; ++pAi) {
+ for (int pDi = 0; pDi <= 3; ++pDi) {
+ trial3_base(pAlice[pAi], pDelay[pDi], 125);
+ }
+ }
+}
+
+void trial3r_3() {
+ trial3_base(.1, .3, 320);
+ trial3_base(.1, .6, 320);
+ trial3_base(.1, .9, 320);
+ trial3_base(.1, .3, 3200);
+ trial3_base(.1, .6, 3200);
+ trial3_base(.1, .9, 3200);
+}
+
+void trial3r_4() {
+ trial3_base(.3, .3, 320);
+ trial3_base(.3, .6, 320);
+ trial3_base(.3, .9, 320);
+ trial3_base(.3, .3, 3200);
+ trial3_base(.3, .6, 3200);
+ trial3_base(.3, .9, 3200);
+}
+
+void trial3r_5() {
+ trial3_base(.6, .9, 320);
+ trial3_base(.9, .9, 320);
+ trial3_base(.6, .9, 3200);
+ trial3_base(.9, .9, 3200);
+}
+
+void trial4_base(double pMsgA, double pDel, int pathlen, int bgVol=320)
{
MixTrialSpec s;
s.setNRecipients(65536).setNAliceRecipients(32)
@@ -375,7 +422,7 @@
.setPDelay(pDel)
.setPMessage(pMsgA)
- .setBGVolMean(320).setBGVolDev(32.0)
+ .setBGVolMean(bgVol).setBGVolDev(bgVol/10.0)
.setPObserve(1.0)
.setPDummy(0.0);
@@ -418,6 +465,40 @@
}
}
+void trial4r_1()
+{
+ trial4_base(.1, .1, 2, 125);
+ trial4_base(.1, .6, 2, 125);
+ trial4_base(.6, .1, 2, 125);
+ trial4_base(.6, .6, 2, 125);
+ trial4_base(.9, .1, 2, 125);
+ trial4_base(.9, .6, 2, 125);
+}
+
+void trial4r_2()
+{
+ trial4_base(.1, .1, 4, 125);
+ trial4_base(.1, .6, 4, 125);
+ trial4_base(.6, .1, 4, 125);
+ trial4_base(.6, .6, 4, 125);
+ trial4_base(.9, .1, 4, 125);
+ trial4_base(.9, .6, 4, 125);
+}
+
+void trial4r_3_1()
+{
+ trial4_base(.1, .1, 8, 125);
+ trial4_base(.6, .1, 8, 125);
+ trial4_base(.9, .1, 8, 125);
+}
+
+void trial4r_3_2()
+{
+ trial4_base(.1, .6, 8, 125);
+ trial4_base(.6, .6, 8, 125);
+ trial4_base(.9, .6, 8, 125);
+}
+
typedef void (*trialfunc)(void);
struct {
@@ -439,6 +520,17 @@
{ "3.3", trial3_3 },
{ "4.1", trial4_1 },
{ "4.2", trial4_2 },
+ { "3r.1", trial3r_1 },
+ { "3r.2", trial3r_2 },
+ { "3r.3", trial3r_3 },
+ { "3r.4", trial3r_4 },
+ { "3r.5", trial3r_5 },
+ { "4r.1", trial4r_1 },
+ { "4r.2", trial4r_2 },
+ { "4r.3.1", trial4r_3_1 },
+ { "4r.3.2", trial4r_3_2 },
+
+
{ 0, 0 }
};
***********************************************************************
To unsubscribe, send an e-mail to majordomo@seul.org with
unsubscribe freehaven-cvs in the body. http://freehaven.net/