-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathscheduling_DUMBO.patch
2220 lines (2185 loc) · 60.8 KB
/
scheduling_DUMBO.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/.gitignore b/.gitignore
index ae6bcf5..6e73684 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@ install-sh
*.dirstamp*
simulator
simdebug
+result*.txt
+conf*.txt
diff --git a/Makefile.am b/Makefile.am
index 57dbb10..9d9a6b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,8 @@ simulator_SOURCES = \
ext/dctcpQueue.cpp \
ext/dctcpFlow.cpp \
ext/ideal.cpp \
+ ext/modelflow.cpp \
+ ext/flowsizeoracle.cpp \
run/params.cpp \
run/stats.cpp \
run/flow_generator.cpp \
@@ -42,3 +44,5 @@ simdebug_CXXFLAGS = -g -O0 -gdwarf-2 -Wall -std=c++0x
#CFLAGS = -g -O3 -gdwarf-2 -Wall -std=c++0x
#CXXFLAGS = -g -O3 -gdwarf-2 -Wall -std=c++0x
+#ext/modelflow.cpp
+#ext/flowsizeoracle.cpp
diff --git a/README.md b/README.md
deleted file mode 100644
index 46cea00..0000000
--- a/README.md
+++ /dev/null
@@ -1,50 +0,0 @@
-YAPS = Yet Another Packet Simulator
-==================================
-
-Core stuff is in `coresim/`
----------------------------
-Normally these files shouldn't change. This directory includes implementations of the following:
-* Main event loop and related helper functions, global variables, main() function to determine which experiment to run: `main.cpp`
- * Note: deciding which experiment to run will eventually be moved to the `run/` directory, probably to `experiment.cpp`.
-* Core event implementations (`Event`, `FlowArrivalEvent`, `FlowFinishedEvent`, etc): `event.cpp`.
-* Representation of the topology: `node.cpp`, `topology.cpp`
-* Queueing behavior. This is a basis for extension; the default implementation is FIFO-dropTail: `queue.cpp`.
-* Flows and packets. This is also a basis for extension; default is TCP: `packet.cpp` and `flow.cpp`.
-* Random variables used in flow generation. Used as a library by the flow generation code: `random_variable.cpp`.
-
-Extensions are in `ext/`
------------------------
-This is where you implement your favorite protocol.
-* Generally extensions are created by subclassing one or more aspects of classes defined in `coresim/`.
-* Once an extension is defined, it should be added to `factory.cpp` so it can be run.
- * Currently, `factory.cpp` supports changing the flow, queue, and host-scheduling implementations.
-* Methods in `coresim/` call the `get_...` methods in `factory.cpp` to initialize the simulation with the correct implementation.
-* Which implementation to use from `factory.cpp` is determined by the config file, parsed by `run/params.cpp`.
- * You should give your extension an identifier in `factory.h` so it can be uniquely identified in the config file.
-
-Stuff related to actually running the simulator is in `run/`
-------------------------------------------------------------
-* Experiment setup, running, and post-analysis: `experiment.cpp`
-* Flow generation models: `flow_generator.cpp`
-* Parsing of config file: `params.cpp`
- * Configuration parameters for your extension should be added to `params.h` and `params.cpp`.
- * These can then be accessed with `params.<your_parameter>`
-
-Helper scripts to run experiments are in `py/`
----------------------------------------------
-This can be useful if:
-* You are running many experiments in parallel.
-* You want to easily generate configuration files.
-
-To compile, the Automake and Autoconf files are included: `configure.ac` and `Makefile.am`. The makefile will produce two targets: `simulator` and `simdebug`.
-`simdebug` is equivalent to `simulator`, except compiler optimzations are turned off to make debugging easier.
-
-Authors
--------
-
-* Gautam Kumar
-* Akshay Narayan
-* Peter Gao
-
-
-
diff --git a/coresim/event.cpp b/coresim/event.cpp
index 336bc8d..d918966 100644
--- a/coresim/event.cpp
+++ b/coresim/event.cpp
@@ -17,6 +17,9 @@
#include "../run/params.h"
+#include "ext/flowsizeoracle.h"
+
+
extern Topology* topology;
extern std::priority_queue<Event*, std::vector<Event*>, EventComparator> event_queue;
extern double current_time;
@@ -52,6 +55,9 @@ extern int get_event_queue_size();
uint32_t Event::instance_count = 0;
+extern FlowSizeOracle* flow_size_oracle;
+
+
Event::Event(uint32_t type, double time) {
this->type = type;
this->time = time;
@@ -114,6 +120,16 @@ void FlowCreationForInitializationEvent::process_event() {
}
+/* Flow Oracle Triggering */
+TriggerFlowOracleEvent::TriggerFlowOracleEvent(double time) : Event(TRIGGER_FLOW_ORACLE, time) {
+}
+
+TriggerFlowOracleEvent::~TriggerFlowOracleEvent() {
+}
+
+void TriggerFlowOracleEvent::process_event() {
+ flow_size_oracle->update_size_threshold();
+}
/* Flow Arrival */
int flow_arrival_count = 0;
@@ -140,6 +156,7 @@ void FlowArrivalEvent::process_event() {
flow_arrivals.pop_front();
}
+
if(params.num_flows_to_run > 10 && flow_arrival_count % 100000 == 0){
double curr_time = get_current_time();
uint32_t num_unfinished_flows = 0;
@@ -315,6 +332,7 @@ void FlowFinishedEvent::process_event() {
std::cout
<< flow->id << " "
<< flow->size << " "
+ << flow->size_in_pkt << " "
<< flow->src->id << " "
<< flow->dst->id << " "
<< 1000000 * flow->start_time << " "
diff --git a/coresim/event.h b/coresim/event.h
index f1f2b0d..8f76d1a 100644
--- a/coresim/event.h
+++ b/coresim/event.h
@@ -28,6 +28,7 @@
#define FLOW_PROCESSING 7
#define FLOW_CREATION_EVENT 8
#define LOGGING 9
+#define TRIGGER_FLOW_ORACLE 10
class Event {
public:
@@ -95,6 +96,14 @@ class FlowArrivalEvent : public Event {
Flow *flow;
};
+//A flow arrival event
+class TriggerFlowOracleEvent: public Event {
+ public:
+ TriggerFlowOracleEvent(double time);
+ ~TriggerFlowOracleEvent();
+ void process_event();
+};
+
// packet gets queued
class PacketQueuingEvent : public Event {
public:
diff --git a/coresim/flow.cpp b/coresim/flow.cpp
index 288ce10..39c546c 100644
--- a/coresim/flow.cpp
+++ b/coresim/flow.cpp
@@ -8,6 +8,9 @@
#include "../run/params.h"
+#include "ext/flowsizeoracle.h"
+
+
extern double get_current_time();
extern void add_to_event_queue(Event *);
extern int get_event_queue_size();
@@ -15,6 +18,8 @@ extern DCExpParams params;
extern uint32_t num_outstanding_packets;
extern uint32_t max_outstanding_packets;
extern uint32_t duplicated_packets_received;
+extern FlowSizeOracle* flow_size_oracle;
+
Flow::Flow(uint32_t id, double start_time, uint32_t size, Host *s, Host *d) {
this->id = id;
@@ -53,6 +58,8 @@ Flow::Flow(uint32_t id, double start_time, uint32_t size, Host *s, Host *d) {
this->first_byte_receive_time = -1;
this->first_hop_departure = 0;
this->last_hop_departure = 0;
+ //flow_size_oracle->add_flow(this);
+
}
Flow::~Flow() {
diff --git a/coresim/main.cpp b/coresim/main.cpp
index 025808e..fef8a8f 100644
--- a/coresim/main.cpp
+++ b/coresim/main.cpp
@@ -20,6 +20,9 @@
#include "../run/params.h"
+#include "../ext/flowsizeoracle.h"
+
+
using namespace std;
Topology* topology;
@@ -50,6 +53,9 @@ uint32_t sent_packets = 0;
extern DCExpParams params;
double start_time = -1;
+FlowSizeOracle* flow_size_oracle;
+
+
const std::string currentDateTime() {
time_t now = time(0);
struct tm tstruct;
@@ -120,7 +126,8 @@ int main (int argc, char ** argv) {
time(&start_time);
//srand(time(NULL));
- srand(0);
+ srand(atoi(argv[3]));
+ //srand(0);
std::cout.precision(15);
uint32_t exp_type = atoi(argv[1]);
diff --git a/coresim/random_variable.cpp b/coresim/random_variable.cpp
index 40f1ea9..5d46e79 100644
--- a/coresim/random_variable.cpp
+++ b/coresim/random_variable.cpp
@@ -93,7 +93,7 @@ int EmpiricalRandomVariable::lookup(double u) {
}
int EmpiricalRandomVariable::loadCDF(std::string filename) {
- assert(false);
+ //assert(false);
std::string line;
std::ifstream myfile(filename);
assert(myfile.good());
diff --git a/ext/factory.cpp b/ext/factory.cpp
index 372022f..f6d0aee 100644
--- a/ext/factory.cpp
+++ b/ext/factory.cpp
@@ -21,6 +21,8 @@
#include "ideal.h"
+#include "modelflow.h"
+
IdealArbiter* ideal_arbiter = NULL;
/* Factory method to return appropriate queue */
@@ -76,6 +78,10 @@ Flow* Factory::get_flow(
case PFABRIC_FLOW:
return new PFabricFlow(id, start_time, size, src, dst);
break;
+ case MODEL_FLOW:
+ return new ModelFlow(id, start_time, size, src, dst);
+ break;
+
case CAPABILITY_FLOW:
return new CapabilityFlow(id, start_time, size, src, dst);
break;
diff --git a/ext/factory.h b/ext/factory.h
index 116a734..f603d0a 100644
--- a/ext/factory.h
+++ b/ext/factory.h
@@ -14,6 +14,7 @@
/* Flow types */
#define NORMAL_FLOW 1
#define PFABRIC_FLOW 2
+#define MODEL_FLOW 3
#define VANILLA_TCP_FLOW 42
#define DCTCP_FLOW 43
#define CAPABILITY_FLOW 112
diff --git a/ext/flowsizeoracle.cpp b/ext/flowsizeoracle.cpp
new file mode 100644
index 0000000..c1ef879
--- /dev/null
+++ b/ext/flowsizeoracle.cpp
@@ -0,0 +1,67 @@
+#include "flowsizeoracle.h"
+#include <algorithm>
+#include <bits/stdint-uintn.h>
+#include <cassert>
+#include <cmath>
+#include <cstdint>
+#include <cstdlib>
+#include <vector>
+#include <iostream>
+#include <stdlib.h>
+
+void FlowSizeOracle::add_flow(Flow *flow) {
+ // if the flow is not present
+ if (this->flow_map.find(flow->id) == this->flow_map.end()) {
+ this->flow_map.insert(std::pair<uint32_t,uint32_t>(flow->id, flow->size_in_pkt));
+ //update_size_threshold();
+ }
+}
+
+void FlowSizeOracle::update_size_threshold() {
+ std::vector<uint32_t> temp;
+ for (auto i = this->flow_map.begin(); i != this->flow_map.end(); i++) {
+ if (i->second >= this->packet_cache_limit)
+ temp.push_back(i->second);
+ }
+ if (temp.size() > 0) {
+ std::sort(temp.begin(), temp.end());
+ uint32_t threshold_index = uint32_t(floor(1.0+(this->quantile*(temp.size()-1.0))));
+ threshold_index -= 1;
+ this->size_threshold = temp[threshold_index];
+ }
+ //std::cout << "New size threshold " << this->size_threshold << std::endl;
+ //std::cout << temp.size() << std::endl;
+}
+
+//uint8_t FlowSizeOracle::query_flow(Flow *flow) {
+// auto temp = this->flow_map.find(flow->id);
+// assert(temp != this->flow_map.end());
+// auto ret = ((temp->second >= this->size_threshold) ? 1 : 0);
+// double rand_val = ((double) rand() / (RAND_MAX));
+// double hh_rand_val = ((double) rand() / (RAND_MAX));
+// if (ret == 1 && ((rand_val > hh_tp_rate) || (hh_rand_val > hh_reaching_model_perc))) {
+// ret = 0;
+// }
+// if (ret == 0 && rand_val > mice_tp_rate) {
+// ret = 1;
+// }
+// return ret;
+//}
+
+uint8_t FlowSizeOracle::query_flow(Flow *flow) {
+ auto temp = this->flow_map.find(flow->id);
+ assert(temp != this->flow_map.end());
+ if (temp->second < this->packet_cache_limit)
+ return 0;
+ auto ret = ((temp->second >= this->size_threshold) ? 2 : 1);
+ double rand_val = ((double) rand() / (RAND_MAX));
+ double hh_rand_val = ((double) rand() / (RAND_MAX));
+ //if (ret == 2 && ((rand_val > hh_tp_rate) || (hh_rand_val > hh_reaching_model_perc))) {
+ if (ret == 2 && (rand_val > hh_tp_rate)) {
+ ret = 1;
+ }
+ if (ret == 1 && (rand_val > mice_tp_rate)) {
+ ret = 2;
+ }
+ return ret;
+}
diff --git a/ext/flowsizeoracle.h b/ext/flowsizeoracle.h
new file mode 100644
index 0000000..6db0a0c
--- /dev/null
+++ b/ext/flowsizeoracle.h
@@ -0,0 +1,34 @@
+#ifndef FLOW_SIZE_ORACLE_H
+#define FLOW_SIZE_ORACLE_H
+
+#include "coresim/flow.h"
+#include <bits/stdint-uintn.h>
+#include <cstdint>
+#include <map>
+#include <vector>
+
+using namespace std;
+
+class FlowSizeOracle {
+ private:
+ // map flow_id -> size
+ map<uint32_t, uint32_t> flow_map;
+ // update size threshold whenever a new flow is added
+ uint32_t size_threshold;
+ float quantile;
+ float hh_tp_rate;
+ float mice_tp_rate;
+ const float hh_reaching_model_perc = 0.8;
+ uint32_t packet_cache_limit;
+
+ public:
+ FlowSizeOracle(float quantile, float hh_tp_rate, float mice_tp_rate, uint32_t packet_cache_limit): quantile(quantile), hh_tp_rate(hh_tp_rate), mice_tp_rate(mice_tp_rate), packet_cache_limit(packet_cache_limit) {
+ size_threshold = 0;
+ }
+ // add flow to the flow list
+ void add_flow(Flow* flow);
+ void update_size_threshold();
+ uint8_t query_flow(Flow* flow);
+};
+
+#endif
diff --git a/ext/modelflow.cpp b/ext/modelflow.cpp
new file mode 100644
index 0000000..6672307
--- /dev/null
+++ b/ext/modelflow.cpp
@@ -0,0 +1,67 @@
+#include "modelflow.h"
+#include "ext/flowsizeoracle.h"
+#include "ext/pfabricflow.h"
+#include <iostream>
+
+#include "ext/flowsizeoracle.h"
+#include "../coresim/flow.h"
+#include "../coresim/packet.h"
+#include "../coresim/event.h"
+
+#include "../run/params.h"
+
+extern FlowSizeOracle* flow_size_oracle;
+extern double get_current_time();
+extern void add_to_event_queue(Event *);
+extern DCExpParams params;
+/* Implementation for pFabric Flow */
+
+ModelFlow::ModelFlow(uint32_t id, double start_time, uint32_t size, Host *s, Host *d)
+ : PFabricFlow(id, start_time, size, s, d) {
+ oracle_priority_set = false;
+ oracle_priority = 0;
+ sent_packet_count = 0;
+ flow_size_oracle->add_flow(this);
+ }
+
+
+uint32_t ModelFlow::get_priority(uint32_t packet_count) {
+ if (packet_count < params.packet_cache_limit)
+ return 0;
+ if (!oracle_priority_set) {
+ oracle_priority = flow_size_oracle->query_flow(this);
+ //std::cout << "maybe here " << oracle_priority << " no" << std::endl;
+ oracle_priority_set = true;
+ }
+ //std::cout << "Flow ID " << this->id << " Priority " << oracle_priority << std::endl;
+ return oracle_priority;
+}
+
+Packet* ModelFlow::send(uint32_t seq) {
+ //0 if less then r
+ Packet *p = NULL;
+ sent_packet_count++;
+
+ uint32_t pkt_size;
+ // last packet
+ if (seq + mss > this->size) {
+ pkt_size = this->size - seq + hdr_size;
+ } else {
+ pkt_size = mss + hdr_size;
+ }
+
+ uint32_t priority = get_priority(sent_packet_count);
+ p = new Packet(
+ get_current_time(),
+ this,
+ seq,
+ priority,
+ pkt_size,
+ src,
+ dst
+ );
+ this->total_pkt_sent++;
+
+ add_to_event_queue(new PacketQueuingEvent(get_current_time(), p, src->queue));
+ return p;
+}
diff --git a/ext/modelflow.h b/ext/modelflow.h
new file mode 100644
index 0000000..73fbb65
--- /dev/null
+++ b/ext/modelflow.h
@@ -0,0 +1,19 @@
+#ifndef MODEL_FLOW_H
+#define MODEL_FLOW_H
+
+#include "pfabricflow.h"
+#include "../coresim/node.h"
+#include <bits/stdint-uintn.h>
+
+class ModelFlow : public PFabricFlow {
+ private:
+ bool oracle_priority_set;
+ uint32_t oracle_priority;
+ uint32_t sent_packet_count;
+ public:
+ ModelFlow(uint32_t id, double start_time, uint32_t size, Host *s, Host *d);
+ virtual uint32_t get_priority(uint32_t seq);
+ virtual Packet *send(uint32_t seq);
+};
+
+#endif
diff --git a/py/compute_avg_slowdown.py b/py/compute_avg_slowdown.py
new file mode 100755
index 0000000..fb707fd
--- /dev/null
+++ b/py/compute_avg_slowdown.py
@@ -0,0 +1,61 @@
+#!/usr/bin/python
+
+import argparse
+import numpy as np
+
+parser = argparse.ArgumentParser()
+parser.add_argument("--file", required=True, type=str)
+
+args = parser.parse_args()
+
+avg_slowdown = 0.0
+count = 0
+sizes = []
+
+with open(args.file, "r") as f:
+ lines = f.readlines()
+ size = len(lines)
+ for line in lines[:-1]:
+ rec = line.split(" ")
+ if rec[0] == "Flow" or rec[0] == "unfinished" or rec[0] == "Ended" or rec[0] == "##":
+ continue
+ count += 1
+ slowdown = float(rec[9])
+ avg_slowdown += slowdown
+ size_in_pkt = int(rec[2])
+ sizes.append(size_in_pkt)
+
+sizes = np.array(sizes)
+thres = np.quantile(sizes, 0.99)
+#print(thres)
+
+avg_slowdown_mice = 0.0
+mice_count = 0
+avg_slowdown_hh = 0.0
+hh_count = 0
+
+with open(args.file, "r") as f:
+ lines = f.readlines()
+ size = len(lines)
+ for line in lines[:-1]:
+ rec = line.split(" ")
+ if rec[0] == "Flow" or rec[0] == "unfinished" or rec[0] == "Ended" or rec[0] == "##":
+ continue
+ slowdown = float(rec[9])
+ size_in_pkt = int(rec[2])
+ if size_in_pkt >= thres:
+ avg_slowdown_hh += slowdown
+ hh_count += 1
+ else:
+ avg_slowdown_mice += slowdown
+ mice_count += 1
+try:
+ print(avg_slowdown/count, avg_slowdown_hh/hh_count, avg_slowdown_mice/mice_count)
+except ZeroDivisionError:
+ try:
+ print(avg_slowdown/count, avg_slowdown_hh/hh_count, 0)
+ except ZeroDivisionError:
+ try:
+ print(avg_slowdown/count, 0, avg_slowdown_mice/mice_count)
+ except ZeroDivisionError:
+ print(avg_slowdown/count, 0, 0)
\ No newline at end of file
diff --git a/py/compute_median.py b/py/compute_median.py
new file mode 100644
index 0000000..0bf7beb
--- /dev/null
+++ b/py/compute_median.py
@@ -0,0 +1,17 @@
+#!/usr/bin/python3
+import argparse
+import numpy as np
+
+parser = argparse.ArgumentParser()
+parser.add_argument("--file",type=str, required=True)
+args = parser.parse_args()
+
+val_array = []
+
+with open(args.file, "r") as f:
+ for line in f.readlines():
+ val_array.append(float(line.strip()))
+
+val_array = np.array(val_array)
+print(np.median(val_array))
+print(np.mean(val_array))
diff --git a/py/run_experiments.py b/py/run_experiments.py
deleted file mode 100644
index 26ba40f..0000000
--- a/py/run_experiments.py
+++ /dev/null
@@ -1,194 +0,0 @@
-#!/usr/bin/python
-
-import subprocess
-import threading
-import multiprocessing
-
-conf_str_pfabric = '''init_cwnd: 12
-max_cwnd: 15
-retx_timeout: 45e-06
-queue_size: 36864
-propagation_delay: 0.0000002
-bandwidth: 40000000000.0
-queue_type: 2
-flow_type: 2
-num_flow: {0}
-flow_trace: ./{1}
-cut_through: 1
-mean_flow_size: 0
-load_balancing: 0
-preemptive_queue: 0
-big_switch: 0
-host_type: 1
-traffic_imbalance: 0
-load: 0.6
-reauth_limit: 3
-magic_trans_slack: 1.1
-magic_delay_scheduling: 1
-use_flow_trace: 0
-smooth_cdf: 1
-burst_at_beginning: 0
-capability_timeout: 1.5
-capability_resend_timeout: 9
-capability_initial: 8
-capability_window: 8
-capability_window_timeout: 25
-ddc: 0
-ddc_cpu_ratio: 0.33
-ddc_mem_ratio: 0.33
-ddc_disk_ratio: 0.34
-ddc_normalize: 2
-ddc_type: 0
-deadline: 0
-schedule_by_deadline: 0
-avg_deadline: 0.0001
-capability_third_level: 1
-capability_fourth_level: 0
-magic_inflate: 1
-interarrival_cdf: none
-num_host_types: 13
-permutation_tm: 1
-
-'''
-
-conf_str_phost = '''init_cwnd: 2
-max_cwnd: 6
-retx_timeout: 9.50003e-06
-queue_size: 36864
-propagation_delay: 0.0000002
-bandwidth: 40000000000.0
-queue_type: 2
-flow_type: 112
-num_flow: {0}
-flow_trace: ./{1}
-cut_through: 1
-mean_flow_size: 0
-load_balancing: 0
-preemptive_queue: 0
-big_switch: 0
-host_type: 12
-traffic_imbalance: 0
-load: 0.6
-reauth_limit: 3
-magic_trans_slack: 1.1
-magic_delay_scheduling: 1
-use_flow_trace: 0
-smooth_cdf: 1
-burst_at_beginning: 0
-capability_timeout: 1.5
-capability_resend_timeout: 9
-capability_initial: 8
-capability_window: 8
-capability_window_timeout: 25
-ddc: 0
-ddc_cpu_ratio: 0.33
-ddc_mem_ratio: 0.33
-ddc_disk_ratio: 0.34
-ddc_normalize: 2
-ddc_type: 0
-deadline: 0
-schedule_by_deadline: 0
-avg_deadline: 0.0001
-capability_third_level: 1
-capability_fourth_level: 0
-magic_inflate: 1
-interarrival_cdf: none
-num_host_types: 13
-permutation_tm: 1
-
-'''
-
-conf_str_fastpass = '''init_cwnd: 6
-max_cwnd: 12
-retx_timeout: 45e-06
-queue_size: 36864
-propagation_delay: 0.0000002
-bandwidth: 40000000000.0
-queue_type: 2
-flow_type: 114
-num_flow: {0}
-flow_trace: ./{1}
-cut_through: 1
-mean_flow_size: 0
-load_balancing: 0
-preemptive_queue: 0
-big_switch: 0
-host_type: 14
-traffic_imbalance: 0
-load: 0.6
-reauth_limit: 3
-magic_trans_slack: 1.1
-magic_delay_scheduling: 1
-use_flow_trace: 0
-smooth_cdf: 1
-burst_at_beginning: 0
-capability_timeout: 1.5
-capability_resend_timeout: 9
-capability_initial: 8
-capability_window: 8
-capability_window_timeout: 25
-ddc: 0
-ddc_cpu_ratio: 0.33
-ddc_mem_ratio: 0.33
-ddc_disk_ratio: 0.34
-ddc_normalize: 2
-ddc_type: 0
-deadline: 0
-schedule_by_deadline: 0
-avg_deadline: 0.0001
-capability_third_level: 1
-capability_fourth_level: 0
-magic_inflate: 1
-interarrival_cdf: none
-num_host_types: 13
-permutation_tm: 1
-
-'''
-
-
-template = '../simulator 1 conf_{0}_{1}.txt > result_{0}_{1}.txt'
-cdf_temp = './CDF_{}.txt'
-
-runs = ['pfabric', 'phost', 'fastpass']
-workloads = ['aditya', 'dctcp', 'datamining']
-
-def getNumLines(trace):
- out = subprocess.check_output('wc -l {}'.format(trace), shell=True)
- return int(out.split()[0])
-
-
-def run_exp(rw, semaphore):
- semaphore.acquire()
- print template.format(*rw)
- subprocess.call(template.format(*rw), shell=True)
- semaphore.release()
-
-threads = []
-semaphore = threading.Semaphore(multiprocessing.cpu_count())
-
-for r in runs:
- for w in workloads:
- cdf = cdf_temp.format(w)
- numLines = 1000000
-
- # generate conf file
- if r == 'pfabric':
- conf_str = conf_str_pfabric.format(numLines, cdf)
- elif r == 'phost':
- conf_str = conf_str_phost.format(numLines, cdf)
- elif r == 'fastpass':
- conf_str = conf_str_fastpass.format(numLines, cdf)
- else:
- assert False, r
-
- confFile = "conf_{0}_{1}.txt".format(r, w)
- with open(confFile, 'w') as f:
- print confFile
- f.write(conf_str)
-
- threads.append(threading.Thread(target=run_exp, args=((r, w), semaphore)))
-
-print '\n'
-[t.start() for t in threads]
-[t.join() for t in threads]
-print 'finished', len(threads), 'experiments'
diff --git a/py/run_experiments_caida.py b/py/run_experiments_caida.py
new file mode 100755
index 0000000..3f957d2
--- /dev/null
+++ b/py/run_experiments_caida.py
@@ -0,0 +1,375 @@
+#!/usr/bin/python2
+
+import subprocess
+import threading
+import multiprocessing
+import argparse
+
+
+conf_str_coda = '''init_cwnd: 12
+max_cwnd: 15
+retx_timeout: 45e-06
+queue_size: 36864
+propagation_delay: 0.0000002
+bandwidth: 40000000000.0
+queue_type: 2
+flow_type: 3
+num_flow: {0}
+flow_trace: ./{1}
+cut_through: 1
+mean_flow_size: 0
+load_balancing: 0
+preemptive_queue: 0
+big_switch: 0
+host_type: 1
+traffic_imbalance: 0
+load: {2}
+reauth_limit: 3
+magic_trans_slack: 1.1
+magic_delay_scheduling: 1
+use_flow_trace: 0
+smooth_cdf: 1
+burst_at_beginning: 0
+capability_timeout: 1.5
+capability_resend_timeout: 9
+capability_initial: 8
+capability_window: 8
+capability_window_timeout: 25
+ddc: 0
+ddc_cpu_ratio: 0.33
+ddc_mem_ratio: 0.33
+ddc_disk_ratio: 0.34
+ddc_normalize: 2
+ddc_type: 0
+deadline: 0
+schedule_by_deadline: 0
+avg_deadline: 0.0001
+capability_third_level: 1
+capability_fourth_level: 0
+magic_inflate: 1
+interarrival_cdf: none
+num_host_types: 13
+hh_tp_rate: {3}
+mice_tp_rate: {4}
+hh_percentage: 0.99
+permutation_tm: 1
+packet_cache_limit: 5
+'''
+
+conf_str_pheavy = '''init_cwnd: 12
+max_cwnd: 15
+retx_timeout: 45e-06
+queue_size: 36864
+propagation_delay: 0.0000002
+bandwidth: 40000000000.0
+queue_type: 2
+flow_type: 3
+num_flow: {0}
+flow_trace: ./{1}
+cut_through: 1
+mean_flow_size: 0
+load_balancing: 0
+preemptive_queue: 0
+big_switch: 0
+host_type: 1
+traffic_imbalance: 0
+load: {2}
+reauth_limit: 3
+magic_trans_slack: 1.1
+magic_delay_scheduling: 1
+use_flow_trace: 0
+smooth_cdf: 1
+burst_at_beginning: 0
+capability_timeout: 1.5
+capability_resend_timeout: 9
+capability_initial: 8
+capability_window: 8
+capability_window_timeout: 25
+ddc: 0
+ddc_cpu_ratio: 0.33
+ddc_mem_ratio: 0.33
+ddc_disk_ratio: 0.34
+ddc_normalize: 2
+ddc_type: 0
+deadline: 0
+schedule_by_deadline: 0
+avg_deadline: 0.0001
+capability_third_level: 1
+capability_fourth_level: 0
+magic_inflate: 1
+interarrival_cdf: none
+num_host_types: 13
+hh_tp_rate: {3}
+mice_tp_rate: {4}
+hh_percentage: 0.99
+permutation_tm: 1
+packet_cache_limit: 5
+'''
+
+conf_str_fifo = '''init_cwnd: 12
+max_cwnd: 15
+retx_timeout: 45e-06
+queue_size: 36864
+propagation_delay: 0.0000002
+bandwidth: 40000000000.0
+queue_type: 1
+flow_type: 1
+num_flow: {0}
+flow_trace: ./{1}
+cut_through: 1
+mean_flow_size: 0
+load_balancing: 0
+preemptive_queue: 0
+big_switch: 0
+host_type: 1
+traffic_imbalance: 0
+load: {2}
+reauth_limit: 3
+magic_trans_slack: 1.1
+magic_delay_scheduling: 1
+use_flow_trace: 0
+smooth_cdf: 1
+burst_at_beginning: 0
+capability_timeout: 1.5
+capability_resend_timeout: 9
+capability_initial: 8
+capability_window: 8
+capability_window_timeout: 25
+ddc: 0
+ddc_cpu_ratio: 0.33
+ddc_mem_ratio: 0.33
+ddc_disk_ratio: 0.34
+ddc_normalize: 2
+ddc_type: 0
+deadline: 0
+schedule_by_deadline: 0
+avg_deadline: 0.0001
+capability_third_level: 1
+capability_fourth_level: 0
+magic_inflate: 1
+interarrival_cdf: none
+num_host_types: 13
+permutation_tm: 1
+'''
+
+conf_str_pfabric = '''init_cwnd: 12
+max_cwnd: 15
+retx_timeout: 45e-06
+queue_size: 36864
+propagation_delay: 0.0000002
+bandwidth: 40000000000.0
+queue_type: 2
+flow_type: 2
+num_flow: {0}
+flow_trace: ./{1}
+cut_through: 1
+mean_flow_size: 0
+load_balancing: 0
+preemptive_queue: 0
+big_switch: 0
+host_type: 1
+traffic_imbalance: 0
+load: {2}
+reauth_limit: 3
+magic_trans_slack: 1.1
+magic_delay_scheduling: 1
+use_flow_trace: 0
+smooth_cdf: 1
+burst_at_beginning: 0
+capability_timeout: 1.5
+capability_resend_timeout: 9
+capability_initial: 8
+capability_window: 8
+capability_window_timeout: 25
+ddc: 0
+ddc_cpu_ratio: 0.33
+ddc_mem_ratio: 0.33
+ddc_disk_ratio: 0.34
+ddc_normalize: 2
+ddc_type: 0
+deadline: 0
+schedule_by_deadline: 0
+avg_deadline: 0.0001
+capability_third_level: 1
+capability_fourth_level: 0
+magic_inflate: 1
+interarrival_cdf: none
+num_host_types: 13
+permutation_tm: 1
+'''
+
+conf_str_phost = '''init_cwnd: 2
+max_cwnd: 6
+retx_timeout: 9.50003e-06
+queue_size: 36864
+propagation_delay: 0.0000002
+bandwidth: 40000000000.0
+queue_type: 2
+flow_type: 112