Fixes for psalm actions and benchmark

Author: cracksalad

bench/benchmark.php

@@ -97,7 +97,7 @@ function printResult(string $label, array $metrics, string $key, int $tabs = 1,
   unset($buf);
 
   // buffer with LZ4
-  if(function_exists('lz4_compress')){
+  if(extension_loaded('lz4')){
     $start = microtime(true);
     $memBefore = memory_get_usage(true);
     $buf = new LargeArrayBuffer(128, compression: LargeArrayBuffer::COMPRESSION_LZ4);
@@ -118,7 +118,7 @@ function printResult(string $label, array $metrics, string $key, int $tabs = 1,
     unset($buf);
   }
 
-  if(function_exists('igbinary_serialize')){
+  if(extension_loaded('igbinary')){
     // normal buffer with igbinary
     $start = microtime(true);
     $memBefore = memory_get_usage(true);
@@ -160,7 +160,7 @@ function printResult(string $label, array $metrics, string $key, int $tabs = 1,
     unset($buf);
 
     // buffer with LZ4 and igbinary
-    if(function_exists('lz4_compress')){
+    if(extension_loaded('lz4')){
       $start = microtime(true);
       $memBefore = memory_get_usage(true);
       $buf = new LargeArrayBuffer(128, serializer: LargeArrayBuffer::SERIALIZER_IGBINARY, compression: LargeArrayBuffer::COMPRESSION_LZ4);
@@ -182,6 +182,70 @@ function printResult(string $label, array $metrics, string $key, int $tabs = 1,
     }
   }
 
+  if(extension_loaded('msgpack')){
+    // normal buffer with msgpack
+    $start = microtime(true);
+    $memBefore = memory_get_usage(true);
+    $buf = new LargeArrayBuffer(128, serializer: LargeArrayBuffer::SERIALIZER_MSGPACK);
+    $bench->bufferMeasurementsFill($buf);
+    $metrics['fill_buffer_mp'][] = [
+      'time' => microtime(true) - $start,
+      'mem' => memory_get_usage(true) - $memBefore,
+      'size' => $buf->getSize()
+    ];
+    
+    $start = microtime(true);
+    $bench->bufferMeasurementsIterate($buf);
+    $metrics['iterate_buffer_mp'][] = [
+      'time' => microtime(true) - $start,
+      'mem' => memory_get_usage(true) - $memBefore,
+      'size' => $buf->getSize()
+    ];
+    unset($buf);
+    
+    // buffer with GZIP and msgpack
+    $start = microtime(true);
+    $memBefore = memory_get_usage(true);
+    $buf = new LargeArrayBuffer(128, serializer: LargeArrayBuffer::SERIALIZER_MSGPACK, compression: LargeArrayBuffer::COMPRESSION_GZIP);
+    $bench->bufferMeasurementsFill($buf);
+    $metrics['fill_buffer_gz_mp'][] = [
+      'time' => microtime(true) - $start,
+      'mem' => memory_get_usage(true) - $memBefore,
+      'size' => $buf->getSize()
+    ];
+    
+    $start = microtime(true);
+    $bench->bufferMeasurementsIterate($buf);
+    $metrics['iterate_buffer_gz_mp'][] = [
+      'time' => microtime(true) - $start,
+      'mem' => memory_get_usage(true) - $memBefore,
+      'size' => $buf->getSize()
+    ];
+    unset($buf);
+    
+    // buffer with LZ4 and msgpack
+    if(extension_loaded('lz4')){
+      $start = microtime(true);
+      $memBefore = memory_get_usage(true);
+      $buf = new LargeArrayBuffer(128, serializer: LargeArrayBuffer::SERIALIZER_MSGPACK, compression: LargeArrayBuffer::COMPRESSION_LZ4);
+      $bench->bufferMeasurementsFill($buf);
+      $metrics['fill_buffer_lz4_mp'][] = [
+        'time' => microtime(true) - $start,
+        'mem' => memory_get_usage(true) - $memBefore,
+        'size' => $buf->getSize()
+      ];
+      
+      $start = microtime(true);
+      $bench->bufferMeasurementsIterate($buf);
+      $metrics['iterate_buffer_lz4_mp'][] = [
+        'time' => microtime(true) - $start,
+        'mem' => memory_get_usage(true) - $memBefore,
+        'size' => $buf->getSize()
+      ];
+      unset($buf);
+    }
+  }
+  
   unset($bench);
 }
 
@@ -191,17 +255,27 @@ function printResult(string $label, array $metrics, string $key, int $tabs = 1,
 printResult('Iterate over buffer', $metrics, 'iterate_buffer', 3, true);
 printResult('Fill buffer (GZIP)', $metrics, 'fill_buffer_gz', 3, true);
 printResult('Iterate over buffer (GZIP)', $metrics, 'iterate_buffer_gz', 2, true);
-if(function_exists('lz4_compress')){
+if(extension_loaded('lz4')){
   printResult('Fill buffer (LZ4)', $metrics, 'fill_buffer_lz4', 3, true);
   printResult('Iterate over buffer (LZ4)', $metrics, 'iterate_buffer_lz4', 2, true);
 }
-if(function_exists('igbinary_serialize')){
+if(extension_loaded('igbinary')){
   printResult('Fill buffer (igbinary)', $metrics, 'fill_buffer_ig', 2, true);
   printResult('Iterate over buffer (igbinary)', $metrics, 'iterate_buffer_ig', 1, true);
   printResult('Fill buffer (GZIP, igbinary)', $metrics, 'fill_buffer_gz_ig', 2, true);
   printResult('Iterate over buffer (GZIP, igbinary)', $metrics, 'iterate_buffer_gz_ig', 1, true);
-  if(function_exists('lz4_compress')){
+  if(extension_loaded('lz4')){
     printResult('Fill buffer (LZ4, igbinary)', $metrics, 'fill_buffer_lz4_ig', 2, true);
     printResult('Iterate over buffer (LZ4, igbinary)', $metrics, 'iterate_buffer_lz4_ig', 1, true);
   }
 }
+if(extension_loaded('msgpack')){
+  printResult('Fill buffer (msgpack)', $metrics, 'fill_buffer_mp', 2, true);
+  printResult('Iterate over buffer (msgpack)', $metrics, 'iterate_buffer_mp', 1, true);
+  printResult('Fill buffer (GZIP, msgpack)', $metrics, 'fill_buffer_gz_mp', 2, true);
+  printResult('Iterate over buffer (GZIP, msgpack)', $metrics, 'iterate_buffer_gz_mp', 1, true);
+  if(extension_loaded('lz4')){
+    printResult('Fill buffer (LZ4, msgpack)', $metrics, 'fill_buffer_lz4_mp', 2, true);
+    printResult('Iterate over buffer (LZ4, msgpack)', $metrics, 'iterate_buffer_lz4_mp', 1, true);
+  }
+}

psalm.baseline.xml

@@ -4,6 +4,8 @@
     <UndefinedFunction>
       <code>lz4_compress($serialized)</code>
       <code>lz4_uncompress($compressed)</code>
+      <code>msgpack_serialize($item)</code>
+      <code>msgpack_unserialize($this->current)</code>
     </UndefinedFunction>
   </file>
 </files>

test/LargeArrayBufferTest.php

@@ -56,7 +56,10 @@ public static function provideConfig(): \Generator {
     }
   }
 
-  #[DataProvider('provideConfig')]
+  /**
+   * @dataProvider provideConfig
+   */
+  //#[DataProvider('provideConfig')]
   public function testReadWrite(int $serializer, int $compression): void {
     $o = self::getObject();
     $buf = new LargeArrayBuffer(serializer: $serializer, compression: $compression);
@@ -66,7 +69,10 @@ public function testReadWrite(int $serializer, int $compression): void {
     $this->assertEquals($o, $buf->current());
   }
 
-  #[DataProvider('provideConfig')]
+  /**
+   * @dataProvider provideConfig
+   */
+  //#[DataProvider('provideConfig')]
   public function testLoop(int $serializer, int $compression): void {
     $count = 1500;
     $buf = new LargeArrayBuffer(serializer: $serializer, compression: $compression);