Skip to content

Revert "Fixed memory leak because the taichi was not waited" #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PENGUINLIONG merged 1 commit into from
Dec 12, 2022
Merged

Revert "Fixed memory leak because the taichi was not waited" #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions src/taichi_unity_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,23 +174,18 @@ void UNITY_INTERFACE_EXPORT UNITY_INTERFACE_API UnityPluginUnload() {
void UNITY_INTERFACE_API tix_render_thread_main(int32_t event_id) {
if (INSTANCE == nullptr || RUNTIME_STATE == nullptr) { return; }
TiRuntime runtime = RUNTIME_STATE->runtime;
std::lock_guard<std::mutex> guard(RUNTIME_STATE->mutex);

std::vector<TixNativeBufferUnity> pending_native_buffer_imports;
std::vector<std::unique_ptr<RenderThreadTask>> pending_tasks;
{
std::lock_guard<std::mutex> guard(RUNTIME_STATE->mutex);
pending_native_buffer_imports = std::move(RUNTIME_STATE->pending_native_buffer_imports_);
pending_tasks = std::move(RUNTIME_STATE->pending_tasks);
}

for (TixNativeBufferUnity native_buffer : pending_native_buffer_imports) {
for (TixNativeBufferUnity native_buffer : RUNTIME_STATE->pending_native_buffer_imports_) {
TiMemory memory = INSTANCE->import_native_memory(runtime, native_buffer);
RUNTIME_STATE->imported_native_buffers_.emplace(std::make_pair(native_buffer, memory));
}
RUNTIME_STATE->pending_native_buffer_imports_.clear();

for (const auto& pending_task : pending_tasks) {
for (const auto& pending_task : RUNTIME_STATE->pending_tasks) {
pending_task->run_in_render_thread();
}
RUNTIME_STATE->pending_tasks.clear();

// Signal the event after all Taichi tasks.
ti_signal_event(runtime, RUNTIME_STATE->event);
Expand All @@ -202,7 +197,6 @@ void UNITY_INTERFACE_API tix_render_thread_main(int32_t event_id) {




// Import unity runtime. The arch of runtime depends on what Unity provided.
TI_DLL_EXPORT TiRuntime TI_API_CALL tix_import_native_runtime_unity() {
assert(INSTANCE != nullptr);
Expand Down Expand Up @@ -272,8 +266,7 @@ TI_DLL_EXPORT void TI_API_CALL tix_copy_memory_host_to_device_unity(
// Unity graphics event invocation can run our code in the rendering thread
// Note that submitting commands simultaneously to a same queue is not allowed
// by any graphics API.
TI_DLL_EXPORT void* TI_API_CALL tix_submit_async_unity(TiRuntime runtime) {
ti_wait(runtime);
TI_DLL_EXPORT void* TI_API_CALL tix_submit_async_unity(TiRuntime runtime) {
return (void*)(&tix_render_thread_main);
}

Expand Down