mp: rework flb_mp_count() using 'mpack' backend

Signed-off-by: Eduardo Silva <[email protected]>

Author: edsiper

include/fluent-bit/flb_mp.h

@@ -21,9 +21,6 @@
 #ifndef FLB_MP_H
 #define FLB_MP_H
 
-#include <msgpack.h>
-
 int flb_mp_count(const void *data, size_t bytes);
-int flb_mp_count_zone(const void *data, size_t bytes, msgpack_zone *zone);
 
 #endif

src/flb_mp.c

@@ -19,51 +19,19 @@
  */
 
 #include <fluent-bit/flb_info.h>
-#include <fluent-bit/flb_pack.h>
-#include <msgpack.h>
+#include <mpack/mpack.h>
 
-static inline int mp_count(const void *data, size_t bytes, msgpack_zone *zone)
+int flb_mp_count(const void *data, size_t bytes)
 {
-    int c = 0;
-    int ret;
-    size_t off = 0;
-    msgpack_zone *t = NULL;
-    msgpack_object obj;
-
-    if (!zone) {
-        t = msgpack_zone_new(MSGPACK_ZONE_CHUNK_SIZE);
-        if (!t) {
-            return -1;
-        }
-    }
-    else {
-        t = zone;
-    }
-
-    do {
-        ret = msgpack_unpack(data, bytes, &off, t, &obj);
-        if (ret == MSGPACK_UNPACK_SUCCESS || ret == MSGPACK_UNPACK_EXTRA_BYTES) {
-            c++;
-        }
-        else {
-            break;
-        }
-    } while (1);
+    int count = 0;
+    mpack_reader_t reader;
 
-    msgpack_zone_clear(t);
-    if (t != zone) {
-        msgpack_zone_free(t);
+    mpack_reader_init_data(&reader, (const char *) data, bytes);
+    while (mpack_reader_remaining(&reader, NULL) > 0) {
+        count++;
+        mpack_discard(&reader);
     }
 
-    return c;
-}
-
-int flb_mp_count(const void *data, size_t bytes)
-{
-    return mp_count(data, bytes, NULL);
-}
-
-int flb_mp_count_zone(const void *data, size_t bytes, msgpack_zone *zone)
-{
-    return mp_count(data, bytes, zone);
+    mpack_reader_destroy(&reader);
+    return count;
 }