Changeset 0ef03fc in OpenModelica

Timestamp:

2019-01-19T13:31:28+01:00 (5 years ago)

Author:

hudson <openmodelica@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

683050ef

Parents:

23d8d265

git-author:

Anatoly Trosinenko <anatoly.trosinenko@…> (01/19/19 13:31:28)

git-committer:

hudson <openmodelica@…> (01/19/19 13:31:28)

Message:

Use the stack bottom value from the old threadData, if available

On linux, fetching the stack bottom involves huge amounts of user
and kernel CPU time. Assuming the stack bottom does not change over
time, copy it from the old threadData structure.

Belonging to [master]:

• OpenModelica/OMCompiler#2884

Location:

SimulationRuntime/c/meta

Files:

• meta_modelica_data.h (modified) (1 diff)
• meta_modelica_segv.h (modified) (1 diff)

SimulationRuntime/c/meta/meta_modelica_data.h

@@ -249 +249 @@
 #define MMC_ELSE() } else { threadData->mmc_jumper = old_jumper;
 
-#define MMC_TRY_TOP() { threadData_t threadDataOnStack = {0}, *oldThreadData = (threadData_t*)pthread_getspecific(mmc_thread_data_key),*threadData = &threadDataOnStack; pthread_setspecific(mmc_thread_data_key,threadData); pthread_mutex_init(&threadData->parentMutex,NULL); mmc_init_stackoverflow(threadData); MMC_TRY_INTERNAL(mmc_jumper) threadData->mmc_stack_overflow_jumper = threadData->mmc_jumper; /* Let the default stack overflow handler be the top-level handler */
-
-#define MMC_TRY_TOP_SET(X) { threadData_t threadDataOnStack = *((threadData_t*)X), *oldThreadData = (threadData_t*)pthread_getspecific(mmc_thread_data_key),*threadData = &threadDataOnStack; pthread_setspecific(mmc_thread_data_key,threadData); pthread_mutex_init(&threadData->parentMutex,NULL); mmc_init_stackoverflow(threadData); MMC_TRY_INTERNAL(mmc_jumper) threadData->mmc_stack_overflow_jumper = threadData->mmc_jumper; /* Let the default stack overflow handler be the top-level handler */
-
-#define MMC_TRY_TOP_INTERNAL() { threadData_t *oldThreadData = (threadData_t*)pthread_getspecific(mmc_thread_data_key); pthread_setspecific(mmc_thread_data_key,threadData); pthread_mutex_init(&threadData->parentMutex,NULL); mmc_init_stackoverflow(threadData); MMC_TRY_INTERNAL(mmc_jumper) threadData->mmc_stack_overflow_jumper = threadData->mmc_jumper;
+#define MMC_TRY_TOP() { threadData_t threadDataOnStack = {0}, *oldThreadData = (threadData_t*)pthread_getspecific(mmc_thread_data_key),*threadData = &threadDataOnStack; pthread_setspecific(mmc_thread_data_key,threadData); pthread_mutex_init(&threadData->parentMutex,NULL); mmc_init_stackoverflow_fast(threadData, oldThreadData); MMC_TRY_INTERNAL(mmc_jumper) threadData->mmc_stack_overflow_jumper = threadData->mmc_jumper; /* Let the default stack overflow handler be the top-level handler */
+
+#define MMC_TRY_TOP_SET(X) { threadData_t threadDataOnStack = *((threadData_t*)X), *oldThreadData = (threadData_t*)pthread_getspecific(mmc_thread_data_key),*threadData = &threadDataOnStack; pthread_setspecific(mmc_thread_data_key,threadData); pthread_mutex_init(&threadData->parentMutex,NULL); mmc_init_stackoverflow_fast(threadData, oldThreadData); MMC_TRY_INTERNAL(mmc_jumper) threadData->mmc_stack_overflow_jumper = threadData->mmc_jumper; /* Let the default stack overflow handler be the top-level handler */
+
+#define MMC_TRY_TOP_INTERNAL() { threadData_t *oldThreadData = (threadData_t*)pthread_getspecific(mmc_thread_data_key); pthread_setspecific(mmc_thread_data_key,threadData); pthread_mutex_init(&threadData->parentMutex,NULL); mmc_init_stackoverflow_fast(threadData, oldThreadData); MMC_TRY_INTERNAL(mmc_jumper) threadData->mmc_stack_overflow_jumper = threadData->mmc_jumper;
 #define MMC_CATCH_TOP(X) pthread_setspecific(mmc_thread_data_key,oldThreadData); } else {pthread_setspecific(mmc_thread_data_key,oldThreadData);X;}}}
 

SimulationRuntime/c/meta/meta_modelica_segv.h

@@ -58 +58 @@
 #endif
 
+#if defined(linux)
+static inline void mmc_init_stackoverflow_fast(threadData_t *threadData, threadData_t *oldThreadData)
+{
+  if (oldThreadData)
+    threadData->stackBottom = oldThreadData->stackBottom;
+  else
+    mmc_init_stackoverflow(threadData);
+}
+#else
+static inline void mmc_init_stackoverflow_fast(threadData_t *threadData, threadData_t *oldThreadData)
+{
+  mmc_init_stackoverflow(threadData);
+}
+#endif
+
 #ifndef __has_builtin
   #define __has_builtin(x) 0  /* Compatibility with non-clang compilers */