projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug fix
[c11tester.git]
/
schedule.cc
diff --git
a/schedule.cc
b/schedule.cc
index fff26ce2128a40d7258e13bfd4ab40e3fa2e35f0..cb97d5bdba2efdbd95f44e1d4a355f9499140826 100644
(file)
--- a/
schedule.cc
+++ b/
schedule.cc
@@
-5,7
+5,6
@@
#include "schedule.h"
#include "common.h"
#include "model.h"
#include "schedule.h"
#include "common.h"
#include "model.h"
-#include "nodestack.h"
#include "execution.h"
#include "fuzzer.h"
#include "execution.h"
#include "fuzzer.h"
@@
-115,7
+114,7
@@
bool Scheduler::is_sleep_set(const Thread *t) const
bool Scheduler::all_threads_sleeping() const
{
bool sleeping = false;
bool Scheduler::all_threads_sleeping() const
{
bool sleeping = false;
- for (int i = 0;
i < enabled_len;
i++)
+ for (int i = 0;
i < enabled_len;
i++)
if (enabled[i] == THREAD_ENABLED)
return false;
else if (enabled[i] == THREAD_SLEEP_SET)
if (enabled[i] == THREAD_ENABLED)
return false;
else if (enabled[i] == THREAD_SLEEP_SET)
@@
-197,24
+196,22
@@
void Scheduler::wake(Thread *t)
/**
* @brief Select a Thread to run via round-robin
*
/**
* @brief Select a Thread to run via round-robin
*
- * @param n The current Node, holding priority information for the next thread
- * selection
*
* @return The next Thread to run
*/
*
* @return The next Thread to run
*/
-Thread * Scheduler::select_next_thread(
Node *n
)
+Thread * Scheduler::select_next_thread()
{
int avail_threads = 0;
int thread_list[enabled_len];
{
int avail_threads = 0;
int thread_list[enabled_len];
- for (int i = 0;
i< enabled_len;
i++) {
- if (enabled[i] == THREAD_ENABLED)
- thread_list[avail_threads++] = i;
+ for (int i = 0;
i< enabled_len;
i++) {
+
if (enabled[i] == THREAD_ENABLED)
+
thread_list[avail_threads++] = i;
}
if (avail_threads == 0)
}
if (avail_threads == 0)
-
return NULL;
// No threads availablex
-
- Thread * thread = execution->getFuzzer()->selectThread(
n,
thread_list, avail_threads);
+
return NULL;
// No threads availablex
+
+ Thread * thread = execution->getFuzzer()->selectThread(thread_list, avail_threads);
curr_thread_index = id_to_int(thread->get_id());
return thread;
}
curr_thread_index = id_to_int(thread->get_id());
return thread;
}
@@
-254,7
+251,7
@@
void Scheduler::print() const
int curr_id = current ? id_to_int(current->get_id()) : -1;
model_print("Scheduler: ");
int curr_id = current ? id_to_int(current->get_id()) : -1;
model_print("Scheduler: ");
- for (int i = 0;
i < enabled_len;
i++) {
+ for (int i = 0;
i < enabled_len;
i++) {
char str[20];
enabled_type_to_string(enabled[i], str);
model_print("[%i: %s%s]", i, i == curr_id ? "current, " : "", str);
char str[20];
enabled_type_to_string(enabled[i], str);
model_print("[%i: %s%s]", i, i == curr_id ? "current, " : "", str);