working need to put in shape of pi

This commit is contained in:
Brady Bodily
2018-04-11 22:53:01 +00:00
parent d089172e5e
commit 88e5128704
24 changed files with 462 additions and 97 deletions

View File

@@ -3,30 +3,32 @@
#include <vector>
#include <memory>
#include "FifoQueue.hpp"
#include "Map.hpp"
#include "computePi.hpp"
void threadWorker(std::uint16_t threadNum) {
#warning TODO: This function will take a reference to the FIFO task queue as an argument
#warning TODO: This function will take a reference to your unordered_map as an argument
void threadWorker(std::uint16_t threadNum, FifoQueue* threadSafeQueue, Map* threadSafeMap) {
while(!threadSafeQueue->empty()){
int index = threadSafeQueue->front();
threadSafeQueue->pop();
unsigned int piDigit = computePiDigit(index);
threadSafeMap->safeInsert(index, piDigit);
std::cout << ".";
std::cout.flush();
}
//
// This code exists simply to illustrate a worker thread.
// I had better not see this in your final submission.
std::cout << "Hi! I'm thread number " << threadNum << ", and I can count to 10!\n";
for (int i = 1; i <= 10; ++i)
std::cout << "[" << threadNum << "] " << i << std::endl;
std::cout << "[" << threadNum << "] watch me compute digit #"
<< threadNum+1 << " of pi: "
<< computePiDigit(threadNum+1) << std::endl;
}
int main() {
#warning TODO: Initialize your thread-safe data structures here
FifoQueue* threadSafeQueue = new FifoQueue();
Map* threadSafeMap = new Map();
for(int i = 1; i <= 1000; i++){
threadSafeQueue->push(i);
}
//
// Make as many threads as there are CPU cores
// Assign them to run our threadWorker function, and supply arguments as necessary for that function
@@ -34,16 +36,17 @@ int main() {
for (std::uint16_t core = 0; core < std::thread::hardware_concurrency(); core++)
// The arguments you wish to pass to threadWorker are passed as
// arguments to the constructor of std::thread
threads.push_back(std::make_shared<std::thread>(threadWorker, core));
threads.push_back(std::make_shared<std::thread>(threadWorker, core, threadSafeQueue, threadSafeMap));
//
// Wait for all of these threads to complete
for (auto&& thread : threads)
thread->join();
std::cout << std::endl << std::endl;
#warning TODO: Print the digits of PI from our unordered_map, in order
std::cout << std::endl << std::endl << "3.";
for(int i = 1; i <= 1000; i++){
std::cout << threadSafeMap->find(i);
}
return 0;
}