More PABotBase2.

Author: Mysticial

Common/Cpp/StreamConnections/MockDevice.cpp

@@ -14,7 +14,7 @@
 using std::cout;
 using std::endl;
 
-#if 0
+#if 1
 #define PABB2_DROP_HOST_TO_DEVICE   0.01
 #define PABB2_DROP_DEVICE_TO_HOST   0.01
 #else

Common/Cpp/StreamConnections/ReliableStreamConnection.cpp

@@ -232,10 +232,7 @@ void ReliableStreamConnection::on_recv(const void* data, size_t bytes){
         cout << "ReliableStreamConnection::on_recv(): " << bytes << endl;
     }
 #endif
-    m_parser.push_bytes(
-        this, &ReliableStreamConnection::on_packet,
-        (const uint8_t*)data, bytes
-    );
+    m_parser.push_bytes(*this, (const uint8_t*)data, bytes);
 }
 
 

Common/Cpp/StreamConnections/ReliableStreamConnection.h

@@ -27,6 +27,7 @@ class ReliableStreamConnection final
     : public CancellableScope
     , public PokemonAutomation::StreamConnection
     , public PABotBase2::StreamConnection
+    , private PABotBase2::PacketRunner
     , private StreamListener
 {
     using PacketHeader = PABotBase2::PacketHeader;
@@ -86,14 +87,10 @@ class ReliableStreamConnection final
     //  Receive
 
     virtual void on_recv(const void* data, size_t bytes) override;
-    static void on_packet(void* context, const PacketHeader* packet){
-        ReliableStreamConnection& self = *(ReliableStreamConnection*)context;
-        self.on_packet(packet);
-    }
     virtual size_t recv(void* data, size_t max_bytes) override{
         return 0;
     }
-    void on_packet(const PacketHeader* packet);
+    virtual void on_packet(const PacketHeader* packet) override;
 
     void process_RET_RESET(const PacketHeader* packet);
     void process_RET_VERSION(const PacketHeader* packet);

Common/PABotBase2/ConnectionLayer/PABotBase2_ConnectionDebug.cpp

@@ -115,7 +115,7 @@ void PacketSender::print(bool ascii) const{
     std::cout << "Buffer Head:       " << m_buffer_head << std::endl;
     std::cout << "Buffer Tail:       " << m_buffer_tail << std::endl;
     std::cout << "Stream Offset:     " << m_stream_offset << std::endl;
-    std::cout << "Retransmit Seqnum: " << m_retransmit_seqnum << std::endl;
+    std::cout << "Retransmit Seqnum: " << (int)m_retransmit_seqnum << std::endl;
     for (uint8_t seqnum = m_slot_head; seqnum != m_slot_tail; seqnum++){
         size_t offset = ~m_offsets[seqnum & SLOTS_MASK];
         std::cout << "Offset: " << offset << std::endl;

Common/PABotBase2/ConnectionLayer/PABotBase2_PacketParser.cpp

@@ -121,7 +121,7 @@ const PacketHeader* PacketParser::pull_bytes(){
 }
 
 void PacketParser::push_bytes(
-    void* context, pabb2_fp_PacketRunner packet_runner,
+    PacketRunner& packet_runner,
     const uint8_t* data, size_t bytes
 ){
 //    cout << "pabb2_PacketParser_push_bytes(): " << bytes << endl;
@@ -196,7 +196,7 @@ void PacketParser::push_bytes(
                 : PABB2_PacketParser_RESULT_CHECKSUM_FAIL;
         }
 
-        packet_runner(context, header);
+        packet_runner.on_packet(header);
         index = 0;
     }
 

Common/PABotBase2/ConnectionLayer/PABotBase2_PacketParser.h

@@ -7,13 +7,12 @@
 #ifndef PokemonAutomation_PABotBase2_ConnectionLayer_PacketParser_H
 #define PokemonAutomation_PABotBase2_ConnectionLayer_PacketParser_H
 
-#include "PABotBase2_StreamInterface.h"
+#include "../PABotBase2_StreamInterface.h"
 #include "PABotBase2_Connection.h"
 
-namespace PokemonAutomation{
-namespace PABotBase2{
-
-
+#ifdef PABB2_SIZING_OVERRIDE
+#include "PABotBase2_Config.h"
+#else
 
 //  Maximum size of incoming packet + overhead.
 //  Min Size: sizeof(largest header) + sizeof(uint32_t) + 1
@@ -22,14 +21,22 @@ namespace PABotBase2{
 #define PABB2_MAX_INCOMING_PACKET_SIZE      ((uint16_t)128)
 #endif
 
+#endif
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
 
 
 #define PABB2_PacketParser_RESULT_VALID             0
 #define PABB2_PacketParser_RESULT_INVALID           1
 #define PABB2_PacketParser_RESULT_CHECKSUM_FAIL     2
 
 
-typedef void (*pabb2_fp_PacketRunner)(void* context, const PacketHeader* data);
+struct PacketRunner{
+    virtual void on_packet(const PacketHeader* data) = 0;
+};
 
 
 struct PacketParser{
@@ -62,7 +69,7 @@ struct PacketParser{
     //  "packet_runner" multiple times.
     //
     void push_bytes(
-        void* context, pabb2_fp_PacketRunner packet_runner,
+        PacketRunner& packet_runner,
         const uint8_t* data, size_t bytes
     );
 

Common/PABotBase2/ConnectionLayer/PABotBase2_PacketSender.h

@@ -7,25 +7,32 @@
 #ifndef PokemonAutomation_PABotBase2_ConnectionLayer_PacketSender_H
 #define PokemonAutomation_PABotBase2_ConnectionLayer_PacketSender_H
 
-#include "PABotBase2_StreamInterface.h"
+#include "../PABotBase2_StreamInterface.h"
 #include "PABotBase2_Connection.h"
 
-namespace PokemonAutomation{
-namespace PABotBase2{
-
+#ifdef PABB2_SIZING_OVERRIDE
+#include "PABotBase2_Config.h"
+#else
 
+//  Must be power-of-two. (max 64)
 #ifndef PABB2_PacketSender_SLOTS
-#define PABB2_PacketSender_SLOTS        128     //  Must be power-of-two, fits into uint8_t. (max 128)
+#define PABB2_PacketSender_SLOTS                64
 #endif
 
+//  Must fit into size_t.
 #ifndef PABB2_PacketSender_BUFFER_SIZE
-#define PABB2_PacketSender_BUFFER_SIZE  32768   //  Must fit into size_t.
+#define PABB2_PacketSender_BUFFER_SIZE          16384
 #endif
 
 #ifndef PABB2_PacketSender_RETRANSMIT_COUNTER
 #define PABB2_PacketSender_RETRANSMIT_COUNTER   2
 #endif
 
+#endif
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
 
 
 

Common/PABotBase2/ConnectionLayer/PABotBase2_StreamCoalescer.h

@@ -9,18 +9,24 @@
 
 #include "PABotBase2_Connection.h"
 
-namespace PokemonAutomation{
-namespace PABotBase2{
-
+#ifdef PABB2_SIZING_OVERRIDE
+#include "PABotBase2_Config.h"
+#else
 
+//  Must be power-of-two. (max 64)
 #ifndef PABB2_StreamCoalescer_SLOTS
-#define PABB2_StreamCoalescer_SLOTS         128     //  Must be power-of-two, fits into uint8_t. (max 128)
+#define PABB2_StreamCoalescer_SLOTS         64
 #endif
 
+//  Must be power-of-two, fits into uint16_t. (max 32768)
 #ifndef PABB2_StreamCoalescer_BUFFER_SIZE
-#define PABB2_StreamCoalescer_BUFFER_SIZE   32768   //  Must be power-of-two, fits into uint16_t. (max 32768)
+#define PABB2_StreamCoalescer_BUFFER_SIZE   16384
 #endif
 
+#endif
+
+namespace PokemonAutomation{
+namespace PABotBase2{
 
 
 

Common/PABotBase2/ConnectionLayer/PABotbase2_ReliableStreamConnection.h

@@ -7,7 +7,7 @@
 #ifndef PokemonAutomation_PABotBase2_ConnectionLayer_ReliableStreamConnection_H
 #define PokemonAutomation_PABotBase2_ConnectionLayer_ReliableStreamConnection_H
 
-#include "PABotBase2_StreamInterface.h"
+#include "../PABotBase2_StreamInterface.h"
 #include "PABotBase2_PacketSender.h"
 #include "PABotBase2_PacketParser.h"
 #include "PABotBase2_StreamCoalescer.h"