bson_ext 1.0.7 → 1.0.9

data/ext/cbson/cbson.c

@@ -31,10 +31,6 @@
 #  define RSTRING_LEN(v) RSTRING(v)->len
 #endif
 
-#ifndef RARRAY_PTR
-#  define RARRAY_PTR(v) RARRAY(v)->ptr
-#endif
-
 #ifndef RARRAY_LEN
 #  define RARRAY_LEN(v) RARRAY(v)->len
 #endif
@@ -72,6 +68,12 @@
 
 #define MAX_HOSTNAME_LENGTH 256
 
+static ID element_assignment_method;
+static ID unpack_method;
+static ID utc_method;
+static ID lt_operator;
+static ID gt_operator;
+
 static VALUE Binary;
 static VALUE ObjectID;
 static VALUE ObjectId;
@@ -177,6 +179,9 @@ static void write_utf8(buffer_t buffer, VALUE string, char check_null) {
 static char zero = 0;
 static char one = 1;
 
+static char hostname_digest[17];
+static unsigned int object_id_inc = 0;
+
 static int cmp_char(const void* a, const void* b) {
     return *(char*)a - *(char*)b;
 }
@@ -231,23 +236,27 @@ static int write_element(VALUE key, VALUE value, VALUE extra, int allow_id) {
 
     switch(TYPE(value)) {
     case T_BIGNUM:
-    case T_FIXNUM:
         {
-            if (rb_funcall(value, rb_intern(">"), 1, LL2NUM(9223372036854775807LL)) == Qtrue ||
-                rb_funcall(value, rb_intern("<"), 1, LL2NUM(-9223372036854775808ULL)) == Qtrue) {
+            if (rb_funcall(value, gt_operator, 1, LL2NUM(9223372036854775807LL)) == Qtrue ||
+                rb_funcall(value, lt_operator, 1, LL2NUM(-9223372036854775808ULL)) == Qtrue) {
                 buffer_free(buffer);
                 rb_raise(rb_eRangeError, "MongoDB can only handle 8-byte ints");
             }
-            if (rb_funcall(value, rb_intern(">"), 1, INT2NUM(2147483647L)) == Qtrue ||
-                rb_funcall(value, rb_intern("<"), 1, INT2NUM(-2147483648L)) == Qtrue) {
-                long long ll_value;
+        }
+        // NOTE: falls through to T_FIXNUM code
+    case T_FIXNUM:
+        {
+            long long ll_value;
+            ll_value = NUM2LL(value);
+
+            if (ll_value > 2147483647L ||
+                ll_value < -2147483648L) {
                 write_name_and_type(buffer, key, 0x12);
-                ll_value = NUM2LL(value);
                 SAFE_WRITE(buffer, (char*)&ll_value, 8);
             } else {
                 int int_value;
                 write_name_and_type(buffer, key, 0x10);
-                int_value = NUM2LL(value);
+                int_value = ll_value;
                 SAFE_WRITE(buffer, (char*)&int_value, 4);
             }
             break;
@@ -298,13 +307,12 @@ static int write_element(VALUE key, VALUE value, VALUE extra, int allow_id) {
             }
 
             items = RARRAY_LEN(value);
-            values = RARRAY_PTR(value);
             for(i = 0; i < items; i++) {
                 char* name;
                 VALUE key;
                 INT2STRING(&name, i);
                 key = rb_str_new2(name);
-                write_element_with_id(key, values[i], pack_extra(buffer, check_keys));
+                write_element_with_id(key, rb_ary_entry(value, i), pack_extra(buffer, check_keys));
                 free(name);
             }
 
@@ -385,7 +393,7 @@ static int write_element(VALUE key, VALUE value, VALUE extra, int allow_id) {
                 int i;
                 write_name_and_type(buffer, key, 0x07);
                 for (i = 0; i < 12; i++) {
-                    char byte = (char)FIX2INT(RARRAY_PTR(as_array)[i]);
+                    char byte = (char)FIX2INT(rb_ary_entry(as_array, i));
                     SAFE_WRITE(buffer, &byte, 1);
                 }
                 break;
@@ -558,7 +566,7 @@ static void write_doc(buffer_t buffer, VALUE hash, VALUE check_keys, VALUE move_
         VALUE keys = rb_funcall(hash, rb_intern("keys"), 0);
         int i;
                 for(i = 0; i < RARRAY_LEN(keys); i++) {
-            VALUE key = RARRAY_PTR(keys)[i];
+            VALUE key = rb_ary_entry(keys, i);
             VALUE value = rb_hash_aref(hash, key);
 
             write_function(key, value, pack_extra(buffer, check_keys));
@@ -696,7 +704,7 @@ static VALUE get_value(const char* buffer, int* position, int type) {
     case 7:
         {
             VALUE str = rb_str_new(buffer + *position, 12);
-            VALUE oid = rb_funcall(str, rb_intern("unpack"), 1, rb_str_new2("C*"));
+            VALUE oid = rb_funcall(str, unpack_method, 1, rb_str_new2("C*"));
             value = rb_class_new_instance(1, &oid, ObjectId);
             *position += 12;
             break;
@@ -712,7 +720,7 @@ static VALUE get_value(const char* buffer, int* position, int type) {
             memcpy(&millis, buffer + *position, 8);
 
             value = rb_time_new(millis / 1000, (millis % 1000) * 1000);
-            value = rb_funcall(value, rb_intern("utc"), 0);
+            value = rb_funcall(value, utc_method, 0);
             *position += 8;
             break;
         }
@@ -758,7 +766,7 @@ static VALUE get_value(const char* buffer, int* position, int type) {
             *position += collection_length + 1;
 
             str = rb_str_new(buffer + *position, 12);
-            oid = rb_funcall(str, rb_intern("unpack"), 1, rb_str_new2("C*"));
+            oid = rb_funcall(str, unpack_method, 1, rb_str_new2("C*"));
             id = rb_class_new_instance(1, &oid, ObjectId);
             *position += 12;
 
@@ -844,7 +852,7 @@ static VALUE elements_to_hash(const char* buffer, int max) {
         VALUE value;
         position += name_length + 1;
         value = get_value(buffer, &position, type);
-        rb_funcall(hash, rb_intern("[]="), 2, name, value);
+        rb_funcall(hash, element_assignment_method, 2, name, value);
     }
     return hash;
 }
@@ -860,28 +868,9 @@ static VALUE method_deserialize(VALUE self, VALUE bson) {
     return elements_to_hash(buffer, remaining);
 }
 
-
-static VALUE fast_pack(VALUE self)
-{
-    VALUE res;
-    long i;
-    char c;
-
-    res = rb_str_buf_new(0);
-
-    for (i = 0; i < RARRAY_LEN(self); i++) {
-        c = FIX2LONG(RARRAY_PTR(self)[i]);
-        rb_str_buf_cat(res, &c, sizeof(char));
-    }
-
-    return res;
-}
-
-
 static VALUE objectid_generate(VALUE self)
 {
-    VALUE oid, digest;
-    char hostname[MAX_HOSTNAME_LENGTH];
+    VALUE oid;
     unsigned char oid_bytes[12];
     unsigned long t, inc;
     unsigned short pid;
@@ -890,16 +879,22 @@ static VALUE objectid_generate(VALUE self)
     t = htonl(time(NULL));
     MEMCPY(&oid_bytes, &t, unsigned char, 4);
 
-    if (gethostname(hostname, MAX_HOSTNAME_LENGTH) != 0) {
-        rb_raise(rb_eRuntimeError, "failed to get hostname");
-    }
-    digest = rb_funcall(DigestMD5, rb_intern("digest"), 1, rb_str_new2(hostname));
-    MEMCPY(&oid_bytes[4], RSTRING_PTR(digest), unsigned char, 3);
+    MEMCPY(&oid_bytes[4], hostname_digest, unsigned char, 3);
 
     pid = htons(getpid());
     MEMCPY(&oid_bytes[7], &pid, unsigned char, 2);
 
-    inc = htonl(FIX2ULONG(rb_funcall(self, rb_intern("get_inc"), 0)));
+    /* No need to synchronize modification of this counter between threads;
+     * MRI global interpreter lock guarantees serializaility.
+     *
+     * Compiler should optimize out impossible branch.
+     */
+    if (sizeof(unsigned int) == 4) {
+        object_id_inc++;
+    } else {
+        object_id_inc = (object_id_inc + 1) % 0xFFFFFF;
+    }
+    inc = htonl(object_id_inc);
     MEMCPY(&oid_bytes[9], ((unsigned char*)&inc + 1), unsigned char, 3);
 
     oid = rb_ary_new2(12);
@@ -911,7 +906,14 @@ static VALUE objectid_generate(VALUE self)
 
 
 void Init_cbson() {
-    VALUE bson, CBson, Digest, ext_version;
+    VALUE bson, CBson, Digest, ext_version, digest;
+    static char hostname[MAX_HOSTNAME_LENGTH];
+    
+    element_assignment_method = rb_intern("[]=");
+    unpack_method = rb_intern("unpack");
+    utc_method = rb_intern("utc");
+    lt_operator = rb_intern("<");
+    gt_operator = rb_intern(">");
 
     bson = rb_const_get(rb_cObject, rb_intern("BSON"));
     rb_require("bson/types/binary");
@@ -949,5 +951,11 @@ void Init_cbson() {
     rb_define_method(ObjectID, "generate", objectid_generate, 0);
     rb_define_method(ObjectId, "generate", objectid_generate, 0);
 
-    rb_define_method(rb_cArray, "fast_pack", fast_pack, 0);
+    if (gethostname(hostname, MAX_HOSTNAME_LENGTH) != 0) {
+        rb_raise(rb_eRuntimeError, "failed to get hostname");
+    }
+    digest = rb_funcall(DigestMD5, rb_intern("digest"), 1,
+        rb_str_new2(hostname));
+    memcpy(hostname_digest, RSTRING_PTR(digest), 16);
+    hostname_digest[16] = '\0';
 }

data/ext/cbson/version.h

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-#define VERSION "1.0.7"
+#define VERSION "1.0.9"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bson_ext
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 5
   prerelease: false
   segments: 
   - 1
   - 0
-  - 7
-  version: 1.0.7
+  - 9
+  version: 1.0.9
 platform: ruby
 authors: 
 - Mike Dirolf
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-28 00:00:00 -04:00
+date: 2010-09-20 00:00:00 -04:00
 default_executable: 
 dependencies: []