diff --git a/main.cpp b/main.cpp index cb765cf..2912aad 100644 --- a/main.cpp +++ b/main.cpp @@ -5,7 +5,6 @@ #include // size_t #include // memset -#include #include // cout #include // vector @@ -53,8 +52,6 @@ void *thread_task_increment(const struct thread_data &thread) { << "! (inside run loop, before mutex)" << std::endl; } - usleep(rand() % 200); - // mutex { @@ -63,7 +60,6 @@ void *thread_task_increment(const struct thread_data &thread) { ; // say we want the mutex (*thread.wants_mutex) = true; - usleep(rand() % 200); // block until we have the mutex while (!*thread.has_mutex) ; @@ -73,8 +69,6 @@ void *thread_task_increment(const struct thread_data &thread) { std::cout << "Hello from thread " << thread.id << "! (inside run loop, inside mutex)" << std::endl; - usleep(rand() % 200); - *static_cast(thread.data) += 1; // tell the thread manager we don't need the mutex @@ -129,11 +123,9 @@ void do_threading(struct thread_group threads) { // spawn threads (none will enter the mutex yet) for (size_t tid = 0; tid < threads.total_threads; ++tid) { - usleep(rand() % 200); pthread_create(&my_pthreads[tid], NULL, reinterpret_cast(thread_task_increment), &thread_data[tid]); - usleep(rand() % 200); } std::cout << "Threads have been spawned." << std::endl; @@ -141,17 +133,14 @@ void do_threading(struct thread_group threads) { // loop until all threads are done for (size_t finished_threads = 0; finished_threads < threads.total_threads;) { - usleep(rand() % 200); // TODO: make sure we cycle the mutex through threads round-robin style // hand off the mutex to threads that want it for (size_t tid_wants = 0; tid_wants < threads.total_threads; ++tid_wants) { - usleep(rand() % 200); if (threads.wants_mutex[tid_wants]) { // in case the mutex isn't used at all bool mutex_was_found = false; - usleep(rand() % 200); // find which thread has the mutex and hand it off if it's done for (size_t tid_has = 0; tid_has < threads.total_threads; ++tid_has) { @@ -159,22 +148,16 @@ void do_threading(struct thread_group threads) { if (threads.has_mutex[tid_has]) { // we found who has the mutex! mutex_was_found = true; - usleep(rand() % 200); // is the thread still using the mutex? if (!threads.wants_mutex[tid_has]) { - usleep(rand() % 200); // take the mutex from the thread that has it threads.has_mutex[tid_has] = false; - usleep(rand() % 200); threads.can_ask_for_mutex[tid_has] = true; - usleep(rand() % 200); // give the mutex to the thread that wants it threads.can_ask_for_mutex[tid_wants] = false; - usleep(rand() % 200); threads.has_mutex[tid_wants] = true; - usleep(rand() % 200); } break; // no need to look at the rest if we found who has the mutex @@ -183,10 +166,8 @@ void do_threading(struct thread_group threads) { // give the thread the mutex if it wasn't found to be in use if (!mutex_was_found) { - usleep(rand() % 200); threads.has_mutex[tid_wants] = true; } - usleep(rand() % 200); } } @@ -195,7 +176,6 @@ void do_threading(struct thread_group threads) { for (size_t tid = 0; tid < threads.total_threads; ++tid) { if (threads.threads_finished[tid]) finished_threads += 1; - usleep(rand() % 200); } } @@ -210,8 +190,6 @@ void do_threading(struct thread_group threads) { int main(void) { struct thread_group mythreads; - srand(time(NULL)); - // the count int count = 0;