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

Merge branch 'develop' into feature/congestionControl

parents c1f3364f ba373eae

prrt/proto/processes/dataReceiver.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ void *receive_data_loop(void *ptr) { 
        struct timespec packet_recv_timestamp;

        uint64_t packet_recv_cyclestamp = 0;

        receive_from_socket(s, buffer, &n, &remote, &addrlen, &packet_recv_timestamp, &packet_recv_cyclestamp);

        if (!atomic_load_explicit(&s->closing, memory_order_acquire)) {

        if (atomic_load_explicit(&s->closing, memory_order_acquire)) {

            break;

        }

prrt/proto/receiver.c

+0 −1
Original line number Diff line number Diff line
@@ -302,7 +302,6 @@ void PrrtReceiver_wait_for_space(PrrtReceiver *receiver) { 
    pthread_cond_timedwait(&receiver->wait_for_space, &receiver->lock, &deadline);

    check(pthread_mutex_unlock(&receiver->lock) == 0, "Unlock failed.");

    return;



    error:

    PERROR("Mutex error.%s", "");

    return;

prrt/proto/stores/inFlightPacketStore.c

+20 −18
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ PrrtPacket* PrrtInFlightPacketStore_get_first_packet_before(PrrtInFlightPacketSt 
prrtByteCount_t PrrtInFlightPacketStore_remove_outstanding_packet(PrrtInFlightPacketStore *packetStore, BPTreeKey_t seqNum)

{

    prrtByteCount_t lostBytes = 0;

    PrrtPacket* value = (PrrtPacket*) BPTree_get(packetStore->outstandingPackets, seqNum);

    PrrtPacket_destroy(value);

    PrrtPacket* outstanding_packet = (PrrtPacket*) BPTree_get(packetStore->outstandingPackets, seqNum);

    if(outstanding_packet != NULL) {

        packetStore->outstandingPackets = BPTree_delete(packetStore->outstandingPackets, seqNum);

        packetStore->packetQueueSize--;
@@ -66,7 +66,9 @@ prrtByteCount_t PrrtInFlightPacketStore_remove_outstanding_packet(PrrtInFlightPa 
            packetStore->outstandingPackets = BPTree_delete(packetStore->outstandingPackets, packet->sequenceNumber);

            PrrtPacket_destroy(packet);

        }

        PrrtPacket_destroy(outstanding_packet);

        List_destroy(packetStateList);

    }

    return lostBytes;

}