Merge remote-tracking branch 'upstream' into BDSPMoneyFarmer/ImproveReliability

Author: Boombaastical

.gitignore

@@ -1,6 +1,7 @@
 SerialPrograms/bin/
 
 .vscode
+.qtcreator
 
 discord_social_sdk_win/
 discord_partner_sdk.dll
@@ -73,3 +74,4 @@ CLAUDE.md
 build_*/
 .cache/*
 Packages/*
+

Common/Cpp/StreamConnections/MockDevice.cpp

@@ -15,8 +15,8 @@ using std::cout;
 using std::endl;
 
 #if 1
-#define PABB2_DROP_HOST_TO_DEVICE   0.2
-#define PABB2_DROP_DEVICE_TO_HOST   0.2
+#define PABB2_DROP_HOST_TO_DEVICE   0.01
+#define PABB2_DROP_DEVICE_TO_HOST   0.01
 #else
 #define PABB2_DROP_HOST_TO_DEVICE   0
 #define PABB2_DROP_DEVICE_TO_HOST   0
@@ -98,6 +98,9 @@ size_t MockDevice::device_read_serial(void* data, size_t max_bytes){
     auto iter1 = iter0 + bytes;
     std::copy(iter0, iter1, (uint8_t*)data);
     m_host_to_device_line.erase(iter0, iter1);
+
+//    cout << "device_read_serial(): attempt = " << max_bytes << ", actual = " << bytes << endl;
+
     return bytes;
 }
 

Common/PABotBase2/PABotBase2_PacketParser.c

@@ -7,6 +7,8 @@
 #include "Common/CRC32/pabb_CRC32.h"
 #include "PABotBase2_PacketParser.h"
 
+//#include <stdio.h>
+
 
 const pabb2_PacketHeader* pabb2_PacketParser_pull_bytes(
     pabb2_PacketParser* self,
@@ -27,6 +29,7 @@ const pabb2_PacketHeader* pabb2_PacketParser_pull_bytes(
 
         //  Header is still incomplete.
         if (self->index < MIN_PACKET_SIZE){
+//            printf("Incomplete Header: %d\n", self->index);
             return NULL;
         }
 
@@ -43,20 +46,19 @@ const pabb2_PacketHeader* pabb2_PacketParser_pull_bytes(
 
             //  Magic byte never found.
             if (c == MIN_PACKET_SIZE){
-                self->index = 0;
                 break;
             }
 
             //  Magic byte found.
             if (buffer[c] == PABB2_CONNECTION_MAGIC_NUMBER){
                 //  Shift the buffer up so that the magic byte is at the start.
                 memmove(self->buffer, self->buffer + c, MIN_PACKET_SIZE - c);
-                goto EndLoop;
+                break;
             }
         }
-    }
 
-EndLoop:;
+        self->index -= c;
+    }
 
     //  At this point, we have a complete and valid header.
 
@@ -87,6 +89,7 @@ EndLoop:;
 
     //  Packet is incomplete.
     if (self->index < packet_bytes){
+//        printf("Incomplete Packet: %d\n", packet_bytes);
         return NULL;
     }
 

Common/PABotBase2/PABotBase2_PacketSender.c

@@ -299,7 +299,7 @@ bool pabb2_PacketSender_iterate_retransmits(pabb2_PacketSender* self){
         //  Not old enough.
         if ((uint8_t)(seqnum - packet->magic_number) < PABB2_ConnectionSender_RETRANSMIT_COUNTER){
 #if 0
-            printf("Not old enough.\n");
+            printf("Not old enough: seqnum = %d, packet = %d\n", seqnum, packet->magic_number);
             fflush(stdout);
 #endif
             head++;

Common/PABotBase2/PABotBase2_StreamCoalescer.c

@@ -7,8 +7,8 @@
 #include <string.h>
 #include "PABotBase2_StreamCoalescer.h"
 
-//#include <stdio.h>  //  REMOVE
-//#include "PABotBase2_ConnectionDebug.h" //  REMOVE
+//#include <stdio.h>
+//#include "PABotBase2_ConnectionDebug.h"
 
 void pabb2_StreamCoalescer_init(pabb2_StreamCoalescer* self){
 //    printf("pabb2_StreamCoalescer_init(%p)\n", self);

Common/PABotBase2/PABotbase2_ReliableStreamConnection.c

@@ -4,7 +4,7 @@
  *
  */
 
-#include <stdio.h>  //  REMOVE
+//#include <stdio.h>
 #include "PABotBase2_ConnectionDebug.h"
 #include "PABotbase2_ReliableStreamConnection.h"
 
@@ -44,26 +44,28 @@ void pabb2_ReliableStreamConnection_run_events(pabb2_ReliableStreamConnection* s
     case PABB2_PacketParser_RESULT_VALID:
         break;
     case PABB2_PacketParser_RESULT_INVALID:
-        printf("PABB2_PacketParser_RESULT_INVALID\n");
+//        printf("PABB2_PacketParser_RESULT_INVALID\n");
         pabb2_PacketSender_send_info(
             &self->reliable_sender,
             packet->seqnum,
             PABB2_CONNECTION_OPCODE_INVALID_LENGTH
         );
         return;
     case PABB2_PacketParser_RESULT_CHECKSUM_FAIL:
-        printf("PABB2_PacketParser_RESULT_CHECKSUM_FAIL\n");
+//        printf("PABB2_PacketParser_RESULT_CHECKSUM_FAIL\n");
         pabb2_PacketSender_send_info(
             &self->reliable_sender,
             packet->seqnum,
             PABB2_CONNECTION_OPCODE_INVALID_CHECKSUM_FAIL
         );
         return;
     default:
-        printf("Internal Error: Unrecognized packet state.\n");
+//        printf("Internal Error: Unrecognized packet state.\n");
         return;
     }
 
+//    printf("Device Received: %d\n", packet->opcode);
+
     //  Now handle the different opcodes.
     switch (packet->opcode){
     case PABB2_CONNECTION_OPCODE_ASK_RESET:
@@ -124,10 +126,10 @@ void pabb2_ReliableStreamConnection_run_events(pabb2_ReliableStreamConnection* s
                 pabb2_StreamCoalescer_bytes_available(&self->stream_coalescer)
             );
         }else{
-            printf("Device: Failed to push.\n");
+//            printf("Device: Failed to push.\n");
             pabb2_StreamCoalescer_print(&self->stream_coalescer, true);
         }
-        fflush(stdout);
+//        fflush(stdout);
         return;
     default:
         pabb2_PacketSender_send_info(

SerialPrograms/BuildInstructions/Build-Windows-Qt6.10.0.md

@@ -21,7 +21,7 @@ Unlike with Qt 5.12, there is no offline installer for it. So you have two optio
 
 If you are ok with creating an account with Qt and using their online installer, then use this method.
 
-1. Download the online installer from here: https://www.qt.io/download-qt-Images/
+1. Download the online installer from here: [https://www.qt.io/download-qt-Images/](https://www.qt.io/development/download-qt-installer-oss)
 3. Select the following options: 
     - Qt 6.10.0
         - MSVC 2022 64-bit
@@ -80,3 +80,4 @@ TODO
 [<img src="https://canary.discordapp.com/api/guilds/695809740428673034/widget.png?style=banner2">](https://discord.gg/cQ4gWxN)
 
 
+

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp

@@ -300,7 +300,7 @@ void stress_test(Logger& logger, CancellableScope& scope){
 
     ReliableStreamConnection connection(
         &scope,
-        logger, true,
+        logger, false,
         GlobalThreadPools::unlimited_realtime(),
         device,
         100ms,
@@ -326,6 +326,10 @@ void stress_test(Logger& logger, CancellableScope& scope){
         const char* ptr = data.data();
         size_t left = data.size();
         while (left > 0){
+            if (current_time() - last_print > Seconds(1)){
+                cout << "Bytes Sent = " << bytes_sent + data.size() - left << endl;
+                last_print = current_time();
+            }
 //            scope.wait_for(Milliseconds(rand() % 100));
             size_t sent = connection.send(ptr, left);
             if (sent == 0){
@@ -335,10 +339,6 @@ void stress_test(Logger& logger, CancellableScope& scope){
             left -= sent;
         }
         bytes_sent += data.size();
-        if (current_time() - last_print > Seconds(1)){
-            cout << "Bytes Sent = " << bytes_sent << endl;
-            last_print = current_time();
-        }
         device.push_expected_stream_data(data.data(), data.size());
     }
 }