christoph/wamr
1
Fork 0
Code Releases Activity

Implement wasm_runtime_init_thread_env for Windows platform (#683)

Browse Source 
Implement wasm_runtime_init_thread_env() for Windows platform by calling os_thread_env_init(): if current thread is created by developer himself but not runtime, developer should call wasm_runtime_init_thread_env() to init the thread environment before calling wasm function, and call wasm_runtime_destroy_thread_env() before thread exits.
And clear compile warnings for Windows platform, fix compile error for AliOS-Things platform

Signed-off-by: Wenyong Huang <wenyong.huang@intel.com>
This commit is contained in:
Wenyong Huang
2021-08-03 10:49:50 +08:00
committed by GitHub
parent 445722cac3
commit 541f577164
9 changed files with 115 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/shared/platform/include/platform_api_extension.h
View File

@ -84,11 +84,24 @@ int os_thread_detach(korp_tid);
*/
void os_thread_exit(void *retval);
/**
* Initialize current thread environment if current thread
* is created by developer but not runtime
*
* @return 0 if success, -1 otherwise
*/
int os_thread_env_init();
/**
* Destroy current thread environment
*/
void os_thread_env_destroy();
/**
* Suspend execution of the calling thread for (at least)
* usec microseconds
*
* @param return 0 if success, -1 otherwise
* @return 0 if success, -1 otherwise
*/
int os_usleep(uint32 usec);

56
core/shared/platform/windows/win_thread.c
View File

@ -288,6 +288,62 @@ os_thread_exit(void *retval)
_endthreadex(0);
}
int
os_thread_env_init()
{
os_thread_data *thread_data = TlsGetValue(thread_data_key);
if (thread_data)
/* Already created */
return BHT_OK;
if (!(thread_data = BH_MALLOC(sizeof(os_thread_data))))
return BHT_ERROR;
memset(thread_data, 0, sizeof(os_thread_data));
thread_data->thread_id = GetCurrentThreadId();
if (os_sem_init(&thread_data->wait_node.sem) != BHT_OK)
goto fail1;
if (os_mutex_init(&thread_data->wait_lock) != BHT_OK)
goto fail2;
if (os_cond_init(&thread_data->wait_cond) != BHT_OK)
goto fail3;
if (!TlsSetValue(thread_data_key, thread_data))
goto fail4;
return BHT_OK;
fail4:
os_cond_destroy(&thread_data->wait_cond);
fail3:
os_mutex_destroy(&thread_data->wait_lock);
fail2:
os_sem_destroy(&thread_data->wait_node.sem);
fail1:
BH_FREE(thread_data);
return BHT_ERROR;
}
void
os_thread_env_destroy()
{
os_thread_data *thread_data = TlsGetValue(thread_data_key);
/* Note that supervisor_thread_data's resources will be destroyed
by os_thread_sys_destroy() */
if (thread_data && thread_data != &supervisor_thread_data) {
TlsSetValue(thread_data_key, NULL);
os_cond_destroy(&thread_data->wait_cond);
os_mutex_destroy(&thread_data->wait_lock);
os_sem_destroy(&thread_data->wait_node.sem);
BH_FREE(thread_data);
}
}
int
os_sem_init(korp_sem *sem)
{