From 3b5bad7a9ed42522ca47e9ee03f7a54b75a9ddca Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 5 Feb 2020 16:39:46 -0500 Subject: [PATCH 1/5] Logger header file --- breadcrumbs/include/Logger.h | 44 ++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 breadcrumbs/include/Logger.h diff --git a/breadcrumbs/include/Logger.h b/breadcrumbs/include/Logger.h new file mode 100644 index 0000000..d513e1d --- /dev/null +++ b/breadcrumbs/include/Logger.h @@ -0,0 +1,44 @@ +#ifndef LOGGER_HPP +#define LOGGER_HPP + +#include +#include +#include +#include +#include + +using namespace std; + + + +class Logger { +public: + int logging_Level = 1; + string filename = "log.txt"; + + +}; + +void write_log(string msg, int msg_level, string filename, Logger* logObject) { + string line; + ofstream log_file; + log_file.open(filename, std::ios_base::app); + if (logObject->logging_Level <= msg_level) { + //for (int i = 0; i < &msg.size; i++) + log_file << msg; + + } + log_file.close(); +} + +Logger* logger = NULL; +Logger* getLogger() { + if (logger == NULL) { + logger = new Logger(); + + } + return logger; +} + +//Logger* logger = getLogger(); +#endif From e0a0ecd62befe49142a9843c38316d159cd3ce9b Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 5 Feb 2020 16:40:49 -0500 Subject: [PATCH 2/5] Added write_log commands --- breadcrumbs/src/comms/AlgorithmServer.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/breadcrumbs/src/comms/AlgorithmServer.cpp b/breadcrumbs/src/comms/AlgorithmServer.cpp index 84df34e..5d08e32 100644 --- a/breadcrumbs/src/comms/AlgorithmServer.cpp +++ b/breadcrumbs/src/comms/AlgorithmServer.cpp @@ -1,5 +1,8 @@ #include "AlgorithmServer.hpp" +#include "Logger.h" + +//Logger* logger = getLogger(); AlgorithmServer::AlgorithmServer(size_t numClients) { @@ -17,6 +20,7 @@ AlgorithmServer::~AlgorithmServer() void AlgorithmServer::serverThreadRuntime() { + Logger* logger = getLogger(); int iResult; clientThreadsMutex = CreateMutex(NULL, false, NULL); @@ -65,6 +69,7 @@ void AlgorithmServer::serverThreadRuntime() iResult = listen(ListenSocket, SOMAXCONN); if (iResult == SOCKET_ERROR) { + //write_log("listen failed with error\n", 1, logger->filename, logger); printf("listen failed with error: %d\n", WSAGetLastError()); closesocket(ListenSocket); WSACleanup(); @@ -75,10 +80,17 @@ void AlgorithmServer::serverThreadRuntime() // Accept a client socket while (continueThread) { + Logger* logger = getLogger(); + //logger.filename = "log2.txt"; + write_log("Listening for clients...\n", 1, logger->filename, logger); printf("Listening for clients...\n"); ClientSocket = accept(ListenSocket, NULL, NULL); + write_log("Hello new client!\n", 1, logger->filename, logger); printf("Hello new client!\n"); if (ClientSocket == INVALID_SOCKET) { + write_log("accept failed with error: ", 1, logger->filename, logger); + write_log(std::to_string(WSAGetLastError()), 1, logger->filename, logger); + write_log("\n", 1, logger->filename, logger); printf("accept failed with error: %d\n", WSAGetLastError()); AcceptFailures++; if (AcceptFailures >= MAX_ACCEPT_FAILURES) @@ -115,6 +127,7 @@ void AlgorithmServer::serverThreadRuntime() unlockClientThreadsMutex(); } else { + write_log("Could not acquire mutex to add new client thread\n", 1, logger->filename, logger); printf("Could not acquire mutex to add new client thread\n"); } } @@ -134,6 +147,7 @@ vector* AlgorithmServer::getAllIncomingAttributes() Polls DataSyncThreads for new updates Updates master storage accordingly */ + Logger* logger = getLogger(); vector* newAttribs = new vector; if (lockClientThreadsMutex() == STATUS_WAIT_0) { @@ -145,6 +159,7 @@ vector* AlgorithmServer::getAllIncomingAttributes() unlockClientThreadsMutex(); } else { + write_log("Could not acquire mutex to add new client thread\n", 1, logger->filename, logger); printf("Could not acquire mutex to get incoming attributes.\n"); } return newAttribs; From 6f2cd46a47d92b9cf3517177e09952195032b97a Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 5 Feb 2020 16:42:10 -0500 Subject: [PATCH 3/5] Added write log commands --- breadcrumbs/src/comms/DataSyncThread.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/breadcrumbs/src/comms/DataSyncThread.cpp b/breadcrumbs/src/comms/DataSyncThread.cpp index 851fb94..7f64788 100644 --- a/breadcrumbs/src/comms/DataSyncThread.cpp +++ b/breadcrumbs/src/comms/DataSyncThread.cpp @@ -1,6 +1,6 @@ #include "DataSyncThread.hpp" - +#include void DataSyncThread::threadRuntime() { @@ -14,7 +14,7 @@ void DataSyncThread::threadRuntime() while (continueThread && iResult > 0) { - + write_log("Waiting to receive bytes\n", 1, logger->filename, logger); printf("Waiting to receive bytes\n"); // Master while loop that will receive incoming messages @@ -94,6 +94,9 @@ void DataSyncThread::startComms() /* Initializes the communication thread */ + write_log("Start comms: ", 1, logger->filename, logger); + //write_log(std::to_string(incomingAttributes), 1, logger->filename, logger); + printf("Start comms: %d\n", incomingAttributes); continueThread = true; hThread = CreateThread( From 2e8ae8ed9549ec5702cbe9d8b147d8f026e07e07 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 5 Feb 2020 16:46:14 -0500 Subject: [PATCH 4/5] Added logging stuff --- breadcrumbs/src/Breadcrumbs.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/breadcrumbs/src/Breadcrumbs.cpp b/breadcrumbs/src/Breadcrumbs.cpp index 060accf..97f6c03 100644 --- a/breadcrumbs/src/Breadcrumbs.cpp +++ b/breadcrumbs/src/Breadcrumbs.cpp @@ -1,6 +1,5 @@ #include - #include "AlgoBreadcrumbs.hpp" #include "VirtualOutputProcessor.hpp" From c046290120729ba78aae523b3328592002713475 Mon Sep 17 00:00:00 2001 From: Nicholas Chan Date: Thu, 6 Feb 2020 13:26:56 -0500 Subject: [PATCH 5/5] Reverting change --- breadcrumbs/src/comms/DataSyncThread.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/breadcrumbs/src/comms/DataSyncThread.cpp b/breadcrumbs/src/comms/DataSyncThread.cpp index 99b7c95..fb86574 100644 --- a/breadcrumbs/src/comms/DataSyncThread.cpp +++ b/breadcrumbs/src/comms/DataSyncThread.cpp @@ -14,7 +14,7 @@ void DataSyncThread::threadRuntime() while (continueThread && iResult > 0) { - write_log("Waiting to receive bytes\n", 1, logger->filename, logger); + //write_log("Waiting to receive bytes\n", 1, logger->filename, logger); printf("Waiting to receive bytes\n"); if (!readyToReceive()) continue; @@ -137,7 +137,7 @@ void DataSyncThread::startComms() /* Initializes the communication thread */ - write_log("Start comms: ", 1, logger->filename, logger); + //write_log("Start comms: ", 1, logger->filename, logger); //write_log(std::to_string(incomingAttributes), 1, logger->filename, logger); printf("Start comms: %d\n", incomingAttributes);