YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add reference support for native pointers. (#4615)

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com
This commit is contained in:
Zoltan Herczeg
2021-04-19 14:47:17 +02:00
committed by GitHub
parent cc1a263657
commit ec3ed65b56
23 changed files with 681 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit-core/test-api.c
+3 -1
View File
@@ -138,7 +138,9 @@ handler_construct_2_freecb (void *native_p, /**< native pointer */
#define JERRY_DEFINE_NATIVE_HANDLE_INFO(c_type, native_free_cb) \
static const jerry_object_native_info_t JERRY_NATIVE_HANDLE_INFO_FOR_CTYPE (c_type) = \
{ \
.free_cb = (jerry_object_native_free_callback_t) native_free_cb \
.free_cb = (jerry_object_native_free_callback_t) native_free_cb, \
.number_of_references = 0, \
.offset_of_references = 0, \
}
JERRY_DEFINE_NATIVE_HANDLE_INFO (bind1, handler_construct_1_freecb);
tests/unit-core/test-native-callback-nested.c
+6 -2
View File
@@ -26,7 +26,9 @@ static void native_cb2 (void)
static const jerry_object_native_info_t native_info2 =
{
.free_cb = (jerry_object_native_free_callback_t) native_cb2
.free_cb = (jerry_object_native_free_callback_t) native_cb2,
.number_of_references = 0,
.offset_of_references = 0,
};
static void native_cb (void)
@@ -40,7 +42,9 @@ static void native_cb (void)
static const jerry_object_native_info_t native_info =
{
.free_cb = (jerry_object_native_free_callback_t) native_cb
.free_cb = (jerry_object_native_free_callback_t) native_cb,
.number_of_references = 0,
.offset_of_references = 0,
};
static void *
tests/unit-core/test-native-pointer.c
+185
View File
@@ -33,18 +33,108 @@ native_free_callback (void *native_p, /**< native pointer */
static const jerry_object_native_info_t native_info_1 =
{
.free_cb = native_free_callback,
.number_of_references = 0,
.offset_of_references = 0,
};
static const jerry_object_native_info_t native_info_2 =
{
.free_cb = NULL,
.number_of_references = 0,
.offset_of_references = 0,
};
static const jerry_object_native_info_t native_info_3 =
{
.free_cb = NULL,
.number_of_references = 0,
.offset_of_references = 0,
};
typedef struct
{
uint32_t check_before;
jerry_value_t a;
jerry_value_t b;
jerry_value_t c;
uint32_t check_after;
} test_references_t;
static test_references_t test_references1;
static test_references_t test_references2;
static test_references_t test_references3;
static test_references_t test_references4;
static int call_count = 0;
static void
native_references_free_callback (void *native_p, /**< native pointer */
jerry_object_native_info_t *info_p) /**< native info */
{
test_references_t *refs_p = (test_references_t *) native_p;
TEST_ASSERT ((refs_p == &test_references1 && test_references1.check_before == 0x12345678)
|| (refs_p == &test_references2 && test_references2.check_before == 0x87654321)
|| (refs_p == &test_references3 && test_references3.check_before == 0x12344321));
TEST_ASSERT (refs_p->check_before == refs_p->check_after);
uint32_t check = refs_p->check_before;
jerry_native_pointer_release_references (native_p, info_p);
TEST_ASSERT (jerry_value_is_undefined (refs_p->a));
TEST_ASSERT (jerry_value_is_undefined (refs_p->b));
TEST_ASSERT (jerry_value_is_undefined (refs_p->c));
TEST_ASSERT (refs_p->check_before == check);
TEST_ASSERT (refs_p->check_after == check);
call_count++;
} /* native_references_free_callback */
static const jerry_object_native_info_t native_info_4 =
{
.free_cb = native_references_free_callback,
.number_of_references = 3,
.offset_of_references = (uint16_t) offsetof (test_references_t, a),
};
static void
init_references (test_references_t *refs_p, /**< native pointer */
uint32_t check) /**< value for memory check */
{
/* Memory garbage */
refs_p->check_before = check;
refs_p->a = 1;
refs_p->b = 2;
refs_p->c = 3;
refs_p->check_after = check;
jerry_native_pointer_init_references ((void *) refs_p, &native_info_4);
TEST_ASSERT (jerry_value_is_undefined (refs_p->a));
TEST_ASSERT (jerry_value_is_undefined (refs_p->b));
TEST_ASSERT (jerry_value_is_undefined (refs_p->c));
TEST_ASSERT (refs_p->check_before == check);
TEST_ASSERT (refs_p->check_after == check);
} /* init_references */
static void
set_references (test_references_t *refs_p, /**< native pointer */
jerry_value_t value1, /**< first value to be set */
jerry_value_t value2, /**< second value to be set */
jerry_value_t value3) /**< third value to be set */
{
jerry_native_pointer_set_reference (&refs_p->a, value1);
jerry_native_pointer_set_reference (&refs_p->b, value2);
jerry_native_pointer_set_reference (&refs_p->c, value3);
TEST_ASSERT (jerry_value_is_object (value1) ? jerry_value_is_object (refs_p->a)
: jerry_value_is_string (refs_p->a));
TEST_ASSERT (jerry_value_is_object (value2) ? jerry_value_is_object (refs_p->b)
: jerry_value_is_string (refs_p->b));
TEST_ASSERT (jerry_value_is_object (value3) ? jerry_value_is_object (refs_p->c)
: jerry_value_is_string (refs_p->c));
} /* set_references */
static void
check_native_info (jerry_value_t object_value, /**< object value */
const jerry_object_native_info_t *native_info_p, /**< native info */
@@ -149,10 +239,105 @@ main (void)
TEST_ASSERT (!jerry_get_object_native_pointer (object_value, NULL, &native_info_2));
TEST_ASSERT (!jerry_get_object_native_pointer (object_value, NULL, &native_info_3));
/* Test value references */
jerry_value_t string1_value = jerry_create_string ((const jerry_char_t *) "String1");
jerry_value_t string2_value = jerry_create_string ((const jerry_char_t *) "String2");
jerry_value_t object1_value = jerry_create_object ();
jerry_value_t object2_value = jerry_create_object ();
init_references (&test_references1, 0x12345678);
init_references (&test_references2, 0x87654321);
jerry_set_object_native_pointer (object1_value, (void *) &test_references1, &native_info_4);
jerry_set_object_native_pointer (object2_value, (void *) &test_references2, &native_info_4);
/* Assign values (cross reference between object1 and object2). */
set_references (&test_references1, string1_value, object2_value, string2_value);
set_references (&test_references2, string2_value, object1_value, string1_value);
jerry_gc (JERRY_GC_PRESSURE_HIGH);
/* Reassign values. */
set_references (&test_references1, object2_value, string2_value, string1_value);
set_references (&test_references2, object1_value, string1_value, string2_value);
jerry_gc (JERRY_GC_PRESSURE_HIGH);
jerry_release_value (object1_value);
jerry_release_value (object2_value);
object1_value = jerry_create_object ();
object2_value = jerry_create_object ();
init_references (&test_references3, 0x12344321);
/* Assign the same native pointer to multiple objects. */
jerry_set_object_native_pointer (object1_value, (void *) &test_references3, &native_info_4);
jerry_set_object_native_pointer (object2_value, (void *) &test_references3, &native_info_4);
set_references (&test_references3, object1_value, object2_value, string1_value);
jerry_gc (JERRY_GC_PRESSURE_HIGH);
init_references (&test_references4, 0x87655678);
/* Re-assign reference */
jerry_set_object_native_pointer (object1_value, (void *) &test_references4, &native_info_4);
set_references (&test_references4, string1_value, string2_value, string1_value);
jerry_set_object_native_pointer (object1_value, NULL, &native_info_4);
jerry_native_pointer_release_references ((void *) &test_references4, &native_info_4);
/* Calling jerry_native_pointer_init_references with test_references4 is optional here. */
jerry_set_object_native_pointer (object1_value, (void *) &test_references4, &native_info_4);
set_references (&test_references4, string2_value, string1_value, string2_value);
TEST_ASSERT (jerry_delete_object_native_pointer (object1_value, &native_info_4));
jerry_native_pointer_release_references ((void *) &test_references4, &native_info_4);
jerry_release_value (object1_value);
jerry_release_value (object2_value);
/* Delete references */
for (int i = 0; i < 3; i++)
{
object1_value = jerry_create_object ();
jerry_set_object_native_pointer (object1_value, global_p, NULL);
jerry_set_object_native_pointer (object1_value, (void *) &test_references4, &native_info_4);
jerry_set_object_native_pointer (object1_value, global_p, &native_info_2);
set_references (&test_references4, string1_value, string2_value, object1_value);
jerry_gc (JERRY_GC_PRESSURE_HIGH);
if (i == 1)
{
TEST_ASSERT (jerry_delete_object_native_pointer (object1_value, NULL));
}
else if (i == 2)
{
TEST_ASSERT (jerry_delete_object_native_pointer (object1_value, &native_info_2));
}
TEST_ASSERT (jerry_delete_object_native_pointer (object1_value, &native_info_4));
jerry_native_pointer_release_references ((void *) &test_references4, &native_info_4);
jerry_release_value (object1_value);
}
jerry_release_value (string1_value);
jerry_release_value (string2_value);
jerry_release_value (object_value);
jerry_cleanup ();
TEST_ASSERT (global_counter == 0);
TEST_ASSERT (call_count == 3);
return 0;
} /* main */
tests/unit-core/test-objects-foreach.c
+3 -1
View File
@@ -141,7 +141,9 @@ static void free_test_data (void *native_p, /**< native pointer */
static const jerry_object_native_info_t test_info =
{
.free_cb = free_test_data
.free_cb = free_test_data,
.number_of_references = 0,
.offset_of_references = 0,
};
static const jerry_char_t strict_equal_source[] = "var x = function(a, b) {return a === b;}; x";
tests/unit-core/test-proxy.c
+2
View File
@@ -162,6 +162,8 @@ proxy_native_freecb (void *native_p, /**< native pointer */
static const jerry_object_native_info_t proxy_native_info =
{
.free_cb = proxy_native_freecb,
.number_of_references = 0,
.offset_of_references = 0,
};
static jerry_value_t