Update to v0.5.11

Author: Mysticial

ClientSource/Connection/BotBase.cpp

@@ -15,46 +15,4 @@ namespace PokemonAutomation{
 
 
 
-void BotBaseControllerContext::wait_for_all_requests() const{
-    m_lifetime_sanitizer.check_usage();
-    m_controller.wait_for_all_requests(this);
-}
-void BotBaseControllerContext::cancel_now(){
-    m_lifetime_sanitizer.check_usage();
-    CancellableScope::cancel(nullptr);
-    m_controller.stop_all_commands();
-}
-void BotBaseControllerContext::cancel_lazy(){
-    m_lifetime_sanitizer.check_usage();
-    CancellableScope::cancel(nullptr);
-    m_controller.next_command_interrupt();
-}
-
-bool BotBaseControllerContext::cancel(std::exception_ptr exception) noexcept{
-    m_lifetime_sanitizer.check_usage();
-    if (CancellableScope::cancel(std::move(exception))){
-        return true;
-    }
-    try{
-        m_controller.stop_all_commands();
-    }catch (...){}
-    return false;
-}
-
-bool BotBaseControllerContext::try_issue_request(const BotBaseRequest& request) const{
-    m_lifetime_sanitizer.check_usage();
-    return m_controller.try_issue_request(request, this);
-}
-void BotBaseControllerContext::issue_request(const BotBaseRequest& request) const{
-    m_lifetime_sanitizer.check_usage();
-    m_controller.issue_request(request, this);
-}
-
-BotBaseMessage BotBaseControllerContext::issue_request_and_wait(const BotBaseRequest& request) const{
-    m_lifetime_sanitizer.check_usage();
-    return m_controller.issue_request_and_wait(request, this);
-}
-
-
-
 }

ClientSource/Connection/BotBase.h

@@ -8,7 +8,6 @@
 #define PokemonAutomation_AbstractBotBase_H
 
 #include "Common/Cpp/CancellableScope.h"
-#include "Common/Cpp/LifetimeSanitizer.h"
 
 namespace PokemonAutomation{
 
@@ -73,66 +72,6 @@ class BotBaseController{
 
 
 
-class ControllerContext0 : public CancellableScope{
-public:
-    virtual void wait_for_all_requests() const = 0;
-    virtual void cancel_now() = 0;
-    virtual void cancel_lazy() = 0;
-};
-
-
-//  A wrapper for BotBase that allows for asynchronous cancelling.
-class BotBaseControllerContext final : public ControllerContext0{
-public:
-    using ControllerType = BotBaseController;
-
-public:
-    BotBaseControllerContext(BotBaseController& botbase)
-        : m_controller(botbase)
-    {}
-    BotBaseControllerContext(CancellableScope& parent, BotBaseController& botbase)
-        : m_controller(botbase)
-    {
-        attach(parent);
-    }
-    virtual ~BotBaseControllerContext(){
-        detach();
-    }
-
-
-    virtual void wait_for_all_requests() const override;
-
-    operator BotBaseController&() const{ return m_controller; }
-    BotBaseController& controller() const{ return m_controller; }
-
-    //  Stop all commands in this context now.
-    virtual void cancel_now() override;
-
-    //  Stop the commands in this context, but do it lazily.
-    //  Still will stop new commands from being issued to the device,
-    //  and will tell the device that the next command that is issued
-    //  should replace the command queue.
-    //  This cancel is used when you need continuity from an ongoing
-    //  sequence.
-    virtual void cancel_lazy() override;
-
-
-    virtual bool cancel(std::exception_ptr exception) noexcept override;
-
-
-public:
-    bool try_issue_request(const BotBaseRequest& request) const;
-    void issue_request(const BotBaseRequest& request) const;
-    BotBaseMessage issue_request_and_wait(const BotBaseRequest& request) const;
-
-
-private:
-    BotBaseController& m_controller;
-    LifetimeSanitizer m_lifetime_sanitizer;
-};
-
-
-
 
 
 }

ClientSource/Connection/PABotBase.h

@@ -155,6 +155,7 @@ class PABotBase : public BotBaseController, private PABotBaseConnection{
         const BotBaseRequest& request, bool silent_remove
     );
 
+public:
     virtual bool try_issue_request(
         const BotBaseRequest& request,
         const Cancellable* cancelled
@@ -168,6 +169,7 @@ class PABotBase : public BotBaseController, private PABotBaseConnection{
         const Cancellable* cancelled
     ) override;
 
+private:
     BotBaseMessage wait_for_request(uint64_t seqnum);
 
 private:

ClientSource/Libraries/MessageConverter.cpp

@@ -349,15 +349,6 @@ std::string message_to_string(const BotBaseMessage& message){
 }
 
 
-std::string program_name(uint8_t id){
-    switch (id){
-    case PABB_PID_UNSPECIFIED:              return "Microcontroller Program";
-    case PABB_PID_PABOTBASE_12KB:           return "PABotBase-12KB";
-    case PABB_PID_PABOTBASE_31KB:           return "PABotBase-31KB";
-    default: return "Unknown ID";
-    }
-}
-
 
 
 

ClientSource/Libraries/MessageConverter.h

@@ -16,8 +16,6 @@ void register_message_converter(uint8_t type, MessageConverter converter);
 std::string message_to_string(const BotBaseMessage& message);
 
 
-std::string program_name(uint8_t id);
-
 
 }
 

Common/Cpp/Concurrency/ReverseLockGuard.h

@@ -0,0 +1,40 @@
+/*  Reverse Lock Guard
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#ifndef PokemonAutomation_ReverseLockGuard_H
+#define PokemonAutomation_ReverseLockGuard_H
+
+#include "Common/Cpp/Exceptions.h"
+
+namespace PokemonAutomation{
+
+
+template <class Mutex>
+class ReverseLockGuard{
+public:
+    ReverseLockGuard(Mutex& lock)
+        : m_lock(lock)
+    {
+        if (lock.try_lock()){
+            throw InternalProgramError(
+                nullptr, PA_CURRENT_FUNCTION,
+                "Attempted to unlock an already unlocked lock."
+            );
+        }
+        lock.unlock();
+    }
+    ~ReverseLockGuard(){
+        m_lock.lock();
+    }
+
+
+private:
+    Mutex& m_lock;
+};
+
+
+}
+#endif

Common/Cpp/Containers/AlignedVector.h

@@ -18,13 +18,15 @@ class AlignedVector{
     ~AlignedVector();
     AlignedVector(AlignedVector&& x) noexcept;
     void operator=(AlignedVector&& x) noexcept;
-    AlignedVector(const AlignedVector&);
-    void operator=(const AlignedVector&);
+    AlignedVector(const AlignedVector& x);
+    void operator=(const AlignedVector& x);
 
 public:
     AlignedVector();
     AlignedVector(size_t items);
 
+    void clear() noexcept;
+
 public:
     size_t empty() const{ return m_size == 0; }
     size_t size() const{ return m_size; }
@@ -42,8 +44,6 @@ class AlignedVector{
     void emplace_back(Args&&... args);
     void pop_back();
 
-    void clear();
-
     const Object* begin() const;
     Object* begin();
     const Object* end() const;

Common/Cpp/Containers/AlignedVector.tpp

@@ -11,6 +11,7 @@
 #include <new>
 #include <type_traits>
 #include <utility>
+#include <algorithm>
 #include "Common/Compiler.h"
 #include "AlignedMalloc.h"
 #include "AlignedVector.h"
@@ -59,7 +60,10 @@ AlignedVector<Object>::AlignedVector(const AlignedVector& x)
             break;
         }
     }
-    m_ptr = (Object*)aligned_malloc(m_capacity * sizeof(Object), 64);
+    m_ptr = (Object*)aligned_malloc(
+        m_capacity * sizeof(Object),
+        std::max<size_t>(alignof(Object), 64)
+    );
     if (m_ptr == nullptr){
         throw std::bad_alloc();
     }
@@ -119,6 +123,17 @@ AlignedVector<Object>::AlignedVector(size_t items){
     }
 }
 
+template <typename Object>
+void AlignedVector<Object>::clear() noexcept{
+    if constexpr (std::is_trivially_constructible<Object>::value){
+        m_size = 0;
+    }else{
+        while (m_size > 0){
+            pop_back();
+        }
+    }
+}
+
 template <typename Object>
 template <class... Args>
 void AlignedVector<Object>::emplace_back(Args&&... args){
@@ -132,16 +147,6 @@ template <typename Object>
 void AlignedVector<Object>::pop_back(){
     m_ptr[--m_size].~Object();
 }
-template <typename Object>
-void AlignedVector<Object>::clear(){
-    if constexpr (std::is_trivially_constructible<Object>::value){
-        m_size = 0;
-    }else{
-        while (m_size > 0){
-            pop_back();
-        }
-    }
-}
 
 template <typename Object>
 PA_NO_INLINE void AlignedVector<Object>::expand(){