fixed thread init bug for non-multithreaded

sstsimulator · Oct 30, 2017 · 6052b28 · 6052b28
1 parent 56c20c2
commit 6052b28
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/autogen.sh b/autogen.sh
@@ -0,0 +1 @@
+bootstrap.sh
diff --git a/sstmac/software/process/operating_system.cc b/sstmac/software/process/operating_system.cc
@@ -239,11 +239,11 @@ operating_system::init_threading(sprockit::sim_parameters* params)
     active_os_.resize(nthread());
   }
   lock.unlock();
-#endif
 
   //make sure to stash the thread ID in some thread-local storage
   void* stack = thread_info::get_current_stack();
   thread_info::set_thread_id(stack, threadId());
+#endif
 
   des_context_ = thread_context::factory::get_optional_param(
         "context", thread_context::default_threading(), params);

diff --git a/tests/Makefile.skeleton_tests b/tests/Makefile.skeleton_tests
@@ -47,7 +47,7 @@ test_skeleton_boxml.$(CHKSUF): boxml
     -p node.app1.boxml_eventfiles=$(top_srcdir)/skeletons/boxml/example/test-mlmg-4-4.xml 
 
 test_skeleton_%.$(CHKSUF): % 
-	$(PYRUNTEST) 8 $(top_srcdir) $@ Exact \
+	$(PYRUNTEST) 30 $(top_srcdir) $@ Exact \
     ./skeletons/$*/run$* -f $(top_srcdir)/skeletons/$*/parameters.ini --no-wall-time
 
 test_skeleton_CoMD.$(CHKSUF): CoMD pots