.gitignore

@@ -10,3 +10,5 @@ MANIFEST
 prrt.cpython*.so
 prrt.so
 .ipynb_checkpoints/
+.idea/
+.venv/

.gitlab-ci.yml

@@ -22,9 +22,9 @@ build:prrt:
     - which cmake
     - which gcc
     - which g++
-    - pip3 list | grep Cython
-    - pip3 list | grep numpy
-    - CC=gcc-5 CXX=g++-5 cmake . -DPRRT_TESTS=1
+    - pip3 list --format=legacy | grep Cython
+    - pip3 list --format=legacy | grep numpy
+    - CC=gcc-5 CXX=g++-5 cmake .
     - make
 
 build:container:
@@ -65,6 +65,8 @@ test:prrt_functional:
   tags:
     - bash
   script:
+    - CC=gcc-5 CXX=g++-5 cmake . -DPRRT_TESTS=1
+    - make
     - exec ./prrtTests
 
 test:prrt_python_bindings:

Pipfile

+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[dev-packages]
+
+[packages]
+Cython = "*"
+jupyter = "*"
+numpy = "*"
+pandas = "*"
+matplotlib = "*"
+ruamel-yaml = "*"
+scikit-learn = "*"
+graphviz = "*"
+prrt = {editable = true, path = "."}
+
+[requires]
+python_version = "3.6"

dissect/prrt.lua

@@ -21,20 +21,23 @@ local pf_idx = ProtoField.uint8("prrt.index", "Index")
 local pf_seqN = ProtoField.uint16("prrt.sequenceNumber", "Sequence Number")
 
 local pf_data = ProtoField.new("Data", "prrt.data", ftypes.BYTES, base.NONE)
-local pf_data_length = ProtoField.uint32("prrt.data.length", "Length")
 local pf_data_timestamp = ProtoField.uint32("prrt.data.timestamp", "Timestamp")
-local pf_data_groupRTprop = ProtoField.uint32("prrt.data.grouprtprop", "Group RTprop")
+local pf_data_btl_pace = ProtoField.uint32("prrt.data.btl_pace", "Bottleneck Pace")
+local pf_data_length = ProtoField.uint32("prrt.data.length", "Length")
+local pf_data_RTprop = ProtoField.uint32("prrt.data.RTprop", "RTprop")
 local pf_data_packettimeout = ProtoField.uint32("prrt.data.packettimeout", "Packet Timeout")
+local pf_data_btlDatarate = ProtoField.uint32("prrt.data.btl_datarate", "Bottleneck Datarate")
 
 local pf_red = ProtoField.new("Redundancy", "prrt.redundancy", ftypes.BYTES, base.NONE)
-local pf_red_baseSeqN = ProtoField.uint16("prrt.redundancy.baseSequenceNumber", "Base Sequence Number", base.DEC)
 local pf_red_timestamp = ProtoField.uint32("prrt.redundancy.timestamp", "Timestamp")
+local pf_red_btl_pace = ProtoField.uint32("prrt.redundancy.btl_pace", "Bottleneck Pace")
+local pf_red_baseSeqN = ProtoField.uint16("prrt.redundancy.baseSequenceNumber", "Base Sequence Number", base.DEC)
 local pf_red_n = ProtoField.uint8("prrt.redundancy.n", "n")
 local pf_red_k = ProtoField.uint8("prrt.redundancy.k", "k")
 
 local pf_fb = ProtoField.new("Feedback", "prrt.feedback", ftypes.BYTES, base.NONE)
-local pf_fb_groupRTT = ProtoField.uint32("prrt.feedback.groupRTT", "Group RTT")
 local pf_fb_ftt = ProtoField.uint32("prrt.feedback.FTT", "FTT")
+local pf_fb_btlPace = ProtoField.uint32("prrt.feedback.btlPace", "Bottleneck pace")
 local pf_fb_erasurecount = ProtoField.uint16("prrt.feedback.erasureCount", "Erasure count")
 local pf_fb_packetcount = ProtoField.uint16("prrt.feedback.packetCount", "Packet count")
 local pf_fb_gaplength = ProtoField.uint16("prrt.feedback.gapLength", "Gap length")
@@ -52,20 +55,23 @@ prrt_proto.fields = {
     pf_seqN,
 
     pf_data,
-    pf_data_length,
     pf_data_timestamp,
-    pf_data_groupRTprop,
+    pf_data_btl_pace,
+    pf_data_length,
+    pf_data_RTprop,
     pf_data_packettimeout,
+    pf_data_btlDatarate,
 
     pf_red,
-    pf_red_baseSeqN,
     pf_red_timestamp,
+    pf_red_btl_pace,
+    pf_red_baseSeqN,
     pf_red_n,
     pf_red_k,
 
     pf_fb,
-    pf_fb_groupRTT,
     pf_fb_ftt,
+    pf_fb_btlPace,
     pf_fb_erasurecount,
     pf_fb_packetcount,
     pf_fb_gaplength,
@@ -111,10 +117,12 @@ local PRRT_MIN_SIZE = 8
 -- create sub-dissectors for different types
 local function dissect_data(buffer, pinfo, root)
     local tree = root:add(pf_data, buffer:range(0))
-    tree:add(pf_data_length, buffer:range(0,4))
-    tree:add(pf_data_timestamp, buffer:range(4,4))
-    tree:add(pf_data_groupRTprop, buffer:range(8,4))
-    tree:add(pf_data_packettimeout, buffer:range(12,4))
+    tree:add(pf_data_timestamp, buffer:range(0,4))
+    tree:add(pf_data_btl_pace, buffer:range(4,4))
+    tree:add(pf_data_length, buffer:range(8,4))
+    tree:add(pf_data_RTprop, buffer:range(12,4))
+    tree:add(pf_data_packettimeout, buffer:range(16,4))
+    tree:add(pf_data_btlDatarate, buffer:range(20,4))
 
     local label = "[D] Idx=" .. getIndex() .. " Len=" .. getDataLength()
     tree:set_text(label)
@@ -123,10 +131,11 @@ end
 
 local function dissect_redundancy(buffer, pinfo, root)
     local tree = root:add(pf_red, buffer:range(0))
-    tree:add(pf_red_baseSeqN, buffer:range(0,2))
-    tree:add(pf_red_timestamp, buffer:range(2,4))
-    tree:add(pf_red_n, buffer:range(6,1))
-    tree:add(pf_red_k, buffer:range(7,1))
+    tree:add(pf_red_timestamp, buffer:range(0,4))
+    tree:add(pf_red_btl_pace, buffer:range(4,4))
+    tree:add(pf_red_baseSeqN, buffer:range(8,2))
+    tree:add(pf_red_n, buffer:range(10,1))
+    tree:add(pf_red_k, buffer:range(11,1))
 
     local label = "[R] Idx=" .. getIndex() .. " b=" .. getRedBaseSeqNo() .. " n=" .. getRedN() .. " k=" .. getRedK()
     tree:set_text(label)
@@ -135,8 +144,8 @@ end
 
 local function dissect_feedback(buffer, pinfo, root)
     local tree = root:add(pf_fb, buffer:range(0))
-    tree:add(pf_fb_groupRTT, buffer:range(0,4))
-    tree:add(pf_fb_ftt, buffer:range(4,4))
+    tree:add(pf_fb_ftt, buffer:range(0,4))
+    tree:add(pf_fb_btlPace, buffer:range(4,4))
     tree:add(pf_fb_erasurecount, buffer:range(8,2))
     tree:add(pf_fb_packetcount, buffer:range(10,2))
     tree:add(pf_fb_gaplength, buffer:range(12,2))
@@ -205,4 +214,3 @@ function prrt_proto.prefs_changed()
         end
     end
 end
-

dissect/wireshark-1.4.6/packet-prrt.c

@@ -87,7 +87,7 @@ static int hf_prrt_payload = -1;        /* payload with arbitrary length, depend
 static int hf_prrt_receiver_addr = -1;  /* 32 bits IP address of the receiver */
 static int hf_prrt_rtt_probe = -1;      /* 32 bits timestamp of most recent data packet plus delay since reception of this packet. */
 static int hf_prrt_plr = -1;            /* 32 bits packet loss rate measured at the receiver. */
-static int hf_prrt_bw_est = -1;         /* 32 bits bandwidth estimated at the receiver. */
+static int hf_prrt_datarate_est = -1;         /* 32 bits datarate estimated at the receiver. */
 /* The following two fields are the payload of PRRT feedback packet (packet type: 3). */
 static int hf_prrt_packet_no = -1;      /* 16 bits packet no of the first lost packet. */
 static int hf_prrt_retr_round = -1;     /* 16 bits retransmission round of the first lost. (first transmission is 0.) */
@@ -323,7 +323,7 @@ dissect_prrt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       offset += 4;
       proto_tree_add_item(prrt_tree, hf_prrt_plr, tvb, offset, 4, FALSE);
       offset += 4;
-      proto_tree_add_item(prrt_tree, hf_prrt_bw_est, tvb, offset, 4, FALSE);
+      proto_tree_add_item(prrt_tree, hf_prrt_datarate_est, tvb, offset, 4, FALSE);
       offset += 4;
 
       if (len == 24) {
@@ -364,7 +364,7 @@ dissect_prrt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       offset += 4;
       proto_tree_add_item(prrt_tree, hf_prrt_plr, tvb, offset, 4, FALSE);
       offset += 4;
-      proto_tree_add_item(prrt_tree, hf_prrt_bw_est, tvb, offset, 4, FALSE);
+      proto_tree_add_item(prrt_tree, hf_prrt_datarate_est, tvb, offset, 4, FALSE);
       offset += 4;
 
       if (len == 28) {
@@ -484,10 +484,10 @@ proto_register_prrt(void)
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "The packet loss rate measured at the receiver, stored in general PRRT feedback header", HFILL }
     },
-    { &hf_prrt_bw_est,
-      { "Estimated Bandwidth", "prrt.feedback.bw",
+    { &hf_prrt_datarate_est,
+      { "Estimated Datarate", "prrt.feedback.datarate",
       FT_UINT32, BASE_DEC, NULL, 0x0,
-      "The bandwidth estimated at the receiver, stored in general PRRT feedback header", HFILL }
+      "The datarate estimated at the receiver, stored in general PRRT feedback header", HFILL }
     },
     { &hf_prrt_packet_no,
       { "Packet No", "prrt.feedback.packetno",

dissect/wireshark-1.6.1/packet-prrt.c

@@ -92,7 +92,7 @@ static int hf_prrt_payload = -1;        /* payload with arbitrary length, depend
 static int hf_prrt_receiver_addr = -1;  /* 32 bits IP address of the receiver */
 static int hf_prrt_rtt_probe = -1;      /* 32 bits timestamp of most recent data packet plus delay since reception of this packet. */
 static int hf_prrt_plr = -1;            /* 32 bits packet loss rate measured at the receiver. */
-static int hf_prrt_bw_est = -1;         /* 32 bits bandwidth estimated at the receiver. */
+static int hf_prrt_datarate_est = -1;         /* 32 bits datarate estimated at the receiver. */
 /* The following two fields are the payload of PRRT feedback packet (packet type: 3). */
 static int hf_prrt_packet_no = -1;      /* 16 bits packet no of the first lost packet. */
 static int hf_prrt_retr_round = -1;     /* 16 bits retransmission round of the first lost. (first transmission is 0.) */
@@ -361,7 +361,7 @@ dissect_prrt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       offset += 4;
       proto_tree_add_item(prrt_tree, hf_prrt_plr, tvb, offset, 4, FALSE);
       offset += 4;
-      proto_tree_add_item(prrt_tree, hf_prrt_bw_est, tvb, offset, 4, FALSE);
+      proto_tree_add_item(prrt_tree, hf_prrt_datarate_est, tvb, offset, 4, FALSE);
       offset += 4;
 
       if (len == 24) {
@@ -402,7 +402,7 @@ dissect_prrt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       offset += 4;
       proto_tree_add_item(prrt_tree, hf_prrt_plr, tvb, offset, 4, FALSE);
       offset += 4;
-      proto_tree_add_item(prrt_tree, hf_prrt_bw_est, tvb, offset, 4, FALSE);
+      proto_tree_add_item(prrt_tree, hf_prrt_datarate_est, tvb, offset, 4, FALSE);
       offset += 4;
 
       if (len == 28) {
@@ -524,10 +524,10 @@ proto_register_prrt(void)
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "The packet loss rate measured at the receiver, stored in general PRRT feedback header", HFILL }
     },
-    { &hf_prrt_bw_est,
-      { "Estimated Bandwidth", "prrt.feedback.bw",
+    { &hf_prrt_datarate_est,
+      { "Estimated Datarate", "prrt.feedback.datarate",
       FT_UINT32, BASE_DEC, NULL, 0x0,
-      "The bandwidth estimated at the receiver, stored in general PRRT feedback header", HFILL }
+      "The datarate estimated at the receiver, stored in general PRRT feedback header", HFILL }
     },
     { &hf_prrt_packet_no,
       { "Packet No", "prrt.feedback.packetno",

dissect/wireshark-2.0.0/packet-prrt.c

@@ -74,7 +74,7 @@ static int hf_prrt_gap = -1;
 static int hf_prrt_ngap = -1;
 static int hf_prrt_burst = -1;
 static int hf_prrt_nburst = -1;
-static int hf_prrt_bw_est = -1;
+static int hf_prrt_datarate_est = -1;
 static int hf_prrt_buf_fb = -1;
 
 /* Payload */
@@ -206,7 +206,7 @@ static void dissect_prrt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                         offset += 2;
                         proto_tree_add_item(prrt_tree, hf_prrt_nburst, tvb, offset, 2, FALSE);
                         offset += 2;
-                        proto_tree_add_item(prrt_tree, hf_prrt_bw_est, tvb, offset, 4, FALSE);
+                        proto_tree_add_item(prrt_tree, hf_prrt_datarate_est, tvb, offset, 4, FALSE);
                         offset += 4;
                         proto_tree_add_item(prrt_tree, hf_prrt_buf_fb, tvb, offset, 4, FALSE);
                 } else if(packet_type == 4) {
@@ -236,7 +236,7 @@ static void dissect_prrt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                         offset += 2;
                         proto_tree_add_item(prrt_tree, hf_prrt_nburst, tvb, offset, 2, FALSE);
                         offset += 2;
-                        proto_tree_add_item(prrt_tree, hf_prrt_bw_est, tvb, offset, 4, FALSE);
+                        proto_tree_add_item(prrt_tree, hf_prrt_datarate_est, tvb, offset, 4, FALSE);
                         offset += 4;
                         proto_tree_add_item(prrt_tree, hf_prrt_buf_fb, tvb, offset, 4, FALSE);
                 } else {
@@ -292,8 +292,8 @@ void proto_register_prrt(void)
                   { "Aggregated Burst Length", "prrt.feedback.burst", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
                 { &hf_prrt_nburst,
                   { "Burst Count", "prrt.feedback.nburst", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
-                { &hf_prrt_bw_est,
-                  { "Estimated Bandwidth", "prrt.feedback.bw", FT_UINT32, BASE_DEC, NULL, 0x0, "The bandwidth estimated at the receiver, stored in general PRRT feedback header", HFILL }},
+                { &hf_prrt_datarate_est,
+                  { "Estimated Datarate", "prrt.feedback.datarate", FT_UINT32, BASE_DEC, NULL, 0x0, "The datarate estimated at the receiver, stored in general PRRT feedback header", HFILL }},
                 { &hf_prrt_buf_fb,
                   { "Buffer Feedback", "prrt.feedback.buf_fb", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
                 { &hf_prrt_payload,

docker/Dockerfile

-FROM gcc:5
+FROM gcc:8
 
 MAINTAINER Andreas Schmidt <schmidt@nt.uni-saarland.de>
 
@@ -7,6 +7,8 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install --yes --force-yes \
     bc \
     cmake \
+    iperf3 \
+    psmisc \
     traceroute \
     tshark
 
@@ -14,10 +16,11 @@ COPY CMakeLists.txt /prrt/
 COPY prrt /prrt/prrt
 COPY tests /prrt/tests
 COPY docker/entrypoint.sh /
+COPY docker/sysctl.conf /etc/sysctl.d/01-disable-ipv6.conf
 
 WORKDIR /prrt
 
-RUN cmake . \
+RUN cmake . -DCMAKE_BUILD_TYPE=DEBUG \
     && make
 ENV PATH /prrt:$PATH
 

docker/Dockerfile_tcp

-FROM gcc:5
+FROM gcc:8
 
 MAINTAINER Andreas Schmidt <schmidt@nt.uni-saarland.de>
 
@@ -7,6 +7,8 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install --yes --force-yes \
     bc \
     cmake \
+    iperf3 \
+    psmisc \
     traceroute \
     tshark
 
@@ -17,7 +19,7 @@ COPY docker/entrypoint.sh /
 
 WORKDIR /prrt
 
-RUN cmake -DTCP=1 . \
+RUN cmake -DTCP=1 -DCMAKE_BUILD_TYPE=DEBUG . \
     && make
 ENV PATH /prrt:$PATH
 

docker/entrypoint.sh

-#!/bin/bash
+#!/bin/sh
 
 dev=eth0
 
@@ -34,11 +34,11 @@ case $key in
     shift
     shift
     ;;
-    -T|--threadpinning)
+    -T|--threadpinning|-U)
     PRRT+=("$1")
     shift
     ;;
-    -p|--port|-r|--rounds|-s|--size|-R|--rcvbuf|-S|--sndbuf|-o|--output|-a|--appdelay)
+    -p|--port|-r|--rounds|-s|--size|-R|--rcvbuf|-S|--sndbuf|-o|--output|-a|--appdelay|-j|--appjitter)
     PRRT+=("$1 $2")
     shift
     shift
@@ -56,16 +56,14 @@ NETEM_PARAMS="${NETEM[@]}"
 echo "Starting Wireshark."
 tshark -i eth0 -w $OUTPUT.pcap &
 TSHARK_PID=$!
-sleep 5
+sleep 2
 
 start=$(date +%s.%N);
 echo "Checking reachability of $TARGET."
-until ping -c1 $TARGET &>/dev/null; sleep 1; do :; done
+until ping -c1 $TARGET &>/dev/null; do sleep 1; done
 dur=$(echo "$(date +%s.%N) - $start" | bc);
-printf "Reachable after %.6f seconds\n" $dur
 
-traceroute $TARGET > $OUTPUT.tr
-echo "Traceroute done."
+printf "Reachable after %.6f seconds\n" $dur
 
 if [[ "$command" == "sender" || "$command" == "time-sender" ]]; then
     echo "Delaying sender start."
@@ -73,11 +71,12 @@ else
     echo "Delaying receiver start."
 fi
 
+start=$(date +%s.%N);
 echo "Running PRRT with command: \"$command $PRRT_PARAMS\" and link parameters: \"$NETEM_PARAMS\""
-
-tc qdisc add dev $dev root netem $NETEM_PARAMS
-/prrt/$command $PRRT_PARAMS
-echo "Done."
-tc qdisc del dev $dev root
-
+trap 'echo "Caught SIGINT."; echo "$(ps -a)"; killall -SIGINT $command' INT
+LOG=$(/prrt/$command $PRRT_PARAMS 2>&1)
+echo "Exit status: $?"
+printf "$LOG\n"
+dur=$(echo "$(date +%s.%N) - $start" | bc);
+printf "Done after %.6f seconds\n" $dur
 kill $TSHARK_PID

docker/sysctl.conf

+net.ipv6.conf.all.disable_ipv6 = 1
+net.ipv6.conf.default.disable_ipv6 = 1
+net.ipv6.conf.lo.disable_ipv6 = 1

examples/receiver.py

@@ -3,7 +3,7 @@ import prrt
 
 port = int(sys.argv[1])
 
-s = prrt.PrrtSocket(("127.0.0.1", port))
+s = prrt.PrrtSocket(("0.0.0.0", port))
 
 while True:
     d, addr = s.recv()

examples/sender.py

@@ -5,7 +5,7 @@ host = sys.argv[1]
 port = int(sys.argv[2])
 localport = int(sys.argv[3])
 
-s = prrt.PrrtSocket(("127.0.1.1", localport), maximum_payload_size=150)
+s = prrt.PrrtSocket(("0.0.0.0", localport), maximum_payload_size=150)
 s.connect((host, port))
 
 for i in range(10):

prrt/CMakeLists.txt

@@ -25,11 +25,14 @@ add_executable(receiver receiver.c)
 add_executable(time-sender time-sender.c)
 add_executable(time-receiver time-receiver.c)
 
-target_link_libraries(sender LINK_PUBLIC PRRT UTIL ${CMAKE_THREAD_LIBS_INIT})
-target_link_libraries(receiver LINK_PUBLIC PRRT UTIL ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(sender LINK_PUBLIC prrt_shared prrtUtil_shared ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(receiver LINK_PUBLIC prrt_shared prrtUtil_shared ${CMAKE_THREAD_LIBS_INIT})
 
-target_link_libraries(time-sender LINK_PUBLIC PRRT UTIL ${CMAKE_THREAD_LIBS_INIT})
-target_link_libraries(time-receiver LINK_PUBLIC PRRT UTIL ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(time-sender LINK_PUBLIC prrt_shared prrtUtil_shared ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(time-receiver LINK_PUBLIC prrt_shared prrtUtil_shared ${CMAKE_THREAD_LIBS_INIT})
 
 add_executable(refcount refcount.c)
-target_link_libraries(refcount LINK_PUBLIC PRRT UTIL ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(refcount LINK_PUBLIC prrt_shared prrtUtil_shared ${CMAKE_THREAD_LIBS_INIT})
+
+install(DIRECTORY ./ DESTINATION include/prrt
+        FILES_MATCHING PATTERN "*.h")
\ No newline at end of file

prrt/cprrt.pxd

@@ -120,13 +120,14 @@ cdef extern from "proto/socket.h":
     ctypedef prrtSocket PrrtSocket
 
     cdef PrrtSocket* PrrtSocket_create(const uint32_t maximum_payload_size, const uint32_t target_delay)
-    bint PrrtSocket_bind(PrrtSocket *sock_ptr, const_char *ipAddress, const uint16_t port)
+    int PrrtSocket_bind(PrrtSocket *sock_ptr, const_char *ipAddress, const uint16_t port)
+    bint PrrtSocket_enable_hardware_timestamping(PrrtSocket *s, const_char *interface_name)
+    
     int PrrtSocket_close(const PrrtSocket *sock_ptr)
     int PrrtSocket_connect(PrrtSocket *sock_ptr, const_char *host, const uint16_t port)
     int PrrtSocket_send_sync(PrrtSocket *sock_ptr, const uint8_t *data, const size_t data_len)
     int PrrtSocket_send_async(PrrtSocket *sock_ptr, const uint8_t *data, const size_t data_len)
 
-
     int32_t PrrtSocket_recv(PrrtSocket *sock_ptr, void *buf_ptr, sockaddr* addr) nogil
     int32_t PrrtSocket_receive_asap(PrrtSocket *s, void *buf_ptr, sockaddr* addr) nogil
     int32_t PrrtSocket_receive_asap_wait(PrrtSocket *s, void *buf_ptr, sockaddr* addr) nogil
@@ -146,11 +147,11 @@ cdef extern from "proto/socket.h":
     uint32_t PrrtSocket_get_rtprop_fwd(PrrtSocket *socket)
     float PrrtSocket_get_plr_fwd(PrrtSocket *socket)
     uint32_t PrrtSocket_get_delivery_rate_fwd(PrrtSocket *socket)
-    uint32_t PrrtSocket_get_btlbw_fwd(PrrtSocket *s);
-    uint32_t PrrtSocket_get_btlbw_back(PrrtSocket *s);
+    uint32_t PrrtSocket_get_btldatarate_fwd(PrrtSocket *s);
+    uint32_t PrrtSocket_get_btldatarate_back(PrrtSocket *s);
 
     uint32_t PrrtSocket_get_bbr_state(PrrtSocket *s)
-    uint64_t PrrtSocket_get_full_bw(PrrtSocket *s)
+    uint64_t PrrtSocket_get_full_datarate(PrrtSocket *s)
     bint PrrtSocket_get_filled_pipe(PrrtSocket *s)
     uint32_t PrrtSocket_get_cycle_index(PrrtSocket *s)
     float PrrtSocket_get_pacing_gain(PrrtSocket *s)
@@ -187,4 +188,3 @@ cdef extern from "util/pipe.h":
 cdef extern from "util/mpsc_queue.h":
     ctypedef struct MPSCQueue:
         pass
-

prrt/defines.h

@@ -30,8 +30,8 @@
 
 #define GF_BITS 8
 
-#define K_START 4
-#define N_START 7
+#define K_START 1
+#define N_START 1
 #define N_P_START 1
 
 #define RRT_ALPHA 0.125

prrt/proto/CMakeLists.txt

@@ -9,6 +9,8 @@ set (PRRT_SOURCES ../defines.h
         stores/dataPacketStore.c stores/dataPacketStore.h
         stores/deliveredPacketTable.c stores/deliveredPacketTable.h
         stores/inFlightPacketStore.c stores/inFlightPacketStore.h
+        stores/pace.c stores/pace.h
+        stores/paceFilter.c stores/paceFilter.h
         stores/packetTimeoutTable.c stores/packetTimeoutTable.h
         stores/packetDeliveryStore.c stores/packetDeliveryStore.h
         stores/receptionTable.c stores/receptionTable.h
@@ -26,6 +28,19 @@ if (XLAP)
     set(PRRT_SOURCES ${PRRT_SOURCES} ../xlap/xlap.c ../xlap/xlap.h)
 endif()
 
-add_library(PRRT ${PRRT_SOURCES})
+add_library(prrt_obj OBJECT ${PRRT_SOURCES})
+set_property(TARGET prrt_obj PROPERTY POSITION_INDEPENDENT_CODE 1)
 
-target_link_libraries(PRRT rt)
+
+add_library(prrt_static STATIC $<TARGET_OBJECTS:prrt_obj>)
+target_link_libraries(prrt_static rt)
+set_target_properties(prrt_static PROPERTIES OUTPUT_NAME "prrt")
+
+add_library(prrt_shared SHARED $<TARGET_OBJECTS:prrt_obj>)
+target_link_libraries(prrt_shared rt)
+set_target_properties(prrt_shared PROPERTIES OUTPUT_NAME "prrt")
+
+install(TARGETS prrt_static prrt_shared
+        RUNTIME DESTINATION bin
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib)

prrt/proto/bbr.c

@@ -9,7 +9,7 @@ prrtByteCount_t BBR_Inflight(BBR* bbr, double gain)
     if (bbr->rtprop == RTprop_Inf)
         return bbr->initial_cwnd; /* no valid RTT samples yet */
     uint32_t quanta = bbr->mps;
-    uint32_t estimated_bdp = (uint32_t) round((((double)bbr->bw) * bbr->rtprop) / (1000 * 1000));
+    uint32_t estimated_bdp = (uint32_t) round((((double)bbr->datarate) * bbr->rtprop) / (1000 * 1000));
     return (uint32_t)(gain * estimated_bdp + quanta);
 }
 
@@ -20,7 +20,7 @@ void BBR_EnterStartup(BBR* bbr)
     bbr->cwnd_gain = BBRHighGain;
 }
 
-void BBR_UpdateBtlBw(BBR* bbr, PrrtRateSample* rs, PrrtPacketTracking* tracking)
+void BBR_UpdateBtlDatarate(BBR* bbr, PrrtRateSample* rs, PrrtPacketTracking* tracking)
 {
     if (tracking->delivered >= bbr->next_round_delivered) {
         bbr->next_round_delivered = tracking->delivered;
@@ -30,9 +30,9 @@ void BBR_UpdateBtlBw(BBR* bbr, PrrtRateSample* rs, PrrtPacketTracking* tracking)
         bbr->round_start = false;
     }
     uint32_t delivery_rate_Bps = (uint32_t)((float) rs->delivery_rate);
-    if ((delivery_rate_Bps >= bbr->bw || !rs->is_app_limited) && delivery_rate_Bps != 0) {
-        bbr->bw = (uint32_t)WindowedFilter_push(bbr->btlBwFilter, delivery_rate_Bps);
-        debug(DEBUG_BBR, "Current BtlBw: %u, RS delivery rate: %u", bbr->bw, delivery_rate_Bps);
+    if ((delivery_rate_Bps >= bbr->datarate || !rs->is_app_limited) && delivery_rate_Bps != 0) {
+        bbr->datarate = (uint32_t)WindowedFilter_push(bbr->btlDatarateFilter, delivery_rate_Bps);
+        debug(DEBUG_BBR, "Current BtlDatarate: %u, RS delivery rate: %u", bbr->datarate, delivery_rate_Bps);
     }
 }
 
@@ -40,13 +40,13 @@ void BBR_CheckFullPipe(BBR* bbr, PrrtRateSample* rs)
 {
     if (bbr->filled_pipe || !bbr->round_start || rs->is_app_limited)
         return;  // no need to check for a full pipe now
-    if (bbr->bw >= bbr->full_bw * PROBE_GAIN) {  // BBR.BtlBw still growing?
-        bbr->full_bw = bbr->bw;    // record new baseline level
-        bbr->full_bw_count = 0;
+    if (bbr->datarate >= bbr->full_datarate * PROBE_GAIN) {  // BBR.BtlDatarate still growing?
+        bbr->full_datarate = bbr->datarate;    // record new baseline level
+        bbr->full_datarate_count = 0;
         return;
     }
-    bbr->full_bw_count++; // another round w/o much growth
-    if (bbr->full_bw_count >= 3)
+    bbr->full_datarate_count++; // another round w/o much growth
+    if (bbr->full_datarate_count >= 3)
         bbr->filled_pipe = true;
 }
 
@@ -71,13 +71,13 @@ void BBR_AdvanceCyclePhase(BBR* bbr)
 }
 
 void BBR_CheckCyclePhase(BBR* bbr, prrtByteCount_t bytes_lost, prrtByteCount_t prior_inflight) {
-    if (bbr->state == PROBE_BW && BBR_IsNextCyclePhase(bbr, bytes_lost, prior_inflight))
+    if (bbr->state == PROBE_DR && BBR_IsNextCyclePhase(bbr, bytes_lost, prior_inflight))
         BBR_AdvanceCyclePhase(bbr);
 }
 
-void BBR_EnterProbeBW(BBR* bbr)
+void BBR_EnterProbeDR(BBR* bbr)
 {
-    bbr->state = PROBE_BW;
+    bbr->state = PROBE_DR;
     bbr->pacing_gain = 1;
     bbr->cwnd_gain = 2;
     bbr->cycle_index = (uint8_t)(BBRGainCycleLen - 1 - (random() % 7));
@@ -93,13 +93,13 @@ void BBR_CheckDrain(BBR* bbr, prrtByteCount_t bytes_inflight)
         bbr->cwnd_gain = BBRHighGain;    // maintain cwnd
     }
     if (bbr->state == DRAIN && bytes_inflight <= BBR_Inflight(bbr, 1.0))
-        BBR_EnterProbeBW(bbr);  // we estimate queue is drained
+        BBR_EnterProbeDR(bbr);  // we estimate queue is drained
 }
 
 void BBR_ExitProbeRTT(BBR* bbr)
 {
     if (bbr->filled_pipe)
-        BBR_EnterProbeBW(bbr);
+        BBR_EnterProbeDR(bbr);
     else
         BBR_EnterStartup(bbr);
 }
@@ -167,7 +167,7 @@ void BBR_CheckProbeRTT(BBR *bbr, PrrtPacketTracking *tracking) {
 
 void BBR_UpdateModelAndState(BBR *bbr, PrrtRateSample *rs, PrrtPacketTracking *packetTracking, prrtTimedelta_t rtt)
 {
-    BBR_UpdateBtlBw(bbr, rs, packetTracking);
+    BBR_UpdateBtlDatarate(bbr, rs, packetTracking);
     BBR_CheckCyclePhase(bbr, packetTracking->bytes_lost, packetTracking->prior_inflight);
     BBR_CheckFullPipe(bbr, rs);
     BBR_CheckDrain(bbr, packetTracking->pipe);
@@ -217,9 +217,9 @@ void BBR_SetCwnd(BBR* bbr, PrrtPacketTracking* packetTracking)
 
 void BBR_SetPacingRateWithGain(BBR* bbr, double pacing_gain)
 {
-    double rate = (pacing_gain * ((double)bbr->bw));
-    debug(DEBUG_BBR, "Current rate: %f, Pacing gain: %f, BtlBw: %u, Calc Rate: %f, Filled pipe: %u", bbr->pacing_rate,
-          pacing_gain, bbr->bw, rate, bbr->filled_pipe);
+    double rate = (pacing_gain * ((double)bbr->datarate));
+    debug(DEBUG_BBR, "Current rate: %f, Pacing gain: %f, BtlDatarate: %u, Calc Rate: %f, Filled pipe: %u", bbr->pacing_rate,
+          pacing_gain, bbr->datarate, rate, bbr->filled_pipe);
     if (rate != 0 && (bbr->filled_pipe || rate > bbr->pacing_rate))
         bbr->pacing_rate = rate;
 }
@@ -310,7 +310,7 @@ BBR* BBR_Init(prrtByteCount_t maximum_payload_size)
     bbr->min_pipe_cwnd = 4 * maximum_payload_size;
     bbr->initial_cwnd = 4 * maximum_payload_size;
     bbr->has_seen_rtt = false;
-    bbr->btlBwFilter = WindowedFilter_create(true, 10);
+    bbr->btlDatarateFilter = WindowedFilter_create(true, 10);
     bbr->rtprop = RTprop_Inf;
     bbr->rtprop_stamp = PrrtClock_get_current_time_us();
     bbr->probe_rtt_done_stamp = 0;
@@ -328,12 +328,12 @@ BBR* BBR_Init(prrtByteCount_t maximum_payload_size)
 
     //Init full pipe
     bbr->filled_pipe = false;
-    bbr->full_bw = 0;
-    bbr->full_bw_count = 0;
+    bbr->full_datarate = 0;
+    bbr->full_datarate_count = 0;
 
     //Init pacing rate
-    double nominal_bandwidth = bbr->initial_cwnd / (bbr->has_seen_rtt ? bbr->rtprop : 1000);
-    bbr->pacing_rate = bbr->pacing_gain * nominal_bandwidth;
+    double nominal_datarate = bbr->initial_cwnd / (bbr->has_seen_rtt ? bbr->rtprop : 1000);
+    bbr->pacing_rate = bbr->pacing_gain * nominal_datarate;
 
     BBR_EnterStartup(bbr);
 
@@ -346,7 +346,7 @@ BBR* BBR_Init(prrtByteCount_t maximum_payload_size)
 
 void BBR_destroy(BBR* bbr)
 {
-    WindowedFilter_destroy(bbr->btlBwFilter);
+    WindowedFilter_destroy(bbr->btlDatarateFilter);
     check(pthread_mutex_destroy(&bbr->lock) == 0, "lock destroy failed.");
     free(bbr);
     return;
@@ -376,14 +376,14 @@ prrtByteCount_t BBR_getCwnd(BBR* bbr)
     return 0;
 }
 
-prrtDeliveryRate_t BBR_getBtlBw(BBR* bbr)
+prrtDeliveryRate_t BBR_getBtlDatarate(BBR* bbr)
 {
     check(pthread_mutex_lock(&bbr->lock) == 0, "Lock failed.");
-    prrtDeliveryRate_t res = bbr->bw;
+    prrtDeliveryRate_t res = bbr->datarate;
     check(pthread_mutex_unlock(&bbr->lock) == 0, "Unlock failed.");
     return res;
     error:
-    PERROR("BBR_getBtlBw failed.")
+    PERROR("BBR_getBtlDatarate failed.")
     return 0;
 }
 
@@ -448,9 +448,9 @@ bool BBR_getRoundStart(BBR* bbr) {
     return 0;
 }
 
-prrtByteCount_t BBR_getFullBw(BBR* bbr) {
+prrtByteCount_t BBR_getFullDatarate(BBR* bbr) {
     check(pthread_mutex_lock(&bbr->lock) == 0, "Lock failed.");
-    prrtByteCount_t res = bbr->full_bw;
+    prrtByteCount_t res = bbr->full_datarate;
     check(pthread_mutex_unlock(&bbr->lock) == 0, "Unlock failed.");
     return res;
     error: