Merge branch 'develop' into feature/congestionControl

prrt/proto/processes/dataReceiver.c

@@ -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

@@ -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

@@ -46,27 +46,29 @@ 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);
-    packetStore->outstandingPackets = BPTree_delete(packetStore->outstandingPackets, seqNum);
-    packetStore->packetQueueSize--;
+    PrrtPacket* outstanding_packet = (PrrtPacket*) BPTree_get(packetStore->outstandingPackets, seqNum);
+    if(outstanding_packet != NULL) {
+        packetStore->outstandingPackets = BPTree_delete(packetStore->outstandingPackets, seqNum);
+        packetStore->packetQueueSize--;
 
-    // TODO: Cleanup and loss marking. Make this more approriate with a "timeout".
-    List *packetStateList = List_create();
-    if(seqNum >= SEQNO_SPACE/2) {
-        BPTree_get_range(packetStore->outstandingPackets, packetStateList, seqNum - (SEQNO_SPACE / 2), seqNum - 1);
-    } else {
-        BPTree_get_range(packetStore->outstandingPackets, packetStateList, 0, seqNum - 1);
-        BPTree_get_range(packetStore->outstandingPackets, packetStateList, seqNum + (SEQNO_SPACE / 2), SEQNO_SPACE - 1);
-    }
+        // TODO: Cleanup and loss marking. Make this more approriate with a "timeout".
+        List *packetStateList = List_create();
+        if(seqNum >= SEQNO_SPACE/2) {
+            BPTree_get_range(packetStore->outstandingPackets, packetStateList, seqNum - (SEQNO_SPACE / 2), seqNum - 1);
+        } else {
+            BPTree_get_range(packetStore->outstandingPackets, packetStateList, 0, seqNum - 1);
+            BPTree_get_range(packetStore->outstandingPackets, packetStateList, seqNum + (SEQNO_SPACE / 2), SEQNO_SPACE - 1);
+        }
 
-    while (List_count(packetStateList) > 0) {
-        PrrtPacket *packet = List_shift(packetStateList);
-        lostBytes += packet->payloadLength;
-        packetStore->outstandingPackets = BPTree_delete(packetStore->outstandingPackets, packet->sequenceNumber);
-        PrrtPacket_destroy(packet);
+        while (List_count(packetStateList) > 0) {
+            PrrtPacket *packet = List_shift(packetStateList);
+            lostBytes += packet->payloadLength;
+            packetStore->outstandingPackets = BPTree_delete(packetStore->outstandingPackets, packet->sequenceNumber);
+            PrrtPacket_destroy(packet);
+        }
+        PrrtPacket_destroy(outstanding_packet);
+        List_destroy(packetStateList);
     }
-    List_destroy(packetStateList);
     return lostBytes;
 }