From 7759aa1210d976d6b7d087f2501ab8871316e04c Mon Sep 17 00:00:00 2001
From: j2-tulloch <james2.tulloch@live.uwe.ac.uk>
Date: Sat, 6 Jan 2024 09:55:13 +0000
Subject: [PATCH] Update main.cpp
---
Assignment/Task 2/main.cpp | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/Assignment/Task 2/main.cpp b/Assignment/Task 2/main.cpp
index 311ea45..87154cc 100644
--- a/Assignment/Task 2/main.cpp
+++ b/Assignment/Task 2/main.cpp
@@ -5,16 +5,16 @@ scheduler s;
int shared_data = 10;
void func1(void* arg) {
- std::cout << "Entering Fiber1" << std::endl;
- std::cout << "fiber 1 address: " << arg << std::endl;
+ //std::cout << "Entering Fiber1" << std::endl;
+ //std::cout << "fiber 1 address: " << arg << std::endl;
std::cout << "fiber 1: " << shared_data << std::endl;
shared_data++;
s.fiber_exit(); // Exit the fiber
- std::cout << "Exit of Fiber1" << std::endl;
+ //std::cout << "Exit of Fiber1" << std::endl;
}
void func2(void* arg) {
- std::cout << "fiber 2 address: " << arg << std::endl;
+ //std::cout << "fiber 2 address: " << arg << std::endl;
std::cout << "fiber 2: " << shared_data << std::endl; // This should now print 11
s.fiber_exit(); // Exit the fiber
}
@@ -22,17 +22,17 @@ void func2(void* arg) {
int main() {
try {
- std::cout << " Starting funcs" << std::endl;
+ //std::cout << " Starting funcs" << std::endl;
fiber f1(&func1, nullptr);
- std::cout << "Shared data:" << shared_data << std::endl;
- std::cout << "Between" << std::endl;
+ //std::cout << "Shared data:" << shared_data << std::endl;
+ //std::cout << "Between" << std::endl;
fiber f2(&func2, nullptr);
- std::cout <<"Funcs Done" << std::endl;
+ //std::cout <<"Funcs Done" << std::endl;
s.spawn(&f1);
s.spawn(&f2);
std::cout <<"Spawning" << std::endl;
s.do_it(); // Execute the fibers
- std::cout << "HELLO" <<std::endl;
+ //std::cout << "Fin" <<std::endl;
} catch (const std::exception& e) {
std::cerr << "Exception Caught:" <<e.what() <<std::endl;
}
--
GitLab