Commit 02539561 authored by Andreas Schmidt's avatar Andreas Schmidt
Browse files

Fix BtlBw bindings.

parent 06afdefd

prrt/proto/bbr.c

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ uint32_t BBR_getCwnd(BBR* bbr) 
    return bbr->cwnd;

}



uint32_t BBR_getBtlBw(BBR* bbr)

prrtDeliveryRate_t BBR_getBtlBw(BBR* bbr)

{

    return bbr->bw;

}

prrt/proto/bbr.h

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ typedef struct bbr { 


    uint32_t send_quantum;



    uint32_t bw;

    prrtDeliveryRate_t bw;



    WindowedFilter* btlBwFilter;

} BBR;
@@ -77,7 +77,7 @@ void BBR_destroy(BBR* bbr); 


uint32_t BBR_getPacingRate(BBR* bbr);

uint32_t BBR_getCwnd(BBR* bbr);

uint32_t BBR_getBtlBw(BBR* bbr);

prrtDeliveryRate_t BBR_getBtlBw(BBR* bbr);

uint32_t BBR_getRTProp(BBR* bbr);



#endif //PRRT_BBR_H

prrt/proto/channelStateInformation.c

+0 −10
Original line number Diff line number Diff line
@@ -17,12 +17,6 @@ PrrtChannelStateInformation * PrrtChannelStateInformation_create() 
    csi->rtprop_filter_length_us = 2 * 1000 * 1000; // 2 seconds

    csi->deliveryRate = 0;



    csi->btlbw = 0;

    csi->btlbw_next_round_delivered = 0;

    csi->btlbw_round_start = false;

    csi->btlbw_round_count = 0;

    csi->btlbw_filter_length = 10;



    csi->appLimited = 0;

    csi->plr = 0.0;

    return csi;
@@ -89,10 +83,6 @@ prrtDeliveryRate_t PrrtChannelStateInformation_get_delivery_rate(PrrtChannelStat 
    return csi->deliveryRate;

}



prrtDeliveryRate_t PrrtChannelStateInformation_get_btlbw(PrrtChannelStateInformation *csi) {

    return csi->btlbw;

}



bool PrrtChannelStateInformation_get_app_limited(PrrtChannelStateInformation *csi) {

    return csi->appLimited;

}
 
 No newline at end of file

prrt/proto/channelStateInformation.h

+0 −7
Original line number Diff line number Diff line
@@ -17,12 +17,6 @@ typedef struct prrtChannelStateInformation { 


    prrtDeliveryRate_t deliveryRate;



    prrtDeliveryRate_t btlbw;

    prrtByteCount_t btlbw_next_round_delivered;

    bool btlbw_round_start;

    uint32_t btlbw_round_count;

    uint8_t btlbw_filter_length;



    bool appLimited;

} PrrtChannelStateInformation;
@@ -30,7 +24,6 @@ PrrtChannelStateInformation* PrrtChannelStateInformation_create(void); 
void PrrtChannelStateInformation_update_rtprop(PrrtChannelStateInformation *csi, prrtTimedelta_t rtprop);

prrtTimedelta_t PrrtChannelStateInformation_get_rtprop(PrrtChannelStateInformation *csi);

prrtDeliveryRate_t PrrtChannelStateInformation_get_delivery_rate(PrrtChannelStateInformation *csi);

prrtDeliveryRate_t PrrtChannelStateInformation_get_btlbw(PrrtChannelStateInformation *csi);

bool PrrtChannelStateInformation_get_app_limited(PrrtChannelStateInformation *csi);



prrtPacketLossRate_t PrrtChannelStateInformation_get_plr(PrrtChannelStateInformation* csi);

prrt/proto/socket.c

+2 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ PrrtSocket *PrrtSocket_create(const bool is_sender, prrtTimedelta_t target_delay 
    PrrtSocket *s = (PrrtSocket *) calloc(1, sizeof(PrrtSocket));

    check_mem(s);



    s->nextSendTime = 0;



    s->isSender = is_sender;

    s->isHardwareTimestamping = false;
@@ -597,7 +598,7 @@ prrtDeliveryRate_t PrrtSocket_get_delivery_rate(PrrtSocket *s) { 
}



prrtDeliveryRate_t PrrtSocket_get_btlbw(PrrtSocket *s) {

    return PrrtChannelStateInformation_get_btlbw(s->receiver->csi);

    return BBR_getBtlBw(s->receiver->bbr);

}



bool PrrtSocket_get_app_limited(PrrtSocket *s) {