patx/mrhttp-asgi

FIX: Add unpack bytes support for mrpacker

Commit e484658 · MarkReedZ · 2025-02-26T08:59:43-08:00

Changeset

e4846584530e7826e37d5be9a4b5e2c4b8d179a4

Parents

2a96227ce1a08b87eeb22fac28ace114e51ad495

View source at this commit

Comments

No comments yet.

Log in to comment

Diff

diff --git a/gbench/bld b/gbench/bld
index d0e360a..8352837 100755
--- a/gbench/bld
+++ b/gbench/bld
@@ -1,8 +1,8 @@
 #
 #g++ t.cpp -O3 -msse4.2 -mavx2 -std=c++11 -lbenchmark -lpthread -o t
 #g++ tst.cpp -O3 -msse4.2 -mavx2 -std=c++11 -lbenchmark -lpthread -o tst
-#g++ parse.cpp -O3 -msse4.2 -mavx2 -std=c++11 -lbenchmark -lpthread -o parse
+g++ parse.cpp -O3 -msse4.2 -mavx2 -std=c++11 -lbenchmark -lpthread -o parse
 #g++ string.cpp -O0 -msse4.2 -mavx2 -std=c++11 -lbenchmark -lpthread -o string
 #g++ query.cpp -O0 -msse4.2 -mavx2 -std=c++11 -lbenchmark -lpthread -o query
-g++ rand.cpp -O3 -msse4.2 -mavx2 -std=c++11 -lbenchmark -lpthread -o orand
+#g++ rand.cpp -O3 -msse4.2 -mavx2 -std=c++11 -lbenchmark -lpthread -o orand
 
diff --git a/gbench/parse.cpp b/gbench/parse.cpp
index acbea6a..fcd28f0 100644
--- a/gbench/parse.cpp
+++ b/gbench/parse.cpp
@@ -116,7 +116,7 @@ std::size_t slow_hparse(std::string &text) noexcept
   int last = 0;
   int index = 0;
 
-  for (std::uint64_t i = 0; i < text.length(); i++)
+  for (int i = 0; i < text.length(); i++)
   {
     if ( text[i] == ':' ) {
         keys[index] = text.substr( last, i-last );
@@ -1234,13 +1234,13 @@ static void BM_get_session_avx2(benchmark::State& state) {
 
 
 //BENCHMARK(BM_SlowParse);
-BENCHMARK(BM_sse4_get_eol);
-BENCHMARK(BM_my_get_eol);
-//BENCHMARK(BM_my3_header_parse);
-//BENCHMARK(BM_my2_header_parse);
+//BENCHMARK(BM_sse4_get_eol);
+//BENCHMARK(BM_my_get_eol);
+BENCHMARK(BM_my3_header_parse);
+BENCHMARK(BM_my2_header_parse);
 //BENCHMARK(BM_my_header_parse);
-//BENCHMARK(BM_old_header_parse);
-//BENCHMARK(BM_avx2_header_parse);
+BENCHMARK(BM_old_header_parse);
+BENCHMARK(BM_avx2_header_parse);
 //BENCHMARK(BM_adv_token);
 //BENCHMARK(BM_adv_token_avx2);
 //BENCHMARK(BM_get_session);
diff --git a/src/mrhttp/utils/unpack.c b/src/mrhttp/utils/unpack.c
index 17d4075..eacac59 100644
--- a/src/mrhttp/utils/unpack.c
+++ b/src/mrhttp/utils/unpack.c
@@ -1,4 +1,5 @@
 
+
 #include "unpack.h"
 #include "py_defines.h"
 #include <time.h>
@@ -48,6 +49,14 @@ PyObject *decode( char *s, char *end) {
     o = PyUnicode_FromStringAndSize( s, l );
     s += l;
   }
+  else if ( *(s) == 0x6B ) {
+    s++;
+    uint32_t *p = (uint32_t*)s;
+    uint32_t l = *p;
+    s+=4;
+    o = PyBytes_FromStringAndSize( s, l );
+    s += l;
+  }
   else if ( *(s) == 0x61 ) { s += 1; Py_INCREF(Py_True);  o = Py_True; }
   else if ( *(s) == 0x62 ) { s += 1; Py_INCREF(Py_False); o = Py_False; }
   else if ( *(s) == 0x63 ) { 
diff --git a/tst.py b/tst.py
index 316ec00..c07898c 100755
--- a/tst.py
+++ b/tst.py
@@ -1,7 +1,6 @@
 
 import traceback, mrjson
 from mrhttp import app
-import mrpacker
 
 @app.route('/',_type='text')
 def index(r):