ext/struct.c in thrift-0.0.751142 vs ext/struct.c in thrift-0.0.810255.1

- old
+ new

@@ -1,7 +1,27 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + #include <struct.h> #include <constants.h> +#include "macros.h" #ifndef HAVE_STRLCPY static size_t @@ -22,14 +42,34 @@ } #endif static native_proto_method_table *mt; +static native_proto_method_table *default_mt; +// static VALUE last_proto_class = Qnil; #define IS_CONTAINER(ttype) ((ttype) == TTYPE_MAP || (ttype) == TTYPE_LIST || (ttype) == TTYPE_SET) #define STRUCT_FIELDS(obj) rb_const_get(CLASS_OF(obj), fields_const_id) +// static void set_native_proto_function_pointers(VALUE protocol) { +// VALUE method_table_object = rb_const_get(CLASS_OF(protocol), rb_intern("@native_method_table")); +// // TODO: check nil? +// Data_Get_Struct(method_table_object, native_proto_method_table, mt); +// } + +// static void check_native_proto_method_table(VALUE protocol) { +// VALUE protoclass = CLASS_OF(protocol); +// if (protoclass != last_proto_class) { +// last_proto_class = protoclass; +// if (rb_funcall(protocol, native_qmark_method_id, 0) == Qtrue) { +// set_native_proto_function_pointers(protocol); +// } else { +// mt = default_mt; +// } +// } +// } + //------------------------------------------- // Writing section //------------------------------------------- // default fn pointers for protocol stuff here @@ -191,68 +231,61 @@ VALUE default_read_struct_end(VALUE protocol) { return rb_funcall(protocol, read_struct_end_method_id, 0); } static void set_default_proto_function_pointers() { - mt = ALLOC(native_proto_method_table); - - mt->write_field_begin = default_write_field_begin; - mt->write_field_stop = default_write_field_stop; - mt->write_map_begin = default_write_map_begin; - mt->write_map_end = default_write_map_end; - mt->write_list_begin = default_write_list_begin; - mt->write_list_end = default_write_list_end; - mt->write_set_begin = default_write_set_begin; - mt->write_set_end = default_write_set_end; - mt->write_byte = default_write_byte; - mt->write_bool = default_write_bool; - mt->write_i16 = default_write_i16; - mt->write_i32 = default_write_i32; - mt->write_i64 = default_write_i64; - mt->write_double = default_write_double; - mt->write_string = default_write_string; - mt->write_struct_begin = default_write_struct_begin; - mt->write_struct_end = default_write_struct_end; - mt->write_field_end = default_write_field_end; + default_mt = ALLOC(native_proto_method_table); - mt->read_struct_begin = default_read_struct_begin; - mt->read_struct_end = default_read_struct_end; - mt->read_field_begin = default_read_field_begin; - mt->read_field_end = default_read_field_end; - mt->read_map_begin = default_read_map_begin; - mt->read_map_end = default_read_map_end; - mt->read_list_begin = default_read_list_begin; - mt->read_list_end = default_read_list_end; - mt->read_set_begin = default_read_set_begin; - mt->read_set_end = default_read_set_end; - mt->read_byte = default_read_byte; - mt->read_bool = default_read_bool; - mt->read_i16 = default_read_i16; - mt->read_i32 = default_read_i32; - mt->read_i64 = default_read_i64; - mt->read_double = default_read_double; - mt->read_string = default_read_string; - -} + default_mt->write_field_begin = default_write_field_begin; + default_mt->write_field_stop = default_write_field_stop; + default_mt->write_map_begin = default_write_map_begin; + default_mt->write_map_end = default_write_map_end; + default_mt->write_list_begin = default_write_list_begin; + default_mt->write_list_end = default_write_list_end; + default_mt->write_set_begin = default_write_set_begin; + default_mt->write_set_end = default_write_set_end; + default_mt->write_byte = default_write_byte; + default_mt->write_bool = default_write_bool; + default_mt->write_i16 = default_write_i16; + default_mt->write_i32 = default_write_i32; + default_mt->write_i64 = default_write_i64; + default_mt->write_double = default_write_double; + default_mt->write_string = default_write_string; + default_mt->write_struct_begin = default_write_struct_begin; + default_mt->write_struct_end = default_write_struct_end; + default_mt->write_field_end = default_write_field_end; -static void set_native_proto_function_pointers(VALUE protocol) { - VALUE method_table_object = rb_const_get(CLASS_OF(protocol), rb_intern("@native_method_table")); - // TODO: check nil? - Data_Get_Struct(method_table_object, native_proto_method_table, mt); + default_mt->read_struct_begin = default_read_struct_begin; + default_mt->read_struct_end = default_read_struct_end; + default_mt->read_field_begin = default_read_field_begin; + default_mt->read_field_end = default_read_field_end; + default_mt->read_map_begin = default_read_map_begin; + default_mt->read_map_end = default_read_map_end; + default_mt->read_list_begin = default_read_list_begin; + default_mt->read_list_end = default_read_list_end; + default_mt->read_set_begin = default_read_set_begin; + default_mt->read_set_end = default_read_set_end; + default_mt->read_byte = default_read_byte; + default_mt->read_bool = default_read_bool; + default_mt->read_i16 = default_read_i16; + default_mt->read_i32 = default_read_i32; + default_mt->read_i64 = default_read_i64; + default_mt->read_double = default_read_double; + default_mt->read_string = default_read_string; } // end default protocol methods static VALUE rb_thrift_struct_write(VALUE self, VALUE protocol); static void write_anything(int ttype, VALUE value, VALUE protocol, VALUE field_info); VALUE get_field_value(VALUE obj, VALUE field_name) { - char name_buf[RSTRING(field_name)->len + 1]; + char name_buf[RSTRING_LEN(field_name) + 1]; name_buf[0] = '@'; - strlcpy(&name_buf[1], RSTRING(field_name)->ptr, sizeof(name_buf)); + strlcpy(&name_buf[1], RSTRING_PTR(field_name), sizeof(name_buf)); VALUE value = rb_ivar_get(obj, rb_intern(name_buf)); return value; } @@ -275,11 +308,11 @@ VALUE valuetype_value = rb_hash_aref(value_info, type_sym); int valuetype = FIX2INT(valuetype_value); keys = rb_funcall(value, keys_method_id, 0); - sz = RARRAY(keys)->len; + sz = RARRAY_LEN(keys); mt->write_map_begin(protocol, keytype_value, valuetype_value, INT2FIX(sz)); for (i = 0; i < sz; i++) { key = rb_ary_entry(keys, i); @@ -300,11 +333,11 @@ mt->write_map_end(protocol); } else if (ttype == TTYPE_LIST) { Check_Type(value, T_ARRAY); - sz = RARRAY(value)->len; + sz = RARRAY_LEN(value); VALUE element_type_info = rb_hash_aref(field_info, element_sym); VALUE element_type_value = rb_hash_aref(element_type_info, type_sym); int element_type = FIX2INT(element_type_value); @@ -330,11 +363,11 @@ Check_Type(value, T_HASH); items = rb_funcall(value, keys_method_id, 0); } } - sz = RARRAY(items)->len; + sz = RARRAY_LEN(items); VALUE element_type_info = rb_hash_aref(field_info, element_sym); VALUE element_type_value = rb_hash_aref(element_type_info, type_sym); int element_type = FIX2INT(element_type_value); @@ -381,26 +414,22 @@ static VALUE rb_thrift_struct_write(VALUE self, VALUE protocol) { // call validate rb_funcall(self, validate_method_id, 0); - if (RTEST(rb_funcall(protocol, native_qmark_method_id, 0))) { - set_native_proto_function_pointers(protocol); - } else { - set_default_proto_function_pointers(); - } - + // check_native_proto_method_table(protocol); + // write struct begin mt->write_struct_begin(protocol, rb_class_name(CLASS_OF(self))); - + // iterate through all the fields here VALUE struct_fields = STRUCT_FIELDS(self); VALUE struct_field_ids_unordered = rb_funcall(struct_fields, keys_method_id, 0); VALUE struct_field_ids_ordered = rb_funcall(struct_field_ids_unordered, sort_method_id, 0); - + int i = 0; - for (i=0; i < RARRAY(struct_field_ids_ordered)->len; i++) { + for (i=0; i < RARRAY_LEN(struct_field_ids_ordered); i++) { VALUE field_id = rb_ary_entry(struct_field_ids_ordered, i); VALUE field_info = rb_hash_aref(struct_fields, field_id); VALUE ttype_value = rb_hash_aref(field_info, type_sym); int ttype = FIX2INT(ttype_value); @@ -413,37 +442,37 @@ write_anything(ttype, field_value, protocol, field_info); mt->write_field_end(protocol); } } - + mt->write_field_stop(protocol); - + // write struct end mt->write_struct_end(protocol); - + return Qnil; } //------------------------------------------- // Reading section //------------------------------------------- static VALUE rb_thrift_struct_read(VALUE self, VALUE protocol); static void set_field_value(VALUE obj, VALUE field_name, VALUE value) { - char name_buf[RSTRING(field_name)->len + 1]; + char name_buf[RSTRING_LEN(field_name) + 1]; name_buf[0] = '@'; - strlcpy(&name_buf[1], RSTRING(field_name)->ptr, sizeof(name_buf)); + strlcpy(&name_buf[1], RSTRING_PTR(field_name), sizeof(name_buf)); rb_ivar_set(obj, rb_intern(name_buf), value); } static VALUE read_anything(VALUE protocol, int ttype, VALUE field_info) { VALUE result = Qnil; - + if (ttype == TTYPE_BOOL) { result = mt->read_bool(protocol); } else if (ttype == TTYPE_BYTE) { result = mt->read_byte(protocol); } else if (ttype == TTYPE_I16) { @@ -465,34 +494,34 @@ VALUE map_header = mt->read_map_begin(protocol); int key_ttype = FIX2INT(rb_ary_entry(map_header, 0)); int value_ttype = FIX2INT(rb_ary_entry(map_header, 1)); int num_entries = FIX2INT(rb_ary_entry(map_header, 2)); - + VALUE key_info = rb_hash_aref(field_info, key_sym); VALUE value_info = rb_hash_aref(field_info, value_sym); result = rb_hash_new(); - + for (i = 0; i < num_entries; ++i) { VALUE key, val; - + key = read_anything(protocol, key_ttype, key_info); val = read_anything(protocol, value_ttype, value_info); - + rb_hash_aset(result, key, val); } - + mt->read_map_end(protocol); } else if (ttype == TTYPE_LIST) { int i; VALUE list_header = mt->read_list_begin(protocol); int element_ttype = FIX2INT(rb_ary_entry(list_header, 0)); int num_elements = FIX2INT(rb_ary_entry(list_header, 1)); result = rb_ary_new2(num_elements); - + for (i = 0; i < num_elements; ++i) { rb_ary_push(result, read_anything(protocol, element_ttype, rb_hash_aref(field_info, element_sym))); } @@ -503,38 +532,40 @@ VALUE set_header = mt->read_set_begin(protocol); int element_ttype = FIX2INT(rb_ary_entry(set_header, 0)); int num_elements = FIX2INT(rb_ary_entry(set_header, 1)); items = rb_ary_new2(num_elements); - + for (i = 0; i < num_elements; ++i) { rb_ary_push(items, read_anything(protocol, element_ttype, rb_hash_aref(field_info, element_sym))); } - + mt->read_set_end(protocol); - + result = rb_class_new_instance(1, &items, rb_cSet); } else { rb_raise(rb_eNotImpError, "read_anything not implemented for type %d!", ttype); } - + return result; } static VALUE rb_thrift_struct_read(VALUE self, VALUE protocol) { + // check_native_proto_method_table(protocol); + // read struct begin mt->read_struct_begin(protocol); VALUE struct_fields = STRUCT_FIELDS(self); - + // read each field while (true) { - VALUE field_header = rb_funcall(protocol, read_field_begin_method_id, 0); + VALUE field_header = mt->read_field_begin(protocol); VALUE field_type_value = rb_ary_entry(field_header, 1); int field_type = FIX2INT(field_type_value); - + if (field_type == TTYPE_STOP) { break; } // make sure we got a type we expected @@ -550,25 +581,26 @@ rb_funcall(protocol, skip_method_id, 1, field_type_value); } } else { rb_funcall(protocol, skip_method_id, 1, field_type_value); } - + // read field end mt->read_field_end(protocol); } - + // read struct end mt->read_struct_end(protocol); - + return Qnil; } void Init_struct() { VALUE struct_module = rb_const_get(thrift_module, rb_intern("Struct")); - + rb_define_method(struct_module, "write", rb_thrift_struct_write, 1); rb_define_method(struct_module, "read", rb_thrift_struct_read, 1); - + set_default_proto_function_pointers(); + mt = default_mt; }