diff options
| author | Samuel Williams <samuel.williams@oriontransfer.co.nz> | 2023-03-14 20:07:59 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-14 20:07:59 +1300 |
| commit | ac65ce16e904695ba45888d3fba641d12caf733a (patch) | |
| tree | 35b467c0c77a0eef7aea7a3ffda0dba4fd025408 /vm.c | |
| parent | b27793835b858b442a7c2c39b442ab688504d3fc (diff) | |
| download | ruby-ac65ce16e904695ba45888d3fba641d12caf733a.tar.gz | |
Revert SIGCHLD changes to diagnose CI failures. (#7517)
* Revert "Remove special handling of `SIGCHLD`. (#7482)"
This reverts commit 44a0711eab7fbc71ac2c8ff489d8c53e97a8fe75.
* Revert "Remove prototypes for functions that are no longer used. (#7497)"
This reverts commit 4dce12bead3bfd91fd80b5e7195f7f540ffffacb.
* Revert "Remove SIGCHLD `waidpid`. (#7476)"
This reverts commit 1658e7d96696a656d9bd0a0c84c82cde86914ba2.
* Fix change to rjit variable name.
Diffstat (limited to 'vm.c')
| -rw-r--r-- | vm.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -2885,6 +2885,7 @@ ruby_vm_destruct(rb_vm_t *vm) if (objspace) { rb_objspace_free(objspace); } + rb_native_mutex_destroy(&vm->waitpid_lock); rb_native_mutex_destroy(&vm->workqueue_lock); /* after freeing objspace, you *can't* use ruby_xfree() */ ruby_mimfree(vm); @@ -2894,6 +2895,7 @@ ruby_vm_destruct(rb_vm_t *vm) return 0; } +size_t rb_vm_memsize_waiting_list(struct ccan_list_head *waiting_list); // process.c size_t rb_vm_memsize_waiting_fds(struct ccan_list_head *waiting_fds); // thread.c size_t rb_vm_memsize_postponed_job_buffer(void); // vm_trace.c size_t rb_vm_memsize_workqueue(struct ccan_list_head *workqueue); // vm_trace.c @@ -2950,6 +2952,8 @@ vm_memsize(const void *ptr) return ( sizeof(rb_vm_t) + + rb_vm_memsize_waiting_list(&vm->waiting_pids) + + rb_vm_memsize_waiting_list(&vm->waiting_grps) + rb_vm_memsize_waiting_fds(&vm->waiting_fds) + rb_st_memsize(vm->loaded_features_index) + rb_st_memsize(vm->loading_table) + |