diff options
| author | Juan Linietsky | 2017-11-09 23:34:01 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-11-09 23:35:34 -0300 |
| commit | 192a4d7de5c557bdfe83bd180cd603d7e280ebd4 (patch) | |
| tree | 94ce9779b3f84fbc320ba83624e326d487ca1c04 /servers/physics_2d/physics_2d_server_wrap_mt.cpp | |
| parent | 0de6cba7e7e114f71fabb3dbe02cf260f7d3e2c6 (diff) | |
| download | godot-192a4d7de5c557bdfe83bd180cd603d7e280ebd4.tar.gz godot-192a4d7de5c557bdfe83bd180cd603d7e280ebd4.tar.zst godot-192a4d7de5c557bdfe83bd180cd603d7e280ebd4.zip | |
Reworked how servers preallocate RIDs, should fix #10970
Diffstat (limited to '')
| -rw-r--r-- | servers/physics_2d/physics_2d_server_wrap_mt.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/servers/physics_2d/physics_2d_server_wrap_mt.cpp b/servers/physics_2d/physics_2d_server_wrap_mt.cpp index f8f3b620d..f92ed18de 100644 --- a/servers/physics_2d/physics_2d_server_wrap_mt.cpp +++ b/servers/physics_2d/physics_2d_server_wrap_mt.cpp @@ -130,19 +130,23 @@ void Physics2DServerWrapMT::finish() { Thread::wait_to_finish(thread); memdelete(thread); - /* - shape_free_cached_ids(); - area_free_cached_ids(); - body_free_cached_ids(); - pin_joint_free_cached_ids(); - groove_joint_free_cached_ids(); - damped_string_free_cached_ids(); -*/ thread = NULL; } else { physics_2d_server->finish(); } + line_shape_free_cached_ids(); + ray_shape_free_cached_ids(); + segment_shape_free_cached_ids(); + circle_shape_free_cached_ids(); + rectangle_shape_free_cached_ids(); + convex_polygon_shape_free_cached_ids(); + concave_polygon_shape_free_cached_ids(); + + space_free_cached_ids(); + area_free_cached_ids(); + body_free_cached_ids(); + if (step_sem) memdelete(step_sem); } @@ -158,12 +162,7 @@ Physics2DServerWrapMT::Physics2DServerWrapMT(Physics2DServer *p_contained, bool step_thread_up = false; alloc_mutex = Mutex::create(); - shape_pool_max_size = GLOBAL_GET("memory/limits/multithreaded_server/rid_pool_prealloc"); - area_pool_max_size = GLOBAL_GET("memory/limits/multithreaded_server/rid_pool_prealloc"); - body_pool_max_size = GLOBAL_GET("memory/limits/multithreaded_server/rid_pool_prealloc"); - pin_joint_pool_max_size = GLOBAL_GET("memory/limits/multithreaded_server/rid_pool_prealloc"); - groove_joint_pool_max_size = GLOBAL_GET("memory/limits/multithreaded_server/rid_pool_prealloc"); - damped_spring_joint_pool_max_size = GLOBAL_GET("memory/limits/multithreaded_server/rid_pool_prealloc"); + pool_max_size = GLOBAL_GET("memory/limits/multithreaded_server/rid_pool_prealloc"); if (!p_create_thread) { server_thread = Thread::get_caller_id(); |