msgpack 1.3.0 → 1.6.0

data/ext/msgpack/unpacker_class.c

@@ -33,35 +33,58 @@ static VALUE eUnexpectedTypeError;
 static VALUE eUnknownExtTypeError;
 static VALUE mTypeError;  // obsoleted. only for backward compatibility. See #86.
 
-#define UNPACKER(from, name) \
-    msgpack_unpacker_t *name = NULL; \
-    Data_Get_Struct(from, msgpack_unpacker_t, name); \
-    if(name == NULL) { \
-        rb_raise(rb_eArgError, "NULL found for " # name " when shouldn't be."); \
-    }
+static VALUE sym_symbolize_keys;
+static VALUE sym_freeze;
+static VALUE sym_allow_unknown_ext;
 
-static void Unpacker_free(msgpack_unpacker_t* uk)
+static void Unpacker_free(void *ptr)
 {
+    msgpack_unpacker_t* uk = ptr;
     if(uk == NULL) {
         return;
     }
-    msgpack_unpacker_ext_registry_destroy(&uk->ext_registry);
+    msgpack_unpacker_ext_registry_release(uk->ext_registry);
     _msgpack_unpacker_destroy(uk);
     xfree(uk);
 }
 
-static void Unpacker_mark(msgpack_unpacker_t* uk)
+static void Unpacker_mark(void *ptr)
 {
+    msgpack_unpacker_t* uk = ptr;
     msgpack_unpacker_mark(uk);
-    msgpack_unpacker_ext_registry_mark(&uk->ext_registry);
+    msgpack_unpacker_ext_registry_mark(uk->ext_registry);
+}
+
+static size_t Unpacker_memsize(const void *ptr)
+{
+    size_t total_size = sizeof(msgpack_unpacker_t);
+
+    const msgpack_unpacker_t* uk = ptr;
+    if (uk->ext_registry) {
+        total_size += sizeof(msgpack_unpacker_ext_registry_t) / (uk->ext_registry->borrow_count + 1);
+    }
+
+    total_size += (uk->stack->depth + 1) * sizeof(msgpack_unpacker_stack_t);
+
+    return total_size + msgpack_buffer_memsize(&uk->buffer);
 }
 
+const rb_data_type_t unpacker_data_type = {
+    .wrap_struct_name = "msgpack:unpacker",
+    .function = {
+        .dmark = Unpacker_mark,
+        .dfree = Unpacker_free,
+        .dsize = Unpacker_memsize,
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 VALUE MessagePack_Unpacker_alloc(VALUE klass)
 {
-    msgpack_unpacker_t* uk = ZALLOC_N(msgpack_unpacker_t, 1);
+    msgpack_unpacker_t* uk;
+    VALUE self = TypedData_Make_Struct(klass, msgpack_unpacker_t, &unpacker_data_type, uk);
     _msgpack_unpacker_init(uk);
-
-    VALUE self = Data_Wrap_Struct(klass, Unpacker_mark, Unpacker_free, uk);
+    uk->self = self;
     return self;
 }
 
@@ -77,9 +100,6 @@ VALUE MessagePack_Unpacker_initialize(int argc, VALUE* argv, VALUE self)
         VALUE v = argv[0];
         if(rb_type(v) == T_HASH) {
             options = v;
-            if(rb_type(options) != T_HASH) {
-                rb_raise(rb_eArgError, "expected Hash but found %s.", rb_obj_classname(options));
-            }
         } else {
             io = v;
         }
@@ -87,7 +107,7 @@ VALUE MessagePack_Unpacker_initialize(int argc, VALUE* argv, VALUE self)
     } else if(argc == 2) {
         io = argv[0];
         options = argv[1];
-        if(rb_type(options) != T_HASH) {
+        if(options != Qnil && rb_type(options) != T_HASH) {
             rb_raise(rb_eArgError, "expected Hash but found %s.", rb_obj_classname(options));
         }
 
@@ -95,9 +115,8 @@ VALUE MessagePack_Unpacker_initialize(int argc, VALUE* argv, VALUE self)
         rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..2)", argc);
     }
 
-    UNPACKER(self, uk);
+    msgpack_unpacker_t *uk = MessagePack_Unpacker_get(self);
 
-    msgpack_unpacker_ext_registry_init(&uk->ext_registry);
     uk->buffer_ref = MessagePack_Buffer_wrap(UNPACKER_BUFFER_(uk), self);
 
     MessagePack_Buffer_set_options(UNPACKER_BUFFER_(uk), io, options);
@@ -105,10 +124,13 @@ VALUE MessagePack_Unpacker_initialize(int argc, VALUE* argv, VALUE self)
     if(options != Qnil) {
         VALUE v;
 
-        v = rb_hash_aref(options, ID2SYM(rb_intern("symbolize_keys")));
+        v = rb_hash_aref(options, sym_symbolize_keys);
         msgpack_unpacker_set_symbolized_keys(uk, RTEST(v));
 
-        v = rb_hash_aref(options, ID2SYM(rb_intern("allow_unknown_ext")));
+        v = rb_hash_aref(options, sym_freeze);
+        msgpack_unpacker_set_freeze(uk, RTEST(v));
+
+        v = rb_hash_aref(options, sym_allow_unknown_ext);
         msgpack_unpacker_set_allow_unknown_ext(uk, RTEST(v));
     }
 
@@ -117,17 +139,23 @@ VALUE MessagePack_Unpacker_initialize(int argc, VALUE* argv, VALUE self)
 
 static VALUE Unpacker_symbolized_keys_p(VALUE self)
 {
-    UNPACKER(self, uk);
+    msgpack_unpacker_t *uk = MessagePack_Unpacker_get(self);
     return uk->symbolize_keys ? Qtrue : Qfalse;
 }
 
+static VALUE Unpacker_freeze_p(VALUE self)
+{
+    msgpack_unpacker_t *uk = MessagePack_Unpacker_get(self);
+    return uk->freeze ? Qtrue : Qfalse;
+}
+
 static VALUE Unpacker_allow_unknown_ext_p(VALUE self)
 {
-    UNPACKER(self, uk);
+    msgpack_unpacker_t *uk = MessagePack_Unpacker_get(self);
     return uk->allow_unknown_ext ? Qtrue : Qfalse;
 }
 
-static void raise_unpacker_error(int r)
+NORETURN(static void raise_unpacker_error(int r))
 {
     switch(r) {
     case PRIMITIVE_EOF:
@@ -139,6 +167,7 @@ static void raise_unpacker_error(int r)
     case PRIMITIVE_UNEXPECTED_TYPE:
         rb_raise(eUnexpectedTypeError, "unexpected type");
     case PRIMITIVE_UNEXPECTED_EXT_TYPE:
+    // rb_bug("unexpected extension type");
         rb_raise(eUnknownExtTypeError, "unexpected extension type");
     default:
         rb_raise(eUnpackError, "logically unknown error %d", r);
@@ -147,13 +176,13 @@ static void raise_unpacker_error(int r)
 
 static VALUE Unpacker_buffer(VALUE self)
 {
-    UNPACKER(self, uk);
+    msgpack_unpacker_t *uk = MessagePack_Unpacker_get(self);
     return uk->buffer_ref;
 }
 
 static VALUE Unpacker_read(VALUE self)
 {
-    UNPACKER(self, uk);
+    msgpack_unpacker_t *uk = MessagePack_Unpacker_get(self);
 
     int r = msgpack_unpacker_read(uk, 0);
     if(r < 0) {
@@ -165,7 +194,7 @@ static VALUE Unpacker_read(VALUE self)
 
 static VALUE Unpacker_skip(VALUE self)
 {
-    UNPACKER(self, uk);
+    msgpack_unpacker_t *uk = MessagePack_Unpacker_get(self);
 
     int r = msgpack_unpacker_skip(uk, 0);
     if(r < 0) {
@@ -177,7 +206,7 @@ static VALUE Unpacker_skip(VALUE self)
 
 static VALUE Unpacker_skip_nil(VALUE self)
 {
-    UNPACKER(self, uk);
+    msgpack_unpacker_t *uk = MessagePack_Unpacker_get(self);
 
     int r = msgpack_unpacker_skip_nil(uk);
     if(r < 0) {
@@ -192,7 +221,7 @@ static VALUE Unpacker_skip_nil(VALUE self)
 
 static VALUE Unpacker_read_array_header(VALUE self)
 {
-    UNPACKER(self, uk);
+    msgpack_unpacker_t *uk = MessagePack_Unpacker_get(self);
 
     uint32_t size;
     int r = msgpack_unpacker_read_array_header(uk, &size);
@@ -200,12 +229,12 @@ static VALUE Unpacker_read_array_header(VALUE self)
         raise_unpacker_error(r);
     }
 
-    return ULONG2NUM(size);
+    return ULONG2NUM(size); // long at least 32 bits
 }
 
 static VALUE Unpacker_read_map_header(VALUE self)
 {
-    UNPACKER(self, uk);
+    msgpack_unpacker_t *uk = MessagePack_Unpacker_get(self);
 
     uint32_t size;
     int r = msgpack_unpacker_read_map_header(uk, &size);
@@ -213,41 +242,13 @@ static VALUE Unpacker_read_map_header(VALUE self)
         raise_unpacker_error((int)r);
     }
 
-    return ULONG2NUM(size);
+    return ULONG2NUM(size); // long at least 32 bits
 }
 
-static VALUE Unpacker_peek_next_type(VALUE self)
-{
-    UNPACKER(self, uk);
-
-    int r = msgpack_unpacker_peek_next_object_type(uk);
-    if(r < 0) {
-        raise_unpacker_error(r);
-    }
-
-    switch((enum msgpack_unpacker_object_type) r) {
-    case TYPE_NIL:
-        return rb_intern("nil");
-    case TYPE_BOOLEAN:
-        return rb_intern("boolean");
-    case TYPE_INTEGER:
-        return rb_intern("integer");
-    case TYPE_FLOAT:
-        return rb_intern("float");
-    case TYPE_RAW:
-        return rb_intern("raw");
-    case TYPE_ARRAY:
-        return rb_intern("array");
-    case TYPE_MAP:
-        return rb_intern("map");
-    default:
-        rb_raise(eUnpackError, "logically unknown type %d", r);
-    }
-}
 
 static VALUE Unpacker_feed(VALUE self, VALUE data)
 {
-    UNPACKER(self, uk);
+    msgpack_unpacker_t *uk = MessagePack_Unpacker_get(self);
 
     StringValue(data);
 
@@ -258,7 +259,7 @@ static VALUE Unpacker_feed(VALUE self, VALUE data)
 
 static VALUE Unpacker_feed_reference(VALUE self, VALUE data)
 {
-    UNPACKER(self, uk);
+    msgpack_unpacker_t *uk = MessagePack_Unpacker_get(self);
 
     StringValue(data);
 
@@ -269,7 +270,7 @@ static VALUE Unpacker_feed_reference(VALUE self, VALUE data)
 
 static VALUE Unpacker_each_impl(VALUE self)
 {
-    UNPACKER(self, uk);
+    msgpack_unpacker_t *uk = MessagePack_Unpacker_get(self);
 
     while(true) {
         int r = msgpack_unpacker_read(uk, 0);
@@ -290,15 +291,16 @@ static VALUE Unpacker_each_impl(VALUE self)
     }
 }
 
-static VALUE Unpacker_rescue_EOFError(VALUE self)
+static VALUE Unpacker_rescue_EOFError(VALUE args, VALUE error)
 {
-    UNUSED(self);
+    UNUSED(args);
+    UNUSED(error);
     return Qnil;
 }
 
 static VALUE Unpacker_each(VALUE self)
 {
-    UNPACKER(self, uk);
+    msgpack_unpacker_t *uk = MessagePack_Unpacker_get(self);
 
 #ifdef RETURN_ENUMERATOR
     RETURN_ENUMERATOR(self, 0, 0);
@@ -329,7 +331,7 @@ static VALUE Unpacker_feed_each(VALUE self, VALUE data)
 
 static VALUE Unpacker_reset(VALUE self)
 {
-    UNPACKER(self, uk);
+    msgpack_unpacker_t *uk = MessagePack_Unpacker_get(self);
 
     _msgpack_unpacker_reset(uk);
 
@@ -338,12 +340,14 @@ static VALUE Unpacker_reset(VALUE self)
 
 static VALUE Unpacker_registered_types_internal(VALUE self)
 {
-    UNPACKER(self, uk);
+    msgpack_unpacker_t *uk = MessagePack_Unpacker_get(self);
 
     VALUE mapping = rb_hash_new();
-    for(int i=0; i < 256; i++) {
-        if(uk->ext_registry.array[i] != Qnil) {
-            rb_hash_aset(mapping, INT2FIX(i - 128), uk->ext_registry.array[i]);
+    if (uk->ext_registry) {
+        for(int i=0; i < 256; i++) {
+            if(uk->ext_registry->array[i] != Qnil) {
+                rb_hash_aset(mapping, INT2FIX(i - 128), uk->ext_registry->array[i]);
+            }
         }
     }
 
@@ -352,7 +356,7 @@ static VALUE Unpacker_registered_types_internal(VALUE self)
 
 static VALUE Unpacker_register_type(int argc, VALUE* argv, VALUE self)
 {
-    UNPACKER(self, uk);
+    msgpack_unpacker_t *uk = MessagePack_Unpacker_get(self);
 
     int ext_type;
     VALUE proc;
@@ -363,12 +367,7 @@ static VALUE Unpacker_register_type(int argc, VALUE* argv, VALUE self)
     case 1:
         /* register_type(0x7f) {|data| block... } */
         rb_need_block();
-#ifdef HAVE_RB_BLOCK_LAMBDA
         proc = rb_block_lambda();
-#else
-        /* MRI 1.8 */
-        proc = rb_block_proc();
-#endif
         arg = proc;
         ext_module = Qnil;
         break;
@@ -387,14 +386,14 @@ static VALUE Unpacker_register_type(int argc, VALUE* argv, VALUE self)
         rb_raise(rb_eRangeError, "integer %d too big to convert to `signed char'", ext_type);
     }
 
-    msgpack_unpacker_ext_registry_put(&uk->ext_registry, ext_module, ext_type, proc, arg);
+    msgpack_unpacker_ext_registry_put(&uk->ext_registry, ext_module, ext_type, 0, proc, arg);
 
     return Qnil;
 }
 
 static VALUE Unpacker_full_unpack(VALUE self)
 {
-    UNPACKER(self, uk);
+    msgpack_unpacker_t *uk = MessagePack_Unpacker_get(self);
 
     int r = msgpack_unpacker_read(uk, 0);
     if(r < 0) {
@@ -437,10 +436,15 @@ void MessagePack_Unpacker_module_init(VALUE mMessagePack)
 
     eUnknownExtTypeError = rb_define_class_under(mMessagePack, "UnknownExtTypeError", eUnpackError);
 
+    sym_symbolize_keys = ID2SYM(rb_intern("symbolize_keys"));
+    sym_freeze = ID2SYM(rb_intern("freeze"));
+    sym_allow_unknown_ext = ID2SYM(rb_intern("allow_unknown_ext"));
+
     rb_define_alloc_func(cMessagePack_Unpacker, MessagePack_Unpacker_alloc);
 
     rb_define_method(cMessagePack_Unpacker, "initialize", MessagePack_Unpacker_initialize, -1);
     rb_define_method(cMessagePack_Unpacker, "symbolize_keys?", Unpacker_symbolized_keys_p, 0);
+    rb_define_method(cMessagePack_Unpacker, "freeze?", Unpacker_freeze_p, 0);
     rb_define_method(cMessagePack_Unpacker, "allow_unknown_ext?", Unpacker_allow_unknown_ext_p, 0);
     rb_define_method(cMessagePack_Unpacker, "buffer", Unpacker_buffer, 0);
     rb_define_method(cMessagePack_Unpacker, "read", Unpacker_read, 0);
@@ -449,7 +453,6 @@ void MessagePack_Unpacker_module_init(VALUE mMessagePack)
     rb_define_method(cMessagePack_Unpacker, "skip_nil", Unpacker_skip_nil, 0);
     rb_define_method(cMessagePack_Unpacker, "read_array_header", Unpacker_read_array_header, 0);
     rb_define_method(cMessagePack_Unpacker, "read_map_header", Unpacker_read_map_header, 0);
-    //rb_define_method(cMessagePack_Unpacker, "peek_next_type", Unpacker_peek_next_type, 0);  // TODO
     rb_define_method(cMessagePack_Unpacker, "feed", Unpacker_feed, 1);
     rb_define_method(cMessagePack_Unpacker, "feed_reference", Unpacker_feed_reference, 1);
     rb_define_method(cMessagePack_Unpacker, "each", Unpacker_each, 0);
@@ -467,4 +470,3 @@ void MessagePack_Unpacker_module_init(VALUE mMessagePack)
 
     rb_define_method(cMessagePack_Unpacker, "full_unpack", Unpacker_full_unpack, 0);
 }
-

data/ext/msgpack/unpacker_class.h

@@ -20,6 +20,17 @@
 
 #include "unpacker.h"
 
+extern const rb_data_type_t unpacker_data_type;
+
+static inline msgpack_unpacker_t *MessagePack_Unpacker_get(VALUE object) {
+    msgpack_unpacker_t *unpacker;
+    TypedData_Get_Struct(object, msgpack_unpacker_t, &unpacker_data_type, unpacker);
+    if (!unpacker) {
+        rb_raise(rb_eArgError, "Uninitialized Unpacker object");
+    }
+    return unpacker;
+}
+
 extern VALUE cMessagePack_Unpacker;
 
 void MessagePack_Unpacker_module_init(VALUE mMessagePack);

data/ext/msgpack/unpacker_ext_registry.c

@@ -21,42 +21,66 @@
 static ID s_call;
 static ID s_dup;
 
-void msgpack_unpacker_ext_registry_static_init()
+void msgpack_unpacker_ext_registry_static_init(void)
 {
     s_call = rb_intern("call");
     s_dup = rb_intern("dup");
 }
 
-void msgpack_unpacker_ext_registry_static_destroy()
+
+void msgpack_unpacker_ext_registry_static_destroy(void)
 { }
 
-void msgpack_unpacker_ext_registry_init(msgpack_unpacker_ext_registry_t* ukrg)
+void msgpack_unpacker_ext_registry_mark(msgpack_unpacker_ext_registry_t* ukrg)
 {
-    for(int i=0; i < 256; i++) {
-        ukrg->array[i] = Qnil;
+    if (ukrg) {
+        for(int i=0; i < 256; i++) {
+            if (ukrg->array[i] != Qnil) {
+                rb_gc_mark(ukrg->array[i]);
+            }
+        }
     }
 }
 
-void msgpack_unpacker_ext_registry_mark(msgpack_unpacker_ext_registry_t* ukrg)
+msgpack_unpacker_ext_registry_t* msgpack_unpacker_ext_registry_cow(msgpack_unpacker_ext_registry_t* src)
 {
-    for(int i=0; i < 256; i++) {
-        rb_gc_mark(ukrg->array[i]);
+    msgpack_unpacker_ext_registry_t* dst;
+    if (src) {
+        if (src->borrow_count) {
+            dst = ALLOC(msgpack_unpacker_ext_registry_t);
+            dst->borrow_count = 0;
+            MEMCPY(dst->array, src->array, VALUE, 256);
+            msgpack_unpacker_ext_registry_release(src);
+            return dst;
+        } else {
+            return src;
+        }
+    } else {
+        dst = ALLOC(msgpack_unpacker_ext_registry_t);
+        dst->borrow_count = 0;
+        for(int i=0; i < 256; i++) {
+            dst->array[i] = Qnil;
+        }
+        return dst;
     }
 }
 
-void msgpack_unpacker_ext_registry_dup(msgpack_unpacker_ext_registry_t* src,
-        msgpack_unpacker_ext_registry_t* dst)
+void msgpack_unpacker_ext_registry_release(msgpack_unpacker_ext_registry_t* ukrg)
 {
-    for(int i=0; i < 256; i++) {
-        dst->array[i] = src->array[i];
+    if (ukrg) {
+        if (ukrg->borrow_count) {
+            ukrg->borrow_count--;
+        } else {
+            xfree(ukrg);
+        }
     }
 }
 
-VALUE msgpack_unpacker_ext_registry_put(msgpack_unpacker_ext_registry_t* ukrg,
-        VALUE ext_module, int ext_type, VALUE proc, VALUE arg)
+void msgpack_unpacker_ext_registry_put(msgpack_unpacker_ext_registry_t** ukrg,
+        VALUE ext_module, int ext_type, int flags, VALUE proc, VALUE arg)
 {
-    VALUE e = rb_ary_new3(3, ext_module, proc, arg);
-    VALUE before = ukrg->array[ext_type + 128];
-    ukrg->array[ext_type + 128] = e;
-    return before;
+    msgpack_unpacker_ext_registry_t* ext_registry = msgpack_unpacker_ext_registry_cow(*ukrg);
+
+    ext_registry->array[ext_type + 128] = rb_ary_new3(4, ext_module, proc, arg, INT2FIX(flags));
+    *ukrg = ext_registry;
 }

data/ext/msgpack/unpacker_ext_registry.h

@@ -21,39 +21,46 @@
 #include "compat.h"
 #include "ruby.h"
 
+#define MSGPACK_EXT_RECURSIVE 0b0001
+
 struct msgpack_unpacker_ext_registry_t;
 typedef struct msgpack_unpacker_ext_registry_t msgpack_unpacker_ext_registry_t;
 
 struct msgpack_unpacker_ext_registry_t {
+    unsigned int borrow_count;
     VALUE array[256];
-    //int bitmap;
 };
 
-void msgpack_unpacker_ext_registry_static_init();
+void msgpack_unpacker_ext_registry_static_init(void);
 
-void msgpack_unpacker_ext_registry_static_destroy();
+void msgpack_unpacker_ext_registry_static_destroy(void);
 
-void msgpack_unpacker_ext_registry_init(msgpack_unpacker_ext_registry_t* ukrg);
+void msgpack_unpacker_ext_registry_release(msgpack_unpacker_ext_registry_t* ukrg);
 
-static inline void msgpack_unpacker_ext_registry_destroy(msgpack_unpacker_ext_registry_t* ukrg)
-{ }
+static inline void msgpack_unpacker_ext_registry_borrow(msgpack_unpacker_ext_registry_t* src, msgpack_unpacker_ext_registry_t** dst)
+{
+    if (src) {
+        src->borrow_count++;
+        *dst = src;
+    }
+}
 
 void msgpack_unpacker_ext_registry_mark(msgpack_unpacker_ext_registry_t* ukrg);
 
-void msgpack_unpacker_ext_registry_dup(msgpack_unpacker_ext_registry_t* src,
-        msgpack_unpacker_ext_registry_t* dst);
-
-VALUE msgpack_unpacker_ext_registry_put(msgpack_unpacker_ext_registry_t* ukrg,
-        VALUE ext_module, int ext_type, VALUE proc, VALUE arg);
+void msgpack_unpacker_ext_registry_put(msgpack_unpacker_ext_registry_t** ukrg,
+        VALUE ext_module, int ext_type, int flags, VALUE proc, VALUE arg);
 
 static inline VALUE msgpack_unpacker_ext_registry_lookup(msgpack_unpacker_ext_registry_t* ukrg,
-        int ext_type)
+        int ext_type, int* ext_flags_result)
 {
-    VALUE e = ukrg->array[ext_type + 128];
-    if(e == Qnil) {
-        return Qnil;
+    if (ukrg) {
+        VALUE entry = ukrg->array[ext_type + 128];
+        if (entry != Qnil) {
+            *ext_flags_result = FIX2INT(rb_ary_entry(entry, 3));
+            return rb_ary_entry(entry, 1);
+        }
     }
-    return rb_ary_entry(e, 1);
+    return Qnil;
 }
 
 #endif

data/lib/msgpack/bigint.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module MessagePack
+  module Bigint
+    # We split the bigint in 32bits chunks so that individual part fits into
+    # a MRI immediate Integer.
+    CHUNK_BITLENGTH = 32
+    FORMAT = 'CL>*'
+
+    if Integer.instance_method(:[]).arity != 1 # Ruby 2.7 and newer
+      # Starting from Ruby 2.7 we can address arbitrary bitranges inside an Integer with Integer#[]
+      # This allows to not allocate any Integer.
+      def self.to_msgpack_ext(bigint)
+        members = []
+
+        if bigint < 0
+          bigint = -bigint
+          members << 1
+        else
+          members << 0
+        end
+
+        offset = 0
+        length = bigint.bit_length
+        while offset < length
+          members << bigint[offset, CHUNK_BITLENGTH]
+          offset += CHUNK_BITLENGTH
+        end
+
+        members.pack(FORMAT)
+      end
+    else
+      # On 2.6 and older since we can't address arbitrary bitranges, so we fallback to shifting the bigint.
+      # This means that after each shift, we may allocate another Integer instance.
+      BASE = (2**CHUNK_BITLENGTH) - 1
+      def self.to_msgpack_ext(bigint)
+        members = []
+
+        if bigint < 0
+          bigint = -bigint
+          members << 1
+        else
+          members << 0
+        end
+
+        while bigint > 0
+          members << (bigint & BASE)
+          bigint = bigint >> CHUNK_BITLENGTH
+        end
+
+        members.pack(FORMAT)
+      end
+    end
+
+    def self.from_msgpack_ext(data)
+      parts = data.unpack(FORMAT)
+
+      sign = parts.shift
+      sum = parts.pop.to_i
+
+      parts.reverse_each do |part|
+        sum = sum << CHUNK_BITLENGTH
+        sum += part
+      end
+
+      sign == 0 ? sum : -sum
+    end
+  end
+end