ffi 1.12.1 → 1.12.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +6 -0
- data/ext/ffi_c/Struct.c +47 -51
- data/ext/ffi_c/Struct.h +12 -6
- data/ext/ffi_c/StructLayout.c +13 -12
- data/ext/ffi_c/extconf.rb +0 -1
- data/lib/ffi/struct.rb +1 -2
- data/lib/ffi/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c60b8c22daf207353adea897b6142f65ea1bbfcac447ee7da373547d7212c19a
|
4
|
+
data.tar.gz: 7e3438808bbff423f8cd989e44e2c4288e25bf80d96f04c906617f35eab9846a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 439d1b680a2a6d30ebb5957884cc5aad39f708df6fc8616b08ebe5bfa761123bacfe68f3de09773d84f3f521ed40cb0a4844de61a64d5bc9217c7ed3e165f5e9
|
7
|
+
data.tar.gz: 866123b57649213c4bef30f5183955fe443a75e7b4cd57e16048559e5326507540182c86a9b149f64431ff06322066bfb70d3e1ca97e7246fa78425e086bf278
|
data/CHANGELOG.md
CHANGED
data/ext/ffi_c/Struct.c
CHANGED
@@ -90,7 +90,7 @@ struct_allocate(VALUE klass)
|
|
90
90
|
{
|
91
91
|
Struct* s;
|
92
92
|
VALUE obj = Data_Make_Struct(klass, Struct, struct_mark, struct_free, s);
|
93
|
-
|
93
|
+
|
94
94
|
s->rbPointer = Qnil;
|
95
95
|
s->rbLayout = Qnil;
|
96
96
|
|
@@ -112,7 +112,7 @@ struct_initialize(int argc, VALUE* argv, VALUE self)
|
|
112
112
|
int nargs;
|
113
113
|
|
114
114
|
Data_Get_Struct(self, Struct, s);
|
115
|
-
|
115
|
+
|
116
116
|
nargs = rb_scan_args(argc, argv, "01*", &rbPointer, &rest);
|
117
117
|
|
118
118
|
/* Call up into ruby code to adjust the layout */
|
@@ -127,7 +127,7 @@ struct_initialize(int argc, VALUE* argv, VALUE self)
|
|
127
127
|
}
|
128
128
|
|
129
129
|
Data_Get_Struct(s->rbLayout, StructLayout, s->layout);
|
130
|
-
|
130
|
+
|
131
131
|
if (rbPointer != Qnil) {
|
132
132
|
s->pointer = MEMORY(rbPointer);
|
133
133
|
s->rbPointer = rbPointer;
|
@@ -148,16 +148,16 @@ struct_initialize_copy(VALUE self, VALUE other)
|
|
148
148
|
{
|
149
149
|
Struct* src;
|
150
150
|
Struct* dst;
|
151
|
-
|
151
|
+
|
152
152
|
Data_Get_Struct(self, Struct, dst);
|
153
153
|
Data_Get_Struct(other, Struct, src);
|
154
154
|
if (dst == src) {
|
155
155
|
return self;
|
156
156
|
}
|
157
|
-
|
157
|
+
|
158
158
|
dst->rbLayout = src->rbLayout;
|
159
159
|
dst->layout = src->layout;
|
160
|
-
|
160
|
+
|
161
161
|
/*
|
162
162
|
* A new MemoryPointer instance is allocated here instead of just calling
|
163
163
|
* #dup on rbPointer, since the Pointer may not know its length, or may
|
@@ -176,7 +176,7 @@ struct_initialize_copy(VALUE self, VALUE other)
|
|
176
176
|
dst->rbReferences = ALLOC_N(VALUE, dst->layout->referenceFieldCount);
|
177
177
|
memcpy(dst->rbReferences, src->rbReferences, dst->layout->referenceFieldCount * sizeof(VALUE));
|
178
178
|
}
|
179
|
-
|
179
|
+
|
180
180
|
return self;
|
181
181
|
}
|
182
182
|
|
@@ -279,24 +279,25 @@ store_reference_value(StructField* f, Struct* s, VALUE value)
|
|
279
279
|
}
|
280
280
|
|
281
281
|
|
282
|
-
static
|
282
|
+
static StructField *
|
283
283
|
struct_field(Struct* s, VALUE fieldName)
|
284
284
|
{
|
285
285
|
StructLayout* layout = s->layout;
|
286
|
-
|
287
|
-
|
288
|
-
if
|
289
|
-
|
290
|
-
|
291
|
-
|
292
|
-
|
293
|
-
|
294
|
-
|
295
|
-
|
296
|
-
|
286
|
+
struct field_cache_entry *p_ce = FIELD_CACHE_LOOKUP(layout, fieldName);
|
287
|
+
|
288
|
+
/* Do a hash lookup only if cache entry is empty or fieldName is unexpected? */
|
289
|
+
if (unlikely(!SYMBOL_P(fieldName) || !p_ce->fieldName || p_ce->fieldName != fieldName)) {
|
290
|
+
VALUE rbField = rb_hash_aref(layout->rbFieldMap, fieldName);
|
291
|
+
if (unlikely(NIL_P(rbField))) {
|
292
|
+
VALUE str = rb_funcall2(fieldName, id_to_s, 0, NULL);
|
293
|
+
rb_raise(rb_eArgError, "No such field '%s'", StringValuePtr(str));
|
294
|
+
}
|
295
|
+
/* Write the retrieved coder to the cache */
|
296
|
+
p_ce->fieldName = fieldName;
|
297
|
+
p_ce->field = (StructField *) DATA_PTR(rbField);
|
297
298
|
}
|
298
299
|
|
299
|
-
return
|
300
|
+
return p_ce->field;
|
300
301
|
}
|
301
302
|
|
302
303
|
/*
|
@@ -308,22 +309,19 @@ static VALUE
|
|
308
309
|
struct_aref(VALUE self, VALUE fieldName)
|
309
310
|
{
|
310
311
|
Struct* s;
|
311
|
-
VALUE rbField;
|
312
312
|
StructField* f;
|
313
313
|
|
314
314
|
s = struct_validate(self);
|
315
315
|
|
316
|
-
|
317
|
-
f = (StructField *) DATA_PTR(rbField);
|
318
|
-
|
316
|
+
f = struct_field(s, fieldName);
|
319
317
|
if (f->get != NULL) {
|
320
318
|
return (*f->get)(f, s);
|
321
|
-
|
319
|
+
|
322
320
|
} else if (f->memoryOp != NULL) {
|
323
321
|
return (*f->memoryOp->get)(s->pointer, f->offset);
|
324
322
|
|
325
323
|
} else {
|
326
|
-
|
324
|
+
VALUE rbField = rb_hash_aref(s->layout->rbFieldMap, fieldName);
|
327
325
|
/* call up to the ruby code to fetch the value */
|
328
326
|
return rb_funcall2(rbField, id_get, 1, &s->rbPointer);
|
329
327
|
}
|
@@ -340,22 +338,20 @@ static VALUE
|
|
340
338
|
struct_aset(VALUE self, VALUE fieldName, VALUE value)
|
341
339
|
{
|
342
340
|
Struct* s;
|
343
|
-
VALUE rbField;
|
344
341
|
StructField* f;
|
345
342
|
|
346
|
-
|
347
343
|
s = struct_validate(self);
|
348
344
|
|
349
|
-
|
350
|
-
f = (StructField *) DATA_PTR(rbField);
|
345
|
+
f = struct_field(s, fieldName);
|
351
346
|
if (f->put != NULL) {
|
352
347
|
(*f->put)(f, s, value);
|
353
348
|
|
354
349
|
} else if (f->memoryOp != NULL) {
|
355
350
|
|
356
351
|
(*f->memoryOp->put)(s->pointer, f->offset, value);
|
357
|
-
|
352
|
+
|
358
353
|
} else {
|
354
|
+
VALUE rbField = rb_hash_aref(s->layout->rbFieldMap, fieldName);
|
359
355
|
/* call up to the ruby code to set the value */
|
360
356
|
VALUE argv[2];
|
361
357
|
argv[0] = s->rbPointer;
|
@@ -366,7 +362,7 @@ struct_aset(VALUE self, VALUE fieldName, VALUE value)
|
|
366
362
|
if (f->referenceRequired) {
|
367
363
|
store_reference_value(f, s, value);
|
368
364
|
}
|
369
|
-
|
365
|
+
|
370
366
|
return value;
|
371
367
|
}
|
372
368
|
|
@@ -389,7 +385,7 @@ struct_set_pointer(VALUE self, VALUE pointer)
|
|
389
385
|
return Qnil;
|
390
386
|
}
|
391
387
|
|
392
|
-
|
388
|
+
|
393
389
|
Data_Get_Struct(self, Struct, s);
|
394
390
|
Data_Get_Struct(pointer, AbstractMemory, memory);
|
395
391
|
layout = struct_layout(self);
|
@@ -398,7 +394,7 @@ struct_set_pointer(VALUE self, VALUE pointer)
|
|
398
394
|
rb_raise(rb_eArgError, "memory of %ld bytes too small for struct %s (expected at least %ld)",
|
399
395
|
memory->size, rb_obj_classname(self), (long) layout->base.ffiType->size);
|
400
396
|
}
|
401
|
-
|
397
|
+
|
402
398
|
s->pointer = MEMORY(pointer);
|
403
399
|
s->rbPointer = pointer;
|
404
400
|
rb_ivar_set(self, id_pointer_ivar, pointer);
|
@@ -491,7 +487,7 @@ struct_order(int argc, VALUE* argv, VALUE self)
|
|
491
487
|
VALUE retval = rb_obj_dup(self);
|
492
488
|
VALUE rbPointer = rb_funcall2(s->rbPointer, rb_intern("order"), argc, argv);
|
493
489
|
struct_set_pointer(retval, rbPointer);
|
494
|
-
|
490
|
+
|
495
491
|
return retval;
|
496
492
|
}
|
497
493
|
}
|
@@ -527,7 +523,7 @@ static VALUE
|
|
527
523
|
inline_array_initialize(VALUE self, VALUE rbMemory, VALUE rbField)
|
528
524
|
{
|
529
525
|
InlineArray* array;
|
530
|
-
|
526
|
+
|
531
527
|
Data_Get_Struct(self, InlineArray, array);
|
532
528
|
array->rbMemory = rbMemory;
|
533
529
|
array->rbField = rbField;
|
@@ -536,12 +532,12 @@ inline_array_initialize(VALUE self, VALUE rbMemory, VALUE rbField)
|
|
536
532
|
Data_Get_Struct(rbField, StructField, array->field);
|
537
533
|
Data_Get_Struct(array->field->rbType, ArrayType, array->arrayType);
|
538
534
|
Data_Get_Struct(array->arrayType->rbComponentType, Type, array->componentType);
|
539
|
-
|
535
|
+
|
540
536
|
array->op = get_memory_op(array->componentType);
|
541
537
|
if (array->op == NULL && array->componentType->nativeType == NATIVE_MAPPED) {
|
542
538
|
array->op = get_memory_op(((MappedType *) array->componentType)->type);
|
543
539
|
}
|
544
|
-
|
540
|
+
|
545
541
|
array->length = array->arrayType->length;
|
546
542
|
|
547
543
|
return self;
|
@@ -585,15 +581,15 @@ inline_array_aref(VALUE self, VALUE rbIndex)
|
|
585
581
|
Data_Get_Struct(self, InlineArray, array);
|
586
582
|
|
587
583
|
if (array->op != NULL) {
|
588
|
-
VALUE rbNativeValue = array->op->get(array->memory,
|
584
|
+
VALUE rbNativeValue = array->op->get(array->memory,
|
589
585
|
inline_array_offset(array, NUM2INT(rbIndex)));
|
590
586
|
if (unlikely(array->componentType->nativeType == NATIVE_MAPPED)) {
|
591
|
-
return rb_funcall(((MappedType *) array->componentType)->rbConverter,
|
587
|
+
return rb_funcall(((MappedType *) array->componentType)->rbConverter,
|
592
588
|
rb_intern("from_native"), 2, rbNativeValue, Qnil);
|
593
589
|
} else {
|
594
|
-
return rbNativeValue;
|
590
|
+
return rbNativeValue;
|
595
591
|
}
|
596
|
-
|
592
|
+
|
597
593
|
} else if (array->componentType->nativeType == NATIVE_STRUCT) {
|
598
594
|
VALUE rbOffset = INT2NUM(inline_array_offset(array, NUM2INT(rbIndex)));
|
599
595
|
VALUE rbLength = INT2NUM(array->componentType->ffiType->size);
|
@@ -622,12 +618,12 @@ inline_array_aset(VALUE self, VALUE rbIndex, VALUE rbValue)
|
|
622
618
|
|
623
619
|
if (array->op != NULL) {
|
624
620
|
if (unlikely(array->componentType->nativeType == NATIVE_MAPPED)) {
|
625
|
-
rbValue = rb_funcall(((MappedType *) array->componentType)->rbConverter,
|
621
|
+
rbValue = rb_funcall(((MappedType *) array->componentType)->rbConverter,
|
626
622
|
rb_intern("to_native"), 2, rbValue, Qnil);
|
627
623
|
}
|
628
624
|
array->op->put(array->memory, inline_array_offset(array, NUM2INT(rbIndex)),
|
629
625
|
rbValue);
|
630
|
-
|
626
|
+
|
631
627
|
} else if (array->componentType->nativeType == NATIVE_STRUCT) {
|
632
628
|
int offset = inline_array_offset(array, NUM2INT(rbIndex));
|
633
629
|
Struct* s;
|
@@ -665,11 +661,11 @@ static VALUE
|
|
665
661
|
inline_array_each(VALUE self)
|
666
662
|
{
|
667
663
|
InlineArray* array;
|
668
|
-
|
664
|
+
|
669
665
|
int i;
|
670
666
|
|
671
667
|
Data_Get_Struct(self, InlineArray, array);
|
672
|
-
|
668
|
+
|
673
669
|
for (i = 0; i < array->length; ++i) {
|
674
670
|
rb_yield(inline_array_aref(self, INT2FIX(i)));
|
675
671
|
}
|
@@ -692,7 +688,7 @@ inline_array_to_a(VALUE self)
|
|
692
688
|
Data_Get_Struct(self, InlineArray, array);
|
693
689
|
obj = rb_ary_new2(array->length);
|
694
690
|
|
695
|
-
|
691
|
+
|
696
692
|
for (i = 0; i < array->length; ++i) {
|
697
693
|
rb_ary_push(obj, inline_array_aref(self, INT2FIX(i)));
|
698
694
|
}
|
@@ -713,7 +709,7 @@ inline_array_to_s(VALUE self)
|
|
713
709
|
VALUE argv[2];
|
714
710
|
|
715
711
|
Data_Get_Struct(self, InlineArray, array);
|
716
|
-
|
712
|
+
|
717
713
|
if (array->componentType->nativeType != NATIVE_INT8 && array->componentType->nativeType != NATIVE_UINT8) {
|
718
714
|
VALUE dummy = Qnil;
|
719
715
|
return rb_call_super(0, &dummy);
|
@@ -734,7 +730,7 @@ static VALUE
|
|
734
730
|
inline_array_to_ptr(VALUE self)
|
735
731
|
{
|
736
732
|
InlineArray* array;
|
737
|
-
|
733
|
+
|
738
734
|
Data_Get_Struct(self, InlineArray, array);
|
739
735
|
|
740
736
|
return rb_funcall(array->rbMemory, rb_intern("slice"), 2,
|
@@ -778,7 +774,7 @@ rbffi_Struct_Init(VALUE moduleFFI)
|
|
778
774
|
/*
|
779
775
|
* Document-class: FFI::StructLayout::CharArray < FFI::Struct::InlineArray
|
780
776
|
*/
|
781
|
-
rbffi_StructLayoutCharArrayClass = rb_define_class_under(rbffi_StructLayoutClass, "CharArray",
|
777
|
+
rbffi_StructLayoutCharArrayClass = rb_define_class_under(rbffi_StructLayoutClass, "CharArray",
|
782
778
|
rbffi_StructInlineArrayClass);
|
783
779
|
rb_global_variable(&rbffi_StructLayoutCharArrayClass);
|
784
780
|
|
@@ -787,7 +783,7 @@ rbffi_Struct_Init(VALUE moduleFFI)
|
|
787
783
|
rb_define_method(StructClass, "initialize", struct_initialize, -1);
|
788
784
|
rb_define_method(StructClass, "initialize_copy", struct_initialize_copy, 1);
|
789
785
|
rb_define_method(StructClass, "order", struct_order, -1);
|
790
|
-
|
786
|
+
|
791
787
|
rb_define_alias(rb_singleton_class(StructClass), "alloc_in", "new");
|
792
788
|
rb_define_alias(rb_singleton_class(StructClass), "alloc_out", "new");
|
793
789
|
rb_define_alias(rb_singleton_class(StructClass), "alloc_inout", "new");
|
data/ext/ffi_c/Struct.h
CHANGED
@@ -34,11 +34,7 @@
|
|
34
34
|
#include "extconf.h"
|
35
35
|
#include "AbstractMemory.h"
|
36
36
|
#include "Type.h"
|
37
|
-
#ifdef RUBY_1_9
|
38
37
|
#include <ruby/st.h>
|
39
|
-
#else
|
40
|
-
#include <st.h>
|
41
|
-
#endif
|
42
38
|
|
43
39
|
#ifdef __cplusplus
|
44
40
|
extern "C" {
|
@@ -73,11 +69,21 @@ extern "C" {
|
|
73
69
|
int size;
|
74
70
|
int align;
|
75
71
|
ffi_type** ffiTypes;
|
76
|
-
|
72
|
+
|
73
|
+
/*
|
74
|
+
* We use the fieldName's minor 8 Bits as index to a 256 entry cache.
|
75
|
+
* This avoids full ruby hash lookups for repeated lookups.
|
76
|
+
*/
|
77
|
+
#define FIELD_CACHE_LOOKUP(this, sym) ( &(this)->cache_row[((sym) >> 8) & 0xff] )
|
78
|
+
|
79
|
+
struct field_cache_entry {
|
80
|
+
VALUE fieldName;
|
81
|
+
StructField *field;
|
82
|
+
} cache_row[0x100];
|
77
83
|
|
78
84
|
/** The number of reference tracking fields in this struct */
|
79
85
|
int referenceFieldCount;
|
80
|
-
|
86
|
+
|
81
87
|
VALUE rbFieldNames;
|
82
88
|
VALUE rbFieldMap;
|
83
89
|
VALUE rbFields;
|
data/ext/ffi_c/StructLayout.c
CHANGED
@@ -138,7 +138,7 @@ struct_field_initialize(int argc, VALUE* argv, VALUE self)
|
|
138
138
|
&& RTEST(rb_funcall2(rbType, rb_intern("reference_required?"), 0, NULL)));
|
139
139
|
break;
|
140
140
|
}
|
141
|
-
|
141
|
+
|
142
142
|
return self;
|
143
143
|
}
|
144
144
|
|
@@ -239,7 +239,7 @@ static VALUE
|
|
239
239
|
struct_field_put(VALUE self, VALUE pointer, VALUE value)
|
240
240
|
{
|
241
241
|
StructField* f;
|
242
|
-
|
242
|
+
|
243
243
|
Data_Get_Struct(self, StructField, f);
|
244
244
|
if (f->memoryOp == NULL) {
|
245
245
|
rb_raise(rb_eArgError, "put not supported for %s", rb_obj_classname(f->rbType));
|
@@ -261,7 +261,7 @@ static VALUE
|
|
261
261
|
function_field_get(VALUE self, VALUE pointer)
|
262
262
|
{
|
263
263
|
StructField* f;
|
264
|
-
|
264
|
+
|
265
265
|
Data_Get_Struct(self, StructField, f);
|
266
266
|
|
267
267
|
return rbffi_Function_NewInstance(f->rbType, (*rbffi_AbstractMemoryOps.pointer->get)(MEMORY(pointer), f->offset));
|
@@ -272,7 +272,7 @@ function_field_get(VALUE self, VALUE pointer)
|
|
272
272
|
* @param [AbstractMemory] pointer pointer to a {Struct}
|
273
273
|
* @param [Function, Proc] proc
|
274
274
|
* @return [Function]
|
275
|
-
* Set a {Function} to memory pointed by +pointer+ as a function.
|
275
|
+
* Set a {Function} to memory pointed by +pointer+ as a function.
|
276
276
|
*
|
277
277
|
* If a Proc is submitted as +proc+, it is automatically transformed to a {Function}.
|
278
278
|
*/
|
@@ -339,11 +339,11 @@ array_field_put(VALUE self, VALUE pointer, VALUE value)
|
|
339
339
|
{
|
340
340
|
StructField* f;
|
341
341
|
ArrayType* array;
|
342
|
-
|
342
|
+
|
343
343
|
|
344
344
|
Data_Get_Struct(self, StructField, f);
|
345
345
|
Data_Get_Struct(f->rbType, ArrayType, array);
|
346
|
-
|
346
|
+
|
347
347
|
if (isCharArray(array) && rb_obj_is_instance_of(value, rb_cString)) {
|
348
348
|
VALUE argv[2];
|
349
349
|
|
@@ -419,7 +419,6 @@ struct_layout_allocate(VALUE klass)
|
|
419
419
|
layout->rbFieldMap = Qnil;
|
420
420
|
layout->rbFieldNames = Qnil;
|
421
421
|
layout->rbFields = Qnil;
|
422
|
-
layout->fieldSymbolTable = st_init_numtable();
|
423
422
|
layout->base.ffiType = xcalloc(1, sizeof(*layout->base.ffiType));
|
424
423
|
layout->base.ffiType->size = 0;
|
425
424
|
layout->base.ffiType->alignment = 0;
|
@@ -488,7 +487,6 @@ struct_layout_initialize(VALUE self, VALUE fields, VALUE size, VALUE align)
|
|
488
487
|
|
489
488
|
|
490
489
|
layout->ffiTypes[i] = ftype->size > 0 ? ftype : NULL;
|
491
|
-
st_insert(layout->fieldSymbolTable, rbName, rbField);
|
492
490
|
rb_hash_aset(layout->rbFieldMap, rbName, rbField);
|
493
491
|
rb_ary_push(layout->rbFields, rbField);
|
494
492
|
rb_ary_push(layout->rbFieldNames, rbName);
|
@@ -501,14 +499,14 @@ struct_layout_initialize(VALUE self, VALUE fields, VALUE size, VALUE align)
|
|
501
499
|
return self;
|
502
500
|
}
|
503
501
|
|
504
|
-
/*
|
502
|
+
/*
|
505
503
|
* call-seq: [](field)
|
506
504
|
* @param [Symbol] field
|
507
505
|
* @return [StructLayout::Field]
|
508
506
|
* Get a field from the layout.
|
509
507
|
*/
|
510
508
|
static VALUE
|
511
|
-
struct_layout_union_bang(VALUE self)
|
509
|
+
struct_layout_union_bang(VALUE self)
|
512
510
|
{
|
513
511
|
const ffi_type *alignment_types[] = { &ffi_type_sint8, &ffi_type_sint16, &ffi_type_sint32, &ffi_type_sint64,
|
514
512
|
&ffi_type_float, &ffi_type_double, &ffi_type_longdouble, NULL };
|
@@ -602,6 +600,10 @@ struct_layout_mark(StructLayout *layout)
|
|
602
600
|
rb_gc_mark(layout->rbFieldMap);
|
603
601
|
rb_gc_mark(layout->rbFieldNames);
|
604
602
|
rb_gc_mark(layout->rbFields);
|
603
|
+
/* Clear the cache, to be safe from changes of fieldName VALUE by GC.compact.
|
604
|
+
* TODO: Move cache clearing to compactation callback provided by Ruby-2.7+.
|
605
|
+
*/
|
606
|
+
memset(&layout->cache_row, 0, sizeof(layout->cache_row));
|
605
607
|
}
|
606
608
|
|
607
609
|
static void
|
@@ -610,7 +612,6 @@ struct_layout_free(StructLayout *layout)
|
|
610
612
|
xfree(layout->ffiTypes);
|
611
613
|
xfree(layout->base.ffiType);
|
612
614
|
xfree(layout->fields);
|
613
|
-
st_free_table(layout->fieldSymbolTable);
|
614
615
|
xfree(layout);
|
615
616
|
}
|
616
617
|
|
@@ -627,7 +628,7 @@ rbffi_StructLayout_Init(VALUE moduleFFI)
|
|
627
628
|
*/
|
628
629
|
rbffi_StructLayoutClass = rb_define_class_under(moduleFFI, "StructLayout", ffi_Type);
|
629
630
|
rb_global_variable(&rbffi_StructLayoutClass);
|
630
|
-
|
631
|
+
|
631
632
|
/*
|
632
633
|
* Document-class: FFI::StructLayout::Field
|
633
634
|
* A field in a {StructLayout}.
|
data/ext/ffi_c/extconf.rb
CHANGED
@@ -53,7 +53,6 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
|
|
53
53
|
end
|
54
54
|
|
55
55
|
$defs << "-DHAVE_EXTCONF_H" if $defs.empty? # needed so create_header works
|
56
|
-
$defs << "-DRUBY_1_9" if RUBY_VERSION >= "1.9.0"
|
57
56
|
$defs << "-DFFI_BUILDING" if RbConfig::CONFIG['host_os'] =~ /mswin/ # for compatibility with newer libffi
|
58
57
|
|
59
58
|
create_header
|
data/lib/ffi/struct.rb
CHANGED
@@ -190,7 +190,7 @@ module FFI
|
|
190
190
|
# :field2, :pointer, 6, # set offset to 6 for this field
|
191
191
|
# :field3, :string
|
192
192
|
# end
|
193
|
-
# @example Creating a layout from a hash +spec+
|
193
|
+
# @example Creating a layout from a hash +spec+
|
194
194
|
# class MyStructFromHash < Struct
|
195
195
|
# layout :field1 => :int,
|
196
196
|
# :field2 => :pointer,
|
@@ -202,7 +202,6 @@ module FFI
|
|
202
202
|
# :function2, callback([:pointer], :void),
|
203
203
|
# :field3, :string
|
204
204
|
# end
|
205
|
-
# @note Creating a layout from a hash +spec+ is supported only for Ruby 1.9.
|
206
205
|
def layout(*spec)
|
207
206
|
warn "[DEPRECATION] Struct layout is already defined for class #{self.inspect}. Redefinition as in #{caller[0]} will be disallowed in ffi-2.0." if defined?(@layout)
|
208
207
|
return @layout if spec.size == 0
|
data/lib/ffi/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ffi
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.12.
|
4
|
+
version: 1.12.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Wayne Meissner
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-01
|
11
|
+
date: 2020-02-01 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|