diff options
| author | Philipp Stephani | 2018-02-11 21:38:22 +0100 |
|---|---|---|
| committer | Philipp Stephani | 2020-01-03 19:24:10 +0100 |
| commit | 48ffef5ef4b34799941a033591ea827d40025939 (patch) | |
| tree | 67b00c1bc546f3c9ef601c10db634da3094f7f57 /test/data | |
| parent | 2b6d702e5d2d572640c6bcd43f54138bacbe7ac8 (diff) | |
| download | emacs-48ffef5ef4b34799941a033591ea827d40025939.tar.gz emacs-48ffef5ef4b34799941a033591ea827d40025939.zip | |
Implement finalizers for module functions (Bug#30373)
* src/module-env-28.h: Add new module environment functions to
module environment for Emacs 28.
* src/emacs-module.h.in: Document that 'emacs_finalizer' also works
for function finalizers.
* src/emacs-module.c (CHECK_MODULE_FUNCTION): New function.
(struct Lisp_Module_Function): Add finalizer data member.
(module_make_function): Initialize finalizer.
(module_get_function_finalizer)
(module_set_function_finalizer): New module environment functions.
(module_finalize_function): New function.
(initialize_environment): Initialize new environment functions.
* src/alloc.c (cleanup_vector): Call potential module function
finalizer during garbage collection.
* test/data/emacs-module/mod-test.c (signal_error): New helper
function.
(memory_full): Use it.
(finalizer): New example function finalizer.
(Fmod_test_make_function_with_finalizer)
(Fmod_test_function_finalizer_calls): New test module functions.
(emacs_module_init): Define them.
* test/src/emacs-module-tests.el (module/function-finalizer): New unit
test.
* doc/lispref/internals.texi (Module Functions): Document new
functionality.
(Module Misc): Move description of 'emacs_finalizer' type to 'Module
Functions' node, and add a reference to it.
* etc/NEWS: Mention new functionality.
Diffstat (limited to 'test/data')
| -rw-r--r-- | test/data/emacs-module/mod-test.c | 49 |
1 files changed, 47 insertions, 2 deletions
diff --git a/test/data/emacs-module/mod-test.c b/test/data/emacs-module/mod-test.c index 8dc9ff144af..1a0a879a1bc 100644 --- a/test/data/emacs-module/mod-test.c +++ b/test/data/emacs-module/mod-test.c | |||
| @@ -373,15 +373,20 @@ Fmod_test_add_nanosecond (emacs_env *env, ptrdiff_t nargs, emacs_value *args, | |||
| 373 | } | 373 | } |
| 374 | 374 | ||
| 375 | static void | 375 | static void |
| 376 | memory_full (emacs_env *env) | 376 | signal_error (emacs_env *env, const char *message) |
| 377 | { | 377 | { |
| 378 | const char *message = "Memory exhausted"; | ||
| 379 | emacs_value data = env->make_string (env, message, strlen (message)); | 378 | emacs_value data = env->make_string (env, message, strlen (message)); |
| 380 | env->non_local_exit_signal (env, env->intern (env, "error"), | 379 | env->non_local_exit_signal (env, env->intern (env, "error"), |
| 381 | env->funcall (env, env->intern (env, "list"), 1, | 380 | env->funcall (env, env->intern (env, "list"), 1, |
| 382 | &data)); | 381 | &data)); |
| 383 | } | 382 | } |
| 384 | 383 | ||
| 384 | static void | ||
| 385 | memory_full (emacs_env *env) | ||
| 386 | { | ||
| 387 | signal_error (env, "Memory exhausted"); | ||
| 388 | } | ||
| 389 | |||
| 385 | enum | 390 | enum |
| 386 | { | 391 | { |
| 387 | max_count = ((SIZE_MAX < PTRDIFF_MAX ? SIZE_MAX : PTRDIFF_MAX) | 392 | max_count = ((SIZE_MAX < PTRDIFF_MAX ? SIZE_MAX : PTRDIFF_MAX) |
| @@ -490,6 +495,42 @@ Fmod_test_double (emacs_env *env, ptrdiff_t nargs, emacs_value *args, | |||
| 490 | return result; | 495 | return result; |
| 491 | } | 496 | } |
| 492 | 497 | ||
| 498 | static int function_data; | ||
| 499 | static int finalizer_calls_with_correct_data; | ||
| 500 | static int finalizer_calls_with_incorrect_data; | ||
| 501 | |||
| 502 | static void | ||
| 503 | finalizer (void *data) | ||
| 504 | { | ||
| 505 | if (data == &function_data) | ||
| 506 | ++finalizer_calls_with_correct_data; | ||
| 507 | else | ||
| 508 | ++finalizer_calls_with_incorrect_data; | ||
| 509 | } | ||
| 510 | |||
| 511 | static emacs_value | ||
| 512 | Fmod_test_make_function_with_finalizer (emacs_env *env, ptrdiff_t nargs, | ||
| 513 | emacs_value *args, void *data) | ||
| 514 | { | ||
| 515 | emacs_value fun | ||
| 516 | = env->make_function (env, 2, 2, Fmod_test_sum, NULL, &function_data); | ||
| 517 | env->set_function_finalizer (env, fun, finalizer); | ||
| 518 | if (env->get_function_finalizer (env, fun) != finalizer) | ||
| 519 | signal_error (env, "Invalid finalizer"); | ||
| 520 | return fun; | ||
| 521 | } | ||
| 522 | |||
| 523 | static emacs_value | ||
| 524 | Fmod_test_function_finalizer_calls (emacs_env *env, ptrdiff_t nargs, | ||
| 525 | emacs_value *args, void *data) | ||
| 526 | { | ||
| 527 | emacs_value Flist = env->intern (env, "list"); | ||
| 528 | emacs_value list_args[] | ||
| 529 | = {env->make_integer (env, finalizer_calls_with_correct_data), | ||
| 530 | env->make_integer (env, finalizer_calls_with_incorrect_data)}; | ||
| 531 | return env->funcall (env, Flist, 2, list_args); | ||
| 532 | } | ||
| 533 | |||
| 493 | /* Lisp utilities for easier readability (simple wrappers). */ | 534 | /* Lisp utilities for easier readability (simple wrappers). */ |
| 494 | 535 | ||
| 495 | /* Provide FEATURE to Emacs. */ | 536 | /* Provide FEATURE to Emacs. */ |
| @@ -566,6 +607,10 @@ emacs_module_init (struct emacs_runtime *ert) | |||
| 566 | DEFUN ("mod-test-add-nanosecond", Fmod_test_add_nanosecond, 1, 1, NULL, NULL); | 607 | DEFUN ("mod-test-add-nanosecond", Fmod_test_add_nanosecond, 1, 1, NULL, NULL); |
| 567 | DEFUN ("mod-test-nanoseconds", Fmod_test_nanoseconds, 1, 1, NULL, NULL); | 608 | DEFUN ("mod-test-nanoseconds", Fmod_test_nanoseconds, 1, 1, NULL, NULL); |
| 568 | DEFUN ("mod-test-double", Fmod_test_double, 1, 1, NULL, NULL); | 609 | DEFUN ("mod-test-double", Fmod_test_double, 1, 1, NULL, NULL); |
| 610 | DEFUN ("mod-test-make-function-with-finalizer", | ||
| 611 | Fmod_test_make_function_with_finalizer, 0, 0, NULL, NULL); | ||
| 612 | DEFUN ("mod-test-function-finalizer-calls", | ||
| 613 | Fmod_test_function_finalizer_calls, 0, 0, NULL, NULL); | ||
| 569 | 614 | ||
| 570 | #undef DEFUN | 615 | #undef DEFUN |
| 571 | 616 | ||