avoid dynamic allocations by using uti static freelist resource, other small cleanups

eddieavd · eddieavd · commit 04e9ef31a4da · 2024-12-05T07:42:58.000+01:00
diff --git a/include/command.hpp b/include/command.hpp
@@ -8,8 +8,6 @@
 
 #include <types.hpp>
 
-#include <uti/container/vector.hpp>
-
 #define FLT_CMD_MAX_COUNT 4
 #define FLT_CMD_MAX_LEN   8
 
@@ -24,8 +22,8 @@ struct report
 } ;
 
 
-IOReturn send_report ( hid_device const & device,              report   const & report  ) ;
-IOReturn send_report ( hid_device const & device, uti::vector< report > const & reports ) ;
+IOReturn send_report ( hid_device const & device,         report   const & report  ) ;
+IOReturn send_report ( hid_device const & device, vector< report > const & reports ) ;
 
 
 } // namespace flt
diff --git a/include/device.hpp b/include/device.hpp
@@ -8,8 +8,6 @@
 
 #include <types.hpp>
 
-#include <uti/container/vector.hpp>
-
 #include <iterator>
 #include <algorithm>
 
@@ -34,9 +32,9 @@ class device_manager
 public:
         device_manager () noexcept : hid_manager_( _create_hid_manager() ) {}
 
-        auto list_devices () -> uti::vector< hid_device >
+        auto list_devices () -> vector< hid_device >
         {
-                uti::vector< hid_device > dev_set ;
+                vector< hid_device > dev_set ;
 
                 CFSetRef device_setref = IOHIDManagerCopyDevices( hid_manager_ ) ;
                 CFIndex count = CFSetGetCount( device_setref ) ;
@@ -61,10 +59,10 @@ class device_manager
                 return dev_set ;
         }
 
-        auto find_known_wheels () -> uti::vector< hid_device >
+        auto find_known_wheels () -> vector< hid_device >
         {
-                uti::vector< hid_device > dev_set = list_devices() ;
-                uti::vector< hid_device > wheels ;
+                vector< hid_device > dev_set = list_devices() ;
+                vector< hid_device > wheels ;
 
                 std::copy_if( dev_set.begin(), dev_set.end(), std::back_inserter( wheels ),
                              [ & ]( hid_device const & dev )
diff --git a/include/types.hpp b/include/types.hpp
@@ -8,6 +8,8 @@
 
 #include <uti/type/traits.hpp>
 #include <uti/container/array.hpp>
+#include <uti/container/vector.hpp>
+#include <uti/allocator/freelist_resource.hpp>
 
 #include <IOKit/hid/IOHIDDevice.h>
 #include <IOKit/hid/IOHIDManager.h>
@@ -21,6 +23,9 @@ using   device_id_t =     uti::u32_t ;
 using  hid_device_t = __IOHIDDevice  ;
 using hid_manager_t = __IOHIDManager ;
 
+template< typename T >
+using vector = uti::vector< T, uti::allocator< T, uti::static_freelist_resource< 1024 * 1024 > > > ;
+
 
 struct hid_device
 {
diff --git a/source/command.cpp b/source/command.cpp
@@ -20,7 +20,7 @@ IOReturn send_report ( hid_device const & device, report const & report )
         return result ;
 }
 
-IOReturn send_report ( hid_device const & device, uti::vector< report > const & reports )
+IOReturn send_report ( hid_device const & device, vector< report > const & reports )
 {
         IOReturn result ;
 

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ IOReturn send_report ( hid_device const & device, report const & report )`
`20`	`20`	`return result ;`
`21`	`21`	`}`
`22`	`22`
`23`		`-IOReturn send_report ( hid_device const & device, uti::vector< report > const & reports )`
	`23`	`+IOReturn send_report ( hid_device const & device, vector< report > const & reports )`
`24`	`24`	`{`
`25`	`25`	`IOReturn result ;`
`26`	`26`