fix: switch state

Signed-off-by: hwk2077 <[email protected]>
IoTS-P · Oct 6, 2023 · bb77459 · bb77459
1 parent 790977b
commit bb77459
Show file tree

Hide file tree

Showing 3 changed files with 279 additions and 116 deletions.
diff --git a/libs2ecore/src/S2EExecutor.cpp b/libs2ecore/src/S2EExecutor.cpp
@@ -818,10 +818,10 @@ void S2EExecutor::stateSwitchTimerCallback(void *opaque) {
 void S2EExecutor::validPathSearcherStateSwitchCallback(void *opaque) {
     S2EExecutor *c = (S2EExecutor *) opaque;
 
-    // assert(env->current_tb == nullptr);
+    assert(env->current_tb == nullptr);
 
     if (g_s2e_state) {
-        // c->doLoadBalancing();
+        c->doLoadBalancing();
         S2EExecutionState *nextState = c->selectNextState(g_s2e_state);
         if (nextState) {
             g_s2e_state = nextState;
@@ -830,9 +830,9 @@ void S2EExecutor::validPathSearcherStateSwitchCallback(void *opaque) {
             return;
         }
     }
+    libcpu_mod_timer(c->m_stateSwitchTimer, libcpu_get_clock_ms(host_clock) + 100);
 }
 
-
 void S2EExecutor::initializeStateSwitchTimer() {
     m_stateSwitchTimer = libcpu_new_timer_ms(host_clock, &stateSwitchTimerCallback, this);
     libcpu_mod_timer(m_stateSwitchTimer, libcpu_get_clock_ms(host_clock) + 100);
@@ -1515,6 +1515,9 @@ S2EExecutor::StatePair S2EExecutor::fork(ExecutionState &current, const klee::re
         currentState->forkDisabled = true;
     }
 
+
+    g_s2e->getDebugStream() << "[dddcondition: " << condition << "] "
+                                << "\n";
     res = Executor::fork(current, condition, conditionInCurrentState);
 
     currentState->forkDisabled = oldForkStatus;
@@ -1928,7 +1931,11 @@ void S2EExecutor::setupTimersHandler() {
 bool S2EExecutor::suspendState(S2EExecutionState *state) {
     if (searcher) {
         searcher->removeState(state, nullptr);
+        g_s2e->getDebugStream() << "[states' size " << getStatesCount() << "] "
+                         << "\n";
         size_t r = states.erase(state);
+        g_s2e->getDebugStream() << "[states' size " << getStatesCount() << "] "
+                                << "\n";
         assert(r == 1);
         return true;
     }