diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index dd84ea7..0000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Desktop (please complete the following information):** - - OS: [e.g. iOS] - - Browser [e.g. chrome, safari] - - Version [e.g. 22] - -**Smartphone (please complete the following information):** - - Device: [e.g. iPhone6] - - OS: [e.g. iOS8.1] - - Browser [e.g. stock browser, safari] - - Version [e.g. 22] - -**Additional context** -Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index bbcbbe7..0000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project -title: '' -labels: '' -assignees: '' - ---- - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -**Describe the solution you'd like** -A clear and concise description of what you want to happen. - -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. - -**Additional context** -Add any other context or screenshots about the feature request here. diff --git a/.github/ISSUE_TEMPLATE/optimization-issue-template.md b/.github/ISSUE_TEMPLATE/optimization-issue-template.md deleted file mode 100644 index 19cf73f..0000000 --- a/.github/ISSUE_TEMPLATE/optimization-issue-template.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -name: Optimization issue template -about: Describe this issue template's purpose here. -title: '' -labels: '' -assignees: '' - ---- - -Type of optimization: -[Extraction/Analyze/Build&Compile/Cross-platform] - -Description: -What to do? Why to do? diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index 8666a80..d8f0267 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -18,8 +18,14 @@ jobs: - uses: actions/checkout@v3 - name: Install packages run: sudo apt -y install git g++ cmake libsqlite3-dev gcovr libjpeg-dev - - name: Clone aquamarine repo - run: git clone --branch ${{ github.head_ref }} https://github.com/MaksymT17/aquamarine.git + + - name: Checkout silber repo + uses: actions/checkout@v3 + with: + repository: MaksymT17/aquamarine + ref: ${{ github.head_ref }} # Use the head reference of the pull request + path: aquamarine + - name: Build artifacts with Cmake run: | cd aquamarine && @@ -38,3 +44,9 @@ jobs: with: check_name: Unit test results files: "**/test_detail.xml" + + - name: Upload build artifacts + uses: actions/upload-artifact@v3 + with: + name: aquamarine_build_Linux + path: aquamarine/build diff --git a/.github/workflows/build_mac.yml b/.github/workflows/build_mac.yml index 91fb6f5..28e5865 100644 --- a/.github/workflows/build_mac.yml +++ b/.github/workflows/build_mac.yml @@ -22,8 +22,12 @@ jobs: run: | brew install git gcc cmake sqlite3 gcovr jpeg - - name: Clone aquamarine repo - run: git clone --branch ${{ github.head_ref }} https://github.com/MaksymT17/aquamarine.git + - name: Checkout aquamarine repo + uses: actions/checkout@v3 + with: + repository: MaksymT17/aquamarine + ref: ${{ github.head_ref }} + path: aquamarine - name: Build artifacts with Cmake run: | @@ -36,4 +40,10 @@ jobs: ./prepare_build.sh && cd build && make -j8 && - ./aquamarine_ut \ No newline at end of file + ./aquamarine_ut + + - name: Upload build artifacts + uses: actions/upload-artifact@v3 + with: + name: aquamarine_build_MacOS + path: aquamarine/build \ No newline at end of file diff --git a/.github/workflows/build_master_branch.yml b/.github/workflows/build_master_branch.yml index 43d80ed..411c2f3 100644 --- a/.github/workflows/build_master_branch.yml +++ b/.github/workflows/build_master_branch.yml @@ -18,8 +18,14 @@ jobs: - uses: actions/checkout@v3 - name: Install packages run: sudo apt -y install git g++ cmake libsqlite3-dev gcovr libjpeg-dev valgrind lynx - - name: Clone aquamarine repo - run: git clone https://github.com/MaksymT17/aquamarine.git + + - name: Checkout aquamarine repo + uses: actions/checkout@v3 + with: + repository: MaksymT17/aquamarine + ref: ${{ github.head_ref }} + path: aquamarine + - name: Build artifacts with Cmake run: | cd aquamarine && @@ -47,9 +53,12 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Clone aquamarine repo - run: git clone https://github.com/MaksymT17/aquamarine.git - shell: bash + - name: Checkout aquamarine repo + uses: actions/checkout@v3 + with: + repository: MaksymT17/aquamarine + ref: ${{ github.head_ref }} + path: aquamarine - name: Build artifacts with Cmake run: | @@ -75,8 +84,12 @@ jobs: run: | brew install git gcc cmake sqlite3 gcovr jpeg - - name: Clone aquamarine repo - run: git clone https://github.com/MaksymT17/aquamarine.git + - name: Checkout aquamarine repo + uses: actions/checkout@v3 + with: + repository: MaksymT17/aquamarine + ref: ${{ github.head_ref }} + path: aquamarine - name: Build artifacts with Cmake run: | diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index f9345af..4bcdf0b 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -11,9 +11,12 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Clone aquamarine repo - run: git clone --branch ${{ github.head_ref }} https://github.com/MaksymT17/aquamarine.git - shell: bash + - name: Checkout aquamarine repo + uses: actions/checkout@v3 + with: + repository: MaksymT17/aquamarine + ref: ${{ github.head_ref }} + path: aquamarine - name: Build artifacts with Cmake run: | @@ -23,7 +26,13 @@ jobs: mkdir build && echo "preparing new build with cmake..." && cd build/ && - cmake .. && + cmake -DCMAKE_BUILD_TYPE=Release .. && cmake --build . && echo "Build complete!" shell: bash + + - name: Upload build artifacts + uses: actions/upload-artifact@v3 + with: + name: aquamarine_build_Windows + path: aquamarine/build/ \ No newline at end of file diff --git a/AmApi.cpp b/AmApi.cpp index 2db73a6..b2791ad 100644 --- a/AmApi.cpp +++ b/AmApi.cpp @@ -4,7 +4,7 @@ #include "analyze/algorithm/ImagePair.h" #include -#if defined __unix__ || defined __APPLE__ +#ifndef WIN32 #include #endif namespace am @@ -12,42 +12,38 @@ namespace am using namespace common::types; using namespace analyze; - - AmApi::AmApi(const char *conf_path): - loggerPtr(std::make_shared("log.log")), - extractor(loggerPtr) + AmApi::AmApi(const Configuration &conf) : loggerPtr(std::make_shared("log.log")), + extractor(loggerPtr) { - am::configuration::ConfigurationReader reader; - configuration = reader.getConfigurationFromFile(conf_path); - const size_t opt_threads = am::common::getOptimalThreadsCount(configuration->ThreadsMultiplier); - detector = std::make_unique(opt_threads, configuration, loggerPtr) ; + configuration::ConfigurationReader reader; + setConfiguration(conf); } algorithm::DescObjects AmApi::compare(const std::string &base_img, const std::string &cmp_img) { std::vector> data = extractor.readFiles({base_img, cmp_img}); - algorithm::ImagePair pair(data[0], data[1]); - return detector->getObjectsRects(pair); + auto res = detector->getObjectsRects(pair); + return res; } - void AmApi::compare_and_save_diff_img(const std::string &base_img, const std::string &cmp_img, std::string && out_diff_img) + void AmApi::compare_and_save_diff_img(const std::string &base_img, const std::string &cmp_img, std::string &&out_diff_img) { const algorithm::DescObjects objects = compare(base_img, cmp_img); am::extraction::BmpDrawer drawer(base_img); - for (auto& obj : objects) + for (auto &obj : objects) { drawer.drawRectangle(obj.getLeft(), obj.getMinHeight(), obj.getRight(), - obj.getMaxHeight()); + obj.getMaxHeight()); } -#if defined __unix__ || defined __APPLE__ - if(dbcPtr) +#ifndef WIN32 + if (dbcPtr) { std::stringstream ss; - ss << "'" << am::common::get_datetime() << "', '" << base_img << "', '" << cmp_img << "', " << objects.size(); + ss << "'" << am::common::get_datetime() << "', '" << base_img << "', '" << cmp_img << "', " << objects.size(); dbcPtr->add_results_table(); // if already exists - it produces a warning - dbcPtr->insert_records2results({ss.str()}); + dbcPtr->insert_records2results({ss.str()}); } #endif drawer.save(out_diff_img); @@ -55,20 +51,20 @@ namespace am void AmApi::enable_database_reports(const char *db_name) { -#if defined __unix__ || defined __APPLE__ +#ifndef WIN32 dbcPtr.reset(new database::DataBaseCommunicator(db_name)); #endif } - std::shared_ptr AmApi::getConfiguration() + const Configuration &AmApi::getConfiguration() { return configuration; } - void AmApi::setConfiguration(std::shared_ptr newConf) + void AmApi::setConfiguration(const Configuration &newConf) { configuration = newConf; - const size_t opt_threads = am::common::getOptimalThreadsCount(configuration->ThreadsMultiplier); - detector = std::make_unique(opt_threads, configuration, loggerPtr) ; + const size_t opt_threads = am::common::getOptimalThreadsCount(configuration.ThreadsMultiplier); + detector = std::make_unique(opt_threads, configuration, loggerPtr); } } \ No newline at end of file diff --git a/AmApi.h b/AmApi.h index 9b44c72..ea32511 100644 --- a/AmApi.h +++ b/AmApi.h @@ -1,3 +1,4 @@ +#pragma once #include #include @@ -5,7 +6,7 @@ #include "configuration/ConfigurationReader.hpp" #include "common/Logger.hpp" #include "extraction/MultipleExtractor.h" -#if defined __unix__ || defined __APPLE__ +#ifndef WIN32 #include "database/DataBaseCommunicator.h" #endif @@ -14,12 +15,12 @@ namespace am class AmApi { public: - AmApi(const char *conf_path); + AmApi(const Configuration& conf); analyze::algorithm::DescObjects compare(const std::string &base_img, const std::string &cmp_img); void compare_and_save_diff_img(const std::string &base_img, const std::string &cmp_img, std::string &&out_diff_img); void enable_database_reports(const char *db_name); - std::shared_ptr getConfiguration(); - void setConfiguration(std::shared_ptr newConf); + const Configuration& getConfiguration(); + void setConfiguration(const Configuration& newConf); private: std::shared_ptr loggerPtr; @@ -28,9 +29,9 @@ namespace am std::string base_img_path; std::string cmp_img_path; -#if defined __unix__ || defined __APPLE__ +#ifndef WIN32 std::unique_ptr dbcPtr; #endif - std::shared_ptr configuration; + Configuration configuration; }; } \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 989ce5e..7596cbb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.0) +cmake_minimum_required (VERSION 3.14) project (aquamarine) @@ -23,6 +23,8 @@ IF (UNIX OR APPLE) include_directories(${SQLite3_INCLUDE_DIRS} ${JPEG_INCLUDE_DIR}) ENDIF() +#add_subdirectory(sh_mem) + set(AM_SOURCE_FILES analyze/AffinityComparer.cpp analyze/ThresholdDiffChecker.cpp @@ -38,8 +40,45 @@ set(AM_SOURCE_FILES extraction/MultipleExtractor.cpp common/Timers.hpp AmApi.cpp + service/ConnectionsInfo.cpp + service/SilberService.cpp ) +# Unpack the archive based on the platform +if(UNIX AND NOT APPLE) + set(LIB_URL "https://github.com/MaksymT17/silber/releases/download/1.1/linux_release.zip") + set(LIB_NAME "linux_release.zip") + set(LIB_PATH "${CMAKE_BINARY_DIR}/${LIB_NAME}") # Full path including filename + file(DOWNLOAD ${LIB_URL} ${LIB_PATH}) + execute_process(COMMAND unzip ${LIB_PATH} -d ${CMAKE_BINARY_DIR}) + +elseif(APPLE) + set(LIB_URL "https://github.com/MaksymT17/silber/releases/download/1.1/macos_release.zip") + set(LIB_NAME "macos_release.zip") + set(LIB_PATH "${CMAKE_BINARY_DIR}/${LIB_NAME}") # Full path including filename + file(DOWNLOAD ${LIB_URL} ${LIB_PATH}) + execute_process(COMMAND unzip ${LIB_PATH} -d ${CMAKE_BINARY_DIR}) + +elseif(WIN32) + set(LIB_URL "https://github.com/MaksymT17/silber/releases/download/1.1/windows_debug.zip") + set(LIB_NAME "windows_debug.zip") + set(LIB_PATH "${CMAKE_BINARY_DIR}/${LIB_NAME}") # Full path including filename + file(DOWNLOAD ${LIB_URL} ${LIB_PATH}) + execute_process(COMMAND powershell -Command "Expand-Archive -Path ${LIB_PATH} -DestinationPath '${CMAKE_BINARY_DIR}'") + +else() +#print unsupported OS +endif() + +file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/silber/lib") +file(COPY "${CMAKE_BINARY_DIR}/lib" DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/silber/") + +file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/silber/include") +file(COPY "${CMAKE_BINARY_DIR}/include" DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/silber/") + +link_directories("${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/silber/lib") +include_directories("${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/silber/include") + IF (UNIX OR APPLE) add_library(aquamarine_lib STATIC ${AM_SOURCE_FILES} ${JPEG_LIBRARIES} database/DataBaseCommunicator.cpp extraction/JpgExtractor.cpp) ELSE() @@ -48,7 +87,7 @@ ENDIF() add_executable(aquamarine main.cpp) -target_link_libraries(aquamarine aquamarine_lib ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(aquamarine aquamarine_lib silber-1.1 ${CMAKE_THREAD_LIBS_INIT}) IF (UNIX OR APPLE) target_link_libraries(aquamarine ${SQLite3_LIBRARIES} ${JPEG_LIBRARIES} ) ENDIF() diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md deleted file mode 100644 index 09827eb..0000000 --- a/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,76 +0,0 @@ -# Contributor Covenant Code of Conduct - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as -contributors and maintainers pledge to making participation in our project and -our community a harassment-free experience for everyone, regardless of age, body -size, disability, ethnicity, sex characteristics, gender identity and expression, -level of experience, education, socio-economic status, nationality, personal -appearance, race, religion, or sexual identity and orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment -include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or - advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic - address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable -behavior and are expected to take appropriate and fair corrective action in -response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or -reject comments, commits, code, wiki edits, issues, and other contributions -that are not aligned to this Code of Conduct, or to ban temporarily or -permanently any contributor for other behaviors that they deem inappropriate, -threatening, offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces -when an individual is representing the project or its community. Examples of -representing a project or community include using an official project e-mail -address, posting via an official social media account, or acting as an appointed -representative at an online or offline event. Representation of a project may be -further defined and clarified by project maintainers. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at . All -complaints will be reviewed and investigated and will result in a response that -is deemed necessary and appropriate to the circumstances. The project team is -obligated to maintain confidentiality with regard to the reporter of an incident. -Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good -faith may face temporary or permanent repercussions as determined by other -members of the project's leadership. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, -available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html - -[homepage]: https://www.contributor-covenant.org - -For answers to common questions about this code of conduct, see -https://www.contributor-covenant.org/faq diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 8ddbab3..0000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,8 +0,0 @@ -## Based on idea of this project was added prioritization: -1. Review in scope of Architecture/Design/Algorithms_optimization are welcome. -2. Adding new functionality are welcome especially for obejct/movement detection. -3. Adding Unit tests for better code coverage are welcome, also adding UT can help in understanding current implementation. -4. Minor fixes for naming variables/functions or just typos are welcome. -5. Other suggestions also are welcome, especially in scope of moving such project as product closer to market. - -Feel free to comment on source files or wiki pages, or you can use private messages, or even email: benzin.pump@gmail.com. diff --git a/_config.yml b/_config.yml deleted file mode 100644 index c741881..0000000 --- a/_config.yml +++ /dev/null @@ -1 +0,0 @@ -theme: jekyll-theme-slate \ No newline at end of file diff --git a/analyze/algorithm/BfsObjectDetector.cpp b/analyze/algorithm/BfsObjectDetector.cpp index c6cc737..edcb825 100644 --- a/analyze/algorithm/BfsObjectDetector.cpp +++ b/analyze/algorithm/BfsObjectDetector.cpp @@ -80,7 +80,7 @@ namespace am::analyze::algorithm BfsObjectDetector::BfsObjectDetector( const size_t threads, - std::shared_ptr &conf, + const Configuration &conf, std::shared_ptr &logger) : mThreadsCount(threads), mConfiguration(conf), mLogger(logger) {} diff --git a/analyze/algorithm/BfsObjectDetector.h b/analyze/algorithm/BfsObjectDetector.h index 9308b25..e34a4d7 100644 --- a/analyze/algorithm/BfsObjectDetector.h +++ b/analyze/algorithm/BfsObjectDetector.h @@ -1,6 +1,6 @@ #pragma once #include "IObjectDetector.h" -#include "configuration/Configuration.hpp" +#include "sh_mem/Message.hpp" #include "common/Logger.hpp" #include "Object.h" @@ -33,11 +33,11 @@ namespace am::analyze::algorithm protected: // abstract class construction limited, aggregate common functions and interface requirement - BfsObjectDetector(const size_t threads, std::shared_ptr &conf, + BfsObjectDetector(const size_t threads, const Configuration &conf, std::shared_ptr &logger); size_t mThreadsCount; - std::shared_ptr mConfiguration; + Configuration mConfiguration; std::shared_ptr mLogger; }; } // namespace am::analyze::algorithm diff --git a/analyze/algorithm/DiffObjectDetector.cpp b/analyze/algorithm/DiffObjectDetector.cpp index a33b8fd..2035005 100644 --- a/analyze/algorithm/DiffObjectDetector.cpp +++ b/analyze/algorithm/DiffObjectDetector.cpp @@ -38,10 +38,10 @@ namespace am::analyze::algorithm return object; } - static std::vector startObjectsSearch(MatrixU16 &changes, const am::configuration::Configuration *conf, const ImageRowSegment &row) + static std::vector startObjectsSearch(MatrixU16 &changes, const Configuration& conf, const ImageRowSegment &row) { std::vector result; - const size_t step = conf->PixelStep; + const size_t step = conf.PixelStep; // check all diffs on potential objects // if change found -> run bsf to figure out how many pixels included in this object // for (size_t rowId = step; rowId < changes.getHeight(); rowId += step) @@ -63,7 +63,7 @@ namespace am::analyze::algorithm } } - DiffObjectDetector::DiffObjectDetector(const size_t threads, std::shared_ptr &conf, std::shared_ptr &logger) : BfsObjectDetector(threads, conf, logger) + DiffObjectDetector::DiffObjectDetector(const size_t threads, const Configuration &conf, std::shared_ptr &logger) : BfsObjectDetector(threads, conf, logger) { } @@ -84,14 +84,14 @@ namespace am::analyze::algorithm { Pixels toCheck; ImageRowSegment row_seg{rownId * rowWidth, rownId * rowWidth + rowWidth}; - futures.emplace_back(std::async(std::launch::async, startObjectsSearch, std::ref(changes), mConfiguration.get(), row_seg)); + futures.emplace_back(std::async(std::launch::async, startObjectsSearch, std::ref(changes), mConfiguration, row_seg)); } for (auto &e : futures) res.push_back(e.get()); mLogger->info("DiffObjectDetector::getObjectsRects fin"); - return createObjectRects(res, mConfiguration->MinPixelsForObject); + return createObjectRects(res, mConfiguration.MinPixelsForObject); } DescObjects DiffObjectDetector::getObjectsRects(ImagePair &pair) diff --git a/analyze/algorithm/DiffObjectDetector.h b/analyze/algorithm/DiffObjectDetector.h index 7767c10..cf452a7 100644 --- a/analyze/algorithm/DiffObjectDetector.h +++ b/analyze/algorithm/DiffObjectDetector.h @@ -10,7 +10,7 @@ namespace am::analyze::algorithm { public: DiffObjectDetector(const size_t threads, - std::shared_ptr &conf, + const Configuration &conf, std::shared_ptr &logger); ~DiffObjectDetector() = default; diff --git a/analyze/algorithm/ObjectDetector.cpp b/analyze/algorithm/ObjectDetector.cpp index 7deb2f6..16f5f0c 100644 --- a/analyze/algorithm/ObjectDetector.cpp +++ b/analyze/algorithm/ObjectDetector.cpp @@ -12,7 +12,7 @@ namespace am::analyze::algorithm ObjectDetector::ObjectDetector( const size_t threads, - std::shared_ptr &conf, + const Configuration &conf, std::shared_ptr &logger) : BfsObjectDetector(threads, conf, logger) {} @@ -21,7 +21,7 @@ namespace am::analyze::algorithm ObjectRectangle bfs(const ImagePair &pair, MatrixU16 &visited, Pixels &toCheck, ObjectRectangle &object, ImageRowSegment row, std::chrono::steady_clock::time_point &startTime, - const configuration::Configuration &conf) + const Configuration &conf) { auto timeNow = std::chrono::steady_clock::now(); std::chrono::duration calcDuration = timeNow - startTime; @@ -55,7 +55,7 @@ namespace am::analyze::algorithm static std::vector startObjectsSearchInPair(const ImagePair &pair, const ImageRowSegment &row, - const configuration::Configuration &conf) + const Configuration &conf) { auto startTime = std::chrono::steady_clock::now(); MatrixU16 changes(pair.getWidth(), pair.getHeight()); @@ -97,7 +97,6 @@ namespace am::analyze::algorithm std::vector>> futures; mLogger->info("ObjectDetector::getObjectsRects pair threads:%d", mThreadsCount); - // threadpool could be replaced with std::async calls am::common::ThreadPool pool; for (size_t rowId = 0; rowId < mThreadsCount - 1; ++rowId) @@ -106,18 +105,16 @@ namespace am::analyze::algorithm // futures.emplace_back(std::async(std::launch::async, startObjectsSearchInPair, // pair, row, *mConfiguration)); - futures.emplace_back(pool.run(std::bind(&startObjectsSearchInPair, pair, row, *mConfiguration))); + futures.emplace_back(pool.run(std::bind(&startObjectsSearchInPair, pair, row, mConfiguration))); } - ImageRowSegment final_row{(mThreadsCount - 1) * rowHeight, pair.getHeight()}; // futures.emplace_back(std::async(std::launch::async, startObjectsSearchInPair, // pair, final_row, *mConfiguration)); - futures.emplace_back(pool.run(std::bind(&startObjectsSearchInPair, pair, final_row, *mConfiguration))); + futures.emplace_back(pool.run(std::bind(&startObjectsSearchInPair, pair, final_row, mConfiguration))); for (auto &e : futures) { res.emplace_back(e.get()); } - - return createObjectRects(res, mConfiguration->MinPixelsForObject); + return createObjectRects(res, mConfiguration.MinPixelsForObject); } } // namespace am::analyze::algorithm diff --git a/analyze/algorithm/ObjectDetector.h b/analyze/algorithm/ObjectDetector.h index 7417c55..5f75ac9 100644 --- a/analyze/algorithm/ObjectDetector.h +++ b/analyze/algorithm/ObjectDetector.h @@ -1,6 +1,7 @@ #pragma once #include "BfsObjectDetector.h" +#include "sh_mem/Message.hpp" namespace am::analyze::algorithm { @@ -8,12 +9,12 @@ namespace am::analyze::algorithm ObjectRectangle bfs(const ImagePair &pair, common::types::MatrixU16 &visited, std::vector &toCheck, ObjectRectangle &object, ImageRowSegment row, std::chrono::steady_clock::time_point &startTime, - const configuration::Configuration &conf); + const Configuration &conf); class ObjectDetector : public BfsObjectDetector { public: - ObjectDetector(const size_t threads, std::shared_ptr &conf, + ObjectDetector(const size_t threads, const Configuration &conf, std::shared_ptr &logger); ~ObjectDetector() = default; diff --git a/analyze/algorithm/movement/MovementDetector.cpp b/analyze/algorithm/movement/MovementDetector.cpp index bbb4783..b9ebdf4 100644 --- a/analyze/algorithm/movement/MovementDetector.cpp +++ b/analyze/algorithm/movement/MovementDetector.cpp @@ -30,7 +30,7 @@ namespace am::analyze::algorithm::movement } MovementDetector::MovementDetector(const size_t threads, - std::shared_ptr &conf, + const Configuration &conf, std::shared_ptr &logger) : ObjectDetector(threads, conf, logger) { @@ -55,16 +55,16 @@ namespace am::analyze::algorithm::movement auto startTime = std::chrono::steady_clock::now(); for (size_t rowId = obj.getMinHeight(); rowId < obj.getMaxHeight(); - rowId += mConfiguration->PixelStep) + rowId += mConfiguration.PixelStep) { - for (size_t colId = obj.getLeft(); colId < obj.getRight(); colId += mConfiguration->PixelStep) + for (size_t colId = obj.getLeft(); colId < obj.getRight(); colId += mConfiguration.PixelStep) { - if (pair->getAbsoluteDiff(rowId, colId) > mConfiguration->AffinityThreshold && + if (pair->getAbsoluteDiff(rowId, colId) > mConfiguration.AffinityThreshold && changes(rowId, colId) != common::CHANGE) { ObjectRectangle pxs(rowId, colId); - auto conns = checkConnections(rowId, colId, pair->getHeight(), {0u, pair->getWidth()}, mConfiguration->PixelStep); - auto objFound = bfs(*pair, changes, conns, pxs, {0u, pair->getWidth()}, startTime, *mConfiguration); + auto conns = checkConnections(rowId, colId, pair->getHeight(), {0u, pair->getWidth()}, mConfiguration.PixelStep); + auto objFound = bfs(*pair, changes, conns, pxs, {0u, pair->getWidth()}, startTime, mConfiguration); found.emplace_back(objFound); } } diff --git a/analyze/algorithm/movement/MovementDetector.h b/analyze/algorithm/movement/MovementDetector.h index 1766a87..b4b8a24 100644 --- a/analyze/algorithm/movement/MovementDetector.h +++ b/analyze/algorithm/movement/MovementDetector.h @@ -19,7 +19,7 @@ namespace am::analyze::algorithm::movement class MovementDetector : public ObjectDetector, IMovementDetector { public: - MovementDetector(const size_t threads, std::shared_ptr &conf, std::shared_ptr &logger); + MovementDetector(const size_t threads, const Configuration &conf, std::shared_ptr &logger); ~MovementDetector() = default; // set objects which will be used for BFS search, like stencil on whole Image diff --git a/configuration/Configuration.hpp b/configuration/Configuration.hpp deleted file mode 100644 index 03733a2..0000000 --- a/configuration/Configuration.hpp +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once -#include -namespace am::configuration -{ - struct Configuration - { - size_t AffinityThreshold; - size_t MinPixelsForObject; - uint8_t PixelStep; - double CalculationTimeLimit; - size_t IdleTimeout; - double ThreadsMultiplier; - }; - -} // namespace am::configuration diff --git a/configuration/ConfigurationReader.hpp b/configuration/ConfigurationReader.hpp index b6cf370..0d46f06 100644 --- a/configuration/ConfigurationReader.hpp +++ b/configuration/ConfigurationReader.hpp @@ -1,6 +1,5 @@ #pragma once -#include "Configuration.hpp" #include #include #include @@ -8,6 +7,7 @@ #include "common/exceptions/FileAccessException.hpp" #include "common/exceptions/AmException.hpp" #include "analyze/algorithm/ObjectDetector.h" +#include namespace { @@ -15,14 +15,14 @@ namespace size_t PARAM_COUNT = 6; } -namespace am::configuration +namespace configuration { class ConfigurationReader { public: ConfigurationReader() {} - std::shared_ptr getConfigurationFromFile(const char *filePath) + Configuration getConfigurationFromFile(const char *filePath) { std::ifstream file(filePath, std::ifstream::in); @@ -30,42 +30,42 @@ namespace am::configuration if (!file.is_open()) { std::string errorMsg("Configuration file access failed!"); - throw common::exceptions::FileAccessException(errorMsg); + throw am::common::exceptions::FileAccessException(errorMsg); } while (file.good()) { - std::shared_ptr rec(new Configuration()); + Configuration rec; getConfiguration(rec, file); return rec; } std::string errorMsg("Configuration parse failed, check file parameters!"); - throw common::exceptions::AmException(errorMsg); + throw am::common::exceptions::AmException(errorMsg); } private: - void setParameter(std::istream &line, const std::shared_ptr &conf) + void setParameter(std::istream &line, Configuration &conf) { std::string paramName, paramVal; std::getline(line, paramName, PARAM_LIMITER); std::getline(line, paramVal, PARAM_LIMITER); if (paramName.compare("Affinity_Threshold") == 0) - conf->AffinityThreshold = std::atoi(paramVal.c_str()); + conf.AffinityThreshold = std::atoi(paramVal.c_str()); else if (paramName.compare("Minimum_Pixels_In_Object") == 0) - conf->MinPixelsForObject = std::atoi(paramVal.c_str()); + conf.MinPixelsForObject = std::atoi(paramVal.c_str()); else if (paramName.compare("Pixel_Step") == 0) - conf->PixelStep = std::atoi(paramVal.c_str()); + conf.PixelStep = std::atoi(paramVal.c_str()); else if (paramName.compare("Calculation_Time_Limit") == 0) - conf->CalculationTimeLimit = std::atof(paramVal.c_str()); + conf.CalculationTimeLimit = std::atof(paramVal.c_str()); else if (paramName.compare("Idle_Timeout") == 0) - conf->IdleTimeout = std::atoi(paramVal.c_str()); + conf.IdleTimeout = std::atoi(paramVal.c_str()); else if (paramName.compare("Threads_Multiplier") == 0) - conf->ThreadsMultiplier = std::atoi(paramVal.c_str()); + conf.ThreadsMultiplier = std::atoi(paramVal.c_str()); } - void getConfiguration(std::shared_ptr &rec, std::istream &str) + void getConfiguration(Configuration &rec, std::istream &str) { for (size_t i = 0; i < PARAM_COUNT; ++i) { @@ -77,4 +77,4 @@ namespace am::configuration } } }; -} // namespace am::configuration +} // namespace Configuration diff --git a/extraction/MultipleExtractor.cpp b/extraction/MultipleExtractor.cpp index 246d161..50a52ab 100644 --- a/extraction/MultipleExtractor.cpp +++ b/extraction/MultipleExtractor.cpp @@ -4,7 +4,7 @@ #include #include "BmpExtractor.h" -#if defined __unix__ || defined __APPLE__ +#ifndef WIN32 #include "JpgExtractor.h" #endif #include "common/types/Color24b.hpp" @@ -29,6 +29,7 @@ namespace am for (size_t i = 0; i < fileNames.size(); ++i) { + printf("file %s\n", fileNames[i].c_str()); std::string file_ext = fileNames[i].substr(fileNames[i].find_last_of(".") + 1); std::transform(file_ext.begin(), file_ext.end(), file_ext.begin(), [](unsigned char c) @@ -37,7 +38,7 @@ namespace am { futures.emplace_back(std::async(std::launch::deferred, BmpExtractor::readFile, fileNames[i])); } -#if defined __unix__ || defined __APPLE__ // note: currently jpeg supported with Unix OS (with libjpeg) +#ifndef WIN32 // note: currently jpeg supported with Unix OS (with libjpeg) else if (file_ext == "jpg" || file_ext == "jpeg" || file_ext == "jpe") { futures.emplace_back(std::async(std::launch::async, JpgExtractor::readFile, fileNames[i])); diff --git a/main.cpp b/main.cpp index 2e324e8..ff242c7 100644 --- a/main.cpp +++ b/main.cpp @@ -1,51 +1,54 @@ #include #include +#include +#include +#include #include "analyze/algorithm/ObjectDetector.h" #include "AmApi.h" +#include "sh_mem/ServerProcCommunicator.h" +#include "sh_mem/ClientProcCommunicator.h" +#include "service/ConnectionsInfo.h" +#include "service/SilberService.h" + +std::unique_ptr server; + +void handleSignal(int signal) +{ + std::cout << "Received SIGTERM signal (" << signal << "). Cleaning up and exiting...\n"; + if (server) + { + server->stop(); + server.reset(); + } + exit(0); +} int main(int argc, char *argv[]) { - std::string base_img_path, cmp_img_path; - const char *conf_path; - const char *out_img_path; +#ifndef _WIN32 + struct sigaction sa; + sa.sa_handler = handleSignal; + sa.sa_flags = 0; + sigemptyset(&sa.sa_mask); - // read arguments or use default for demo purposes - if (argc == 5) + // Set up handlers for SIGTERM and SIGINT + if (sigaction(SIGTERM, &sa, nullptr) == -1) { - std::cout << "Parse user-defined parameters." << std::endl; - base_img_path = std::string(argv[1]); - cmp_img_path = std::string(argv[2]); - conf_path = argv[3]; - out_img_path = argv[4]; + std::cerr << "Error setting up SIGTERM handler\n"; + return 1; } - else + if (sigaction(SIGINT, &sa, nullptr) == -1) { - std::cout << "Use default parameters" << std::endl; - base_img_path = "inputs/10x10_clean.jpg"; - cmp_img_path = "inputs/10x10_2obj.jpg"; - conf_path = "inputs/configuration.csv"; - out_img_path = "compare_result.bmp"; + std::cerr << "Error setting up SIGINT handler\n"; + return 1; } +#endif - am::AmApi amApi(conf_path); + const std::string shared_memory_name{"/_shmem1107"}; + server = std::make_unique(shared_memory_name); + server->start(); + std::cout << "Aquamarine service performed all actions. Disconnect requested, exiting process..." << std::endl; - // just for demo purposes all found rects data can be printed - /*const auto rects = amApi.compare(base_img_path, cmp_img_path); - for (auto &rect : rects) - { - printf("row:%zd col:%zd row:%zd col:%zd value:%zd\n", - rect.getMinHeight(), rect.getLeft(), rect.getMaxHeight(), - rect.getRight(), rect.getPixelsCount()); - }*/ - amApi.enable_database_reports("results.db"); - const auto rects = amApi.compare(base_img_path, cmp_img_path); - for (auto &rect : rects) - { - printf("row:%zd col:%zd row:%zd col:%zd value:%zd\n", - rect.getMinHeight(), rect.getLeft(), rect.getMaxHeight(), - rect.getRight(), rect.getPixelsCount()); - } - printf("rects %zu\n", rects.size()); return 0; } \ No newline at end of file diff --git a/run.sh b/run.sh index bb382b7..eff349d 100755 --- a/run.sh +++ b/run.sh @@ -2,4 +2,4 @@ scp -rp inputs/ build/inputs && echo "Image samples copied." && cd build/ && ./aquamarine && -echo "Execution of tests finished." +echo "Execution of 'aquamarine' program is finished." diff --git a/service/ConnectionsInfo.cpp b/service/ConnectionsInfo.cpp new file mode 100644 index 0000000..b1981ce --- /dev/null +++ b/service/ConnectionsInfo.cpp @@ -0,0 +1,75 @@ +#include "ConnectionsInfo.h" + +bool ConnectionsInfo::isRequestValid(const Message *message) +{ + std::cout << "isRequestValid" << message->id << message->type << std::endl; + auto client_iterator = std::find_if(clients.begin(), clients.end(), [&](const ClientInfo &c) + { return c.id == message->id; }); + if (client_iterator == clients.end()) + { + std::cout << "isRequestValid 1" << std::endl; + // add clinet with default configuration + clients.push_back({message->id, State::UNKNOWN, {75, 10, 1, 50, 5, 10.0}}); + client_iterator = std::find_if(clients.begin(), clients.end(), [&](const ClientInfo &c) + { return c.id == message->id; }); + } + if (message->type == MessageType::HANDSHAKE || message->type == MessageType::DISCONNECT) + { + std::cout << "isRequestValid HANDSHAKE OK" << std::endl; + return true; + } + else if (message->type == MessageType::SET_CONFIG) + { + std::cout << "isRequestValid SET_CONFIG " << std::endl; + return client_iterator->state >= State::READY ? true : false; + } + else if (message->type == MessageType::COMPARE_REQUEST) + { + std::cout << "isRequestValid COMPARE_REQUEST " << std::endl; + if (client_iterator->state == State::UNKNOWN) + { + return false; + } + else if (client_iterator->state >= State::READY) + { + std::cerr << "Client was not properly configured. Use default configuration." << std::endl; + return client_iterator->state == State::CONFIGURED ? true : false; + } + } + std::cerr << "isRequestValid unknown state. If new Message type has been added - extend validation for it." <state<< std::endl; + return false; +} + +std::vector::const_iterator ConnectionsInfo::processActionUpdate(const Message *msg) +{ + auto client_iterator = std::find_if(clients.begin(), clients.end(), [&](const ClientInfo &c) + { return c.id == msg->id; }); + if (client_iterator == clients.end()) + { + std::cout << "Unknown client id: " << msg->id << std::endl; + return client_iterator; + } + + if (msg->type == MessageType::HANDSHAKE) + { + client_iterator->state = State::READY; + } + else if (msg->type == MessageType::SET_CONFIG) + { + const MessageSetConfig *messageSetConfig = static_cast(msg); + client_iterator->state = State::CONFIGURED; + std::memcpy(&client_iterator->configuration, &messageSetConfig->configuration, sizeof(Configuration)); + // printf("set_conf id:%zu {%d %f %d %d %zd %f}\n", msg->id, client_iterator->configuration.AffinityThreshold, + // client_iterator->configuration.CalculationTimeLimit, client_iterator->configuration.IdleTimeout, + // client_iterator->configuration.MinPixelsForObject, client_iterator->configuration.PixelStep, client_iterator->configuration.ThreadsMultiplier); + } + else if (msg->type == MessageType::DISCONNECT) + { + client_iterator->state = State::UNKNOWN; + } + else + { + std::cout << "No updates" << std::endl; + } + return client_iterator; +} \ No newline at end of file diff --git a/service/ConnectionsInfo.h b/service/ConnectionsInfo.h new file mode 100644 index 0000000..f211aa7 --- /dev/null +++ b/service/ConnectionsInfo.h @@ -0,0 +1,32 @@ +#pragma once +#include +#include +#include +#include +#include +#include "sh_mem/Message.hpp" + +class ConnectionsInfo +{ + enum State : size_t + { + UNKNOWN = 0, + READY, + CONFIGURED + }; + struct ClientInfo + { + size_t id; + State state; + Configuration configuration; + }; + +public: + ConnectionsInfo() = default; + + bool isRequestValid(const Message *message); + std::vector::const_iterator processActionUpdate(const Message *msg); + +private: + std::vector clients; +}; \ No newline at end of file diff --git a/service/IService.h b/service/IService.h index 2caf6c6..69dd2f4 100644 --- a/service/IService.h +++ b/service/IService.h @@ -7,7 +7,7 @@ namespace am class IService { public: - virtual ~IService() = default; + ~IService() = default; virtual void start() = 0; virtual void stop() = 0; diff --git a/service/SilberService.cpp b/service/SilberService.cpp new file mode 100644 index 0000000..c2fe149 --- /dev/null +++ b/service/SilberService.cpp @@ -0,0 +1,112 @@ +#include "SilberService.h" +#include "sh_mem/Message.hpp" + +static Configuration default_conf{75, 10, 1, 50, 5, 10.0}; +namespace am::service +{ + SilberService::SilberService(const std::string &shMemName) : m_server(std::make_unique(shMemName)), + m_amApi(std::make_unique(default_conf)), + m_isRunning(false) + + { + } + + void SilberService::start() + { + m_isRunning = true; + while (m_isRunning) + { + Message *message = m_server->receive(); + printf("received %zu message\n", message->type); + if (!m_connections.isRequestValid(message)) + { + std::cout << "received UNEXPECTED_REQUEST req\n" + << message->type << std::endl; + Message response{message->id, MessageType::UNEXPECTED_REQUEST}; + m_server->send(&response); + continue; + } + if (message->type == MessageType::HANDSHAKE) + { + std::cout << "received HANDSHAKE req\n"; + Message msg{message->id, MessageType::HANDSHAKE_OK}; + auto iter = m_connections.processActionUpdate(message); + m_server->send(&msg); + } + else if (message->type == MessageType::SET_CONFIG) + { + MessageSetConfig *messageConf = static_cast(message); + std::cout << "received SET_CONFIG req px:" << messageConf->configuration.MinPixelsForObject << std::endl; + Message msg{message->id, MessageType::SET_CONFIG_OK}; + auto iter = m_connections.processActionUpdate(message); + // Configuration newConf{messageConf->configuration.AffinityThreshold, messageConf->configuration.MinPixelsForObject, messageConf->configuration.PixelStep, messageConf->configuration.CalculationTimeLimit, messageConf->configuration.IdleTimeout, messageConf->configuration.ThreadsMultiplier}; + + m_amApi->setConfiguration(messageConf->configuration); + std::cout << "received SET_CONFIG OK \n"; + m_server->send(&msg); + std::cout << "received SET_CONFIG OK sent\n"; + } + else if (message->type == MessageType::COMPARE_REQUEST) + { + std::cout << "received COMPARE_REQUEST req\n"; + auto iter = m_connections.processActionUpdate(message); + m_amApi->setConfiguration(iter->configuration); + + MessageCompareRequest *messageCompare = static_cast(message); + if (messageCompare) + { + printf("compare_ %s %s _\n", messageCompare->base, messageCompare->to_compare); + auto iter = m_connections.processActionUpdate(message); + m_amApi->setConfiguration(iter->configuration); // set configuration for this client + printf("conf pixs %zu\n", iter->configuration.MinPixelsForObject); + am::analyze::algorithm::DescObjects result; + try + { + result = m_amApi->compare(messageCompare->base, messageCompare->to_compare); + } + catch (const am::common::exceptions::AmException exc) + { + std::cout << "Exception has been caught: " << exc.what() << ::std::endl; + Message failed{messageCompare->id, MessageType::COMPARE_FAIL}; + m_server->send(&failed); + continue; + } + std::cout << "received after compare\n"; + MessageCompareResult compare_result; + compare_result.id = messageCompare->id; + + compare_result.payload_bytes = result.size() * sizeof(Rect); + Rect *rects = static_cast(compare_result.payload); + size_t id = 0; + for (auto &rectangle : result) + { + if (id == 100) // limit by 100 objects + { + compare_result.payload_bytes = 100 * sizeof(Rect); + break; + } + printf("_ %zd %zd %zd %zd _\n", rectangle.getLeft(), rectangle.getRight(), rectangle.getMaxHeight(), rectangle.getMinHeight()); + rects[id++] = {rectangle.getLeft(), rectangle.getRight(), rectangle.getMaxHeight(), rectangle.getMinHeight()}; + printf("_send %zd %zd %zd %zd _\n", rects[id - 1].l, rects[id - 1].r, rects[id - 1].t, rects[id - 1].b); + } + compare_result.type = MessageType::COMPARE_RESULT; + m_server->send(&compare_result); + } + } + else if (message->type == MessageType::DISCONNECT) + { + std::cout << "received DISCONNECT req\n"; + m_isRunning = false; + Message msg{message->id, MessageType::DISCONNECT}; + auto iter = m_connections.processActionUpdate(message); + + m_server->send(&msg); + } + } + }; + + void SilberService::stop() + { + m_isRunning = false; + } +} \ No newline at end of file diff --git a/service/SilberService.h b/service/SilberService.h new file mode 100644 index 0000000..44b9ecf --- /dev/null +++ b/service/SilberService.h @@ -0,0 +1,25 @@ +#include "IService.h" +#include +#include +#include "sh_mem/ServerProcCommunicator.h" +#include "service/ConnectionsInfo.h" +#include "AmApi.h" + +namespace am::service +{ + // service implementation based on shared memory messaging + class SilberService : public IService + { + public: + SilberService(const std::string &shMemName); + virtual void start() override; + virtual void stop() override; + + private: + std::unique_ptr m_server; + std::unique_ptr m_amApi; + ConnectionsInfo m_connections; + bool m_isRunning; + }; + +} \ No newline at end of file diff --git a/sh_mem/CMakeLists.txt b/sh_mem/CMakeLists.txt new file mode 100755 index 0000000..8b9a291 --- /dev/null +++ b/sh_mem/CMakeLists.txt @@ -0,0 +1,20 @@ +cmake_minimum_required (VERSION 3.0) + +project (silber) + +set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD_REQUIRED True) +set(CMAKE_CXX_EXTENSIONS OFF) # Turn off compiler-specific extensions + +ADD_LIBRARY(silber-1.0 STATIC + SharedMemoryReceiver.cpp + SharedMemorySender.cpp + ProcCommunicator.cpp + ClientProcCommunicator.cpp + ServerProcCommunicator.cpp) + +install(TARGETS silber-1.0 DESTINATION lib) +install(FILES Message.hpp DESTINATION include ) + +add_executable(silber_test main.cpp) +target_link_libraries(silber_test silber-1.0) diff --git a/sh_mem/ClientProcCommunicator.cpp b/sh_mem/ClientProcCommunicator.cpp new file mode 100644 index 0000000..9e71e58 --- /dev/null +++ b/sh_mem/ClientProcCommunicator.cpp @@ -0,0 +1,38 @@ +#include "ClientProcCommunicator.h" + +ClientProcCommunicator::ClientProcCommunicator( + const std::string &shMemName) : ProcCommunicator(shMemName) +{ + m_sender = std::make_unique( m_master_mem_name.c_str()); + m_receiver = std::make_unique(m_slave_mem_name.c_str()); + +#ifndef _WIN32 + m_master_received = sem_open(m_master_received_s.c_str(), O_CREAT, 0666, SEMAPHORE_DISABLED); + m_slave_received = sem_open(m_slave_received_s.c_str(), O_CREAT, 0666, SEMAPHORE_DISABLED); + m_master_sent = sem_open(m_master_sent_s.c_str(), O_CREAT, 0666, SEMAPHORE_DISABLED); + m_slave_sent = sem_open(m_slave_sent_s.c_str(), O_CREAT, 0666, SEMAPHORE_DISABLED); + m_slave_ready = sem_open(m_slave_ready_s.c_str(), O_CREAT, 0666, SEMAPHORE_ENABLED); + + if (m_master_received == SEM_FAILED || m_slave_received == SEM_FAILED || + m_master_sent == SEM_FAILED || m_slave_sent == SEM_FAILED || m_slave_ready == SEM_FAILED || m_slave_ready == SEM_FAILED) + { + perror("ProcCommunicator sem_open failure."); + exit(1); + } +#else + std::wstring wshMemName(shMemName.begin(), shMemName.end()); + + m_master_received = CreateSemaphoreW(NULL, SEMAPHORE_DISABLED, MAXLONG, (wshMemName + L"_m_rsem").c_str()); + m_slave_received = CreateSemaphoreW(NULL, SEMAPHORE_DISABLED, MAXLONG, (wshMemName + L"_s_rsem").c_str()); + m_master_sent = CreateSemaphoreW(NULL, SEMAPHORE_DISABLED, MAXLONG, (wshMemName + L"_m_sent").c_str()); + m_slave_sent = CreateSemaphoreW(NULL, SEMAPHORE_DISABLED, MAXLONG, (wshMemName + L"_s_sent").c_str()); + m_slave_ready = CreateSemaphoreW(NULL, SEMAPHORE_ENABLED, MAXLONG, (wshMemName + L"_s_ready").c_str()); + + if (m_master_received == NULL || m_slave_received == NULL || + m_master_sent == NULL || m_slave_sent == NULL || m_slave_ready == NULL) + { + perror("ProcCommunicator sem_open failure."); + exit(1); + } +#endif +} diff --git a/sh_mem/ClientProcCommunicator.h b/sh_mem/ClientProcCommunicator.h new file mode 100644 index 0000000..fbbed78 --- /dev/null +++ b/sh_mem/ClientProcCommunicator.h @@ -0,0 +1,62 @@ +#pragma once + +#include "ServerProcCommunicator.h" + +class ClientProcCommunicator : public ProcCommunicator +{ +public: + ClientProcCommunicator(const std::string &shMemName); + + virtual ~ClientProcCommunicator() = default; + +#ifndef _WIN32 + // according to defined message flow user sends request and allocates response + // server will respond and fulfill needed response + template + void sendRequestGetResponse(const Message *request, Response &reponse) + { + sem_wait(m_slave_ready); + m_sender->sendMessage(request); + sem_post(m_master_sent); + sem_wait(m_slave_received); + sem_wait(m_slave_sent); + + Response *repsonsePtr = static_cast(m_receiver->receiveMessage()); + + if (repsonsePtr) + reponse = Response(*repsonsePtr); + else + std::cerr << "ClientProcCommunicator::sendRequestGetResponse response type is not expected\n"; + + sem_post(m_master_received); + sem_post(m_slave_ready); // release slave for next requests + } +#else + template + void sendRequestGetResponse(const Message *request, Response &reponse) + { + WaitForSingleObject(m_slave_ready, INFINITE); + // sem_wait(m_slave_ready); + + m_sender->sendMessage(request); + ReleaseSemaphore(m_master_sent, 1, NULL); + // sem_post(m_master_sent); + WaitForSingleObject(m_slave_received, INFINITE); + // sem_wait(m_slave_received); + WaitForSingleObject(m_slave_sent, INFINITE); + // sem_wait(m_slave_sent); + + Response *repsonsePtr = static_cast(m_receiver->receiveMessage()); + + if (repsonsePtr) + reponse = Response(*repsonsePtr); + else + std::cerr << "ClientProcCommunicator::sendRequestGetResponse response type is not expected\n"; + + ReleaseSemaphore(m_master_received, 1, NULL); + // sem_post(m_master_received); + ReleaseSemaphore(m_slave_ready, 1, NULL); + // sem_post(m_slave_ready); // release slave for next messages + } +#endif +}; diff --git a/sh_mem/LICENSE b/sh_mem/LICENSE new file mode 100644 index 0000000..0ad25db --- /dev/null +++ b/sh_mem/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/sh_mem/Message.hpp b/sh_mem/Message.hpp new file mode 100755 index 0000000..3cfca61 --- /dev/null +++ b/sh_mem/Message.hpp @@ -0,0 +1,76 @@ +#pragma once + +#include +#include + +enum MessageType : size_t +{ + HANDSHAKE = 0, + HANDSHAKE_OK, + HANDSHAKE_FAIL, + SET_CONFIG, + SET_CONFIG_OK, + SET_CONFIG_FAIL, + COMPARE_REQUEST, + COMPARE_RESULT, + COMPARE_FAIL, + DISCONNECT, + DISCONNECT_OK, + DISCONNECT_FAIL, + UNEXPECTED_REQUEST // default value, user must specify type of message +}; + +struct Configuration +{ + size_t AffinityThreshold; + size_t MinPixelsForObject; + uint8_t PixelStep; + double CalculationTimeLimit; + size_t IdleTimeout; + double ThreadsMultiplier; +}; + +struct Message +{ + Message(const size_t aId = 0, const MessageType aType = MessageType::UNEXPECTED_REQUEST) + : id(aId), + type(aType), + size(sizeof(Message)) {} + size_t id; + MessageType type; + size_t size; +}; + +struct MessageSetConfig : public Message +{ + MessageSetConfig() : Message() + { + size = sizeof(MessageSetConfig); + } + Configuration configuration; +}; + +struct MessageCompareRequest : public Message +{ + MessageCompareRequest() : Message() + { + size = sizeof(MessageCompareRequest); + } + char base[200]; + char to_compare[200]; +}; + +struct Rect +{ + size_t l, r, t, b; +}; + +struct MessageCompareResult : public Message +{ + MessageCompareResult() : Message() + { + size = sizeof(MessageCompareResult); + } + Rect payload[100]; + size_t payload_bytes; +}; \ No newline at end of file diff --git a/sh_mem/ProcCommunicator.cpp b/sh_mem/ProcCommunicator.cpp new file mode 100755 index 0000000..8a83494 --- /dev/null +++ b/sh_mem/ProcCommunicator.cpp @@ -0,0 +1,69 @@ +#include "ProcCommunicator.h" +#include +#ifndef _WIN32 +#include +#include +#endif + +ProcCommunicator::ProcCommunicator(const std::string &shMemName) : m_master_mem_name(shMemName + "_master"), + m_slave_mem_name(shMemName + "_slave"), + m_master_received_s(shMemName + "_m_rsem"), + m_slave_received_s(shMemName + "_s_rsem"), + m_master_sent_s(shMemName + "_m_sent"), + m_slave_sent_s(shMemName + "_s_sent"), + m_slave_ready_s(shMemName + "_s_ready") +{ +} +ProcCommunicator::~ProcCommunicator() +{ +#ifndef _WIN32 + if (sem_close(m_master_received) == -1) + { + perror("Failed to destroy m_master_received semaphore"); + } + + if (sem_close(m_slave_received) == -1) + { + perror("Failed to destroy m_slave_received semaphore"); + } + + if (sem_close(m_master_sent) == -1) + { + perror("Failed to destroy m_master_sent semaphore"); + } + + if (sem_close(m_slave_sent) == -1) + { + perror("Failed to destroy m_slave_sent semaphore"); + } + + if (sem_close(m_slave_ready) == -1) + { + perror("Failed to destroy m_slave_ready semaphore"); + } + + + +#else + if (m_master_received && !CloseHandle(m_master_received)) + { + perror("Failed to destroy m_master_received semaphore"); + } + if (m_slave_received && !CloseHandle(m_slave_received)) + { + perror("Failed to destroy m_slave_received semaphore"); + } + if (m_master_sent && !CloseHandle(m_master_sent)) + { + perror("Failed to destroy m_master_sent semaphore"); + } + if (m_slave_sent && !CloseHandle(m_slave_sent)) + { + perror("Failed to destroy m_slave_sent semaphore"); + } + if (m_slave_ready && !CloseHandle(m_slave_ready)) + { + perror("Failed to destroy m_slave_ready semaphore"); + } +#endif +} diff --git a/sh_mem/ProcCommunicator.h b/sh_mem/ProcCommunicator.h new file mode 100755 index 0000000..6d3f938 --- /dev/null +++ b/sh_mem/ProcCommunicator.h @@ -0,0 +1,52 @@ +#pragma once + +#include +#include +#include "SharedMemorySender.h" +#include "SharedMemoryReceiver.h" +#include "Message.hpp" +#ifndef _WIN32 +#include +#include +#include +#include +#else +#include +#endif + +constexpr int SEMAPHORE_DISABLED = 0; +constexpr int SEMAPHORE_ENABLED = 1; + +class ProcCommunicator +{ +protected: + ProcCommunicator(const std::string &shMemName); + virtual ~ProcCommunicator(); + +protected: + std::unique_ptr m_sender; + std::unique_ptr m_receiver; + + std::string m_master_received_s; + std::string m_slave_received_s; + std::string m_master_sent_s; + std::string m_slave_sent_s; + std::string m_slave_ready_s; + + const std::string m_master_mem_name; + const std::string m_slave_mem_name; + +#ifndef _WIN32 + sem_t *m_master_received; + sem_t *m_slave_received; + sem_t *m_master_sent; + sem_t *m_slave_sent; + sem_t *m_slave_ready; +#else + HANDLE m_master_received; + HANDLE m_slave_received; + HANDLE m_master_sent; + HANDLE m_slave_sent; + HANDLE m_slave_ready; +#endif +}; \ No newline at end of file diff --git a/sh_mem/ServerProcCommunicator.cpp b/sh_mem/ServerProcCommunicator.cpp new file mode 100644 index 0000000..b65e3ee --- /dev/null +++ b/sh_mem/ServerProcCommunicator.cpp @@ -0,0 +1,121 @@ +#include "ServerProcCommunicator.h" + +ServerProcCommunicator::ServerProcCommunicator( + const std::string &shMemName) : ProcCommunicator(shMemName) +{ + m_sender = std::make_unique(m_slave_mem_name.c_str()); + m_receiver = std::make_unique(m_master_mem_name.c_str()); +#ifndef _WIN32 + + m_master_received = sem_open(m_master_received_s.c_str(), O_CREAT, 0666, SEMAPHORE_DISABLED); + m_slave_received = sem_open(m_slave_received_s.c_str(), O_CREAT, 0666, SEMAPHORE_DISABLED); + m_master_sent = sem_open(m_master_sent_s.c_str(), O_CREAT, 0666, SEMAPHORE_DISABLED); + m_slave_sent = sem_open(m_slave_sent_s.c_str(), O_CREAT, 0666, SEMAPHORE_DISABLED); + m_slave_ready = sem_open(m_slave_ready_s.c_str(), O_CREAT, 0666, SEMAPHORE_ENABLED); + + if (m_master_received == SEM_FAILED || m_slave_received == SEM_FAILED || + m_master_sent == SEM_FAILED || m_slave_sent == SEM_FAILED || m_slave_ready == SEM_FAILED || m_slave_ready == SEM_FAILED) + { + perror("ProcCommunicator sem_open failure."); + exit(1); + } + +#else + + std::wstring wshMemName(shMemName.begin(), shMemName.end()); + + m_master_received = CreateSemaphoreW(NULL, SEMAPHORE_DISABLED, MAXLONG, (wshMemName + L"_m_rsem").c_str()); + m_slave_received = CreateSemaphoreW(NULL, SEMAPHORE_DISABLED, MAXLONG, (wshMemName + L"_s_rsem").c_str()); + m_master_sent = CreateSemaphoreW(NULL, SEMAPHORE_DISABLED, MAXLONG, (wshMemName + L"_m_sent").c_str()); + m_slave_sent = CreateSemaphoreW(NULL, SEMAPHORE_DISABLED, MAXLONG, (wshMemName + L"_s_sent").c_str()); + m_slave_ready = CreateSemaphoreW(NULL, SEMAPHORE_ENABLED, MAXLONG, (wshMemName + L"_s_ready").c_str()); + + if (m_master_received == NULL || m_slave_received == NULL || + m_master_sent == NULL || m_slave_sent == NULL || m_slave_ready == NULL) + { + perror("ProcCommunicator sem_open failure."); + exit(1); + } + +#endif + +} +ServerProcCommunicator::~ServerProcCommunicator() +{ +#ifndef _WIN32 + if (sem_unlink(m_master_received_s.c_str()) == -1) + { + perror("Failed to unlink m_master_received semaphore"); + } + + if (sem_unlink(m_slave_received_s.c_str()) == -1) + { + perror("Failed to unlink m_slave_received semaphore"); + } + + if (sem_unlink(m_master_sent_s.c_str()) == -1) + { + perror("Failed to unlink m_master_sent semaphore"); + } + + if (sem_unlink(m_slave_sent_s.c_str()) == -1) + { + perror("Failed to unlink m_slave_sent semaphore"); + } + + if (sem_unlink(m_slave_ready_s.c_str()) == -1) + { + perror("Failed to unlink m_slave_ready semaphore"); + } +#endif +} +#ifndef _WIN32 + +void ServerProcCommunicator::send(const Message *msg) +{ + m_sender->sendMessage(msg); + sem_post(m_slave_sent); + sem_wait(m_master_received); +} + +Message *ServerProcCommunicator::receive() +{ + sem_wait(m_master_sent); + Message *response = m_receiver->receiveMessage(); + sem_post(m_slave_received); + + return response; +} + +#else +void ServerProcCommunicator::send(const Message *msg) +{ + // Send the message + m_sender->sendMessage(msg); + // Post (release) the semaphore + ReleaseSemaphore(m_slave_sent, 1, NULL); + // Wait for the semaphore to be signaled + WaitForSingleObject(m_master_received, INFINITE); +} + +Message *ServerProcCommunicator::receive() +{ + DWORD waitResult = WaitForSingleObject(m_master_sent, INFINITE); + if (waitResult != WAIT_OBJECT_0) + { + std::cerr << "ProcCommunicator::receive WaitForSingleObject FAIL\n"; + return nullptr; + } + + Message *response = m_receiver->receiveMessage(); + + BOOL releaseResult = ReleaseSemaphore(m_slave_received, 1, NULL); + if (!releaseResult) + { + std::cerr << "ProcCommunicator::receive ReleaseSemaphore FAIL\n"; + return nullptr; + } + return response; +} + +#endif \ No newline at end of file diff --git a/sh_mem/ServerProcCommunicator.h b/sh_mem/ServerProcCommunicator.h new file mode 100644 index 0000000..d168194 --- /dev/null +++ b/sh_mem/ServerProcCommunicator.h @@ -0,0 +1,13 @@ +#pragma once + +#include "ProcCommunicator.h" + +class ServerProcCommunicator : public ProcCommunicator +{ +public: + ServerProcCommunicator(const std::string &shMemName); + virtual ~ServerProcCommunicator(); + + void send(const Message *msg); + Message *receive(); +}; diff --git a/sh_mem/SharedMemoryReceiver.cpp b/sh_mem/SharedMemoryReceiver.cpp new file mode 100755 index 0000000..1f0651f --- /dev/null +++ b/sh_mem/SharedMemoryReceiver.cpp @@ -0,0 +1,126 @@ +#include +#include +#include +#ifndef _WIN32 +#include +#include +#include +#else +#include +#include +#include +#endif +#include "SharedMemoryReceiver.h" +#include + +const int SHARED_MEMORY_SIZE = 4096; // 4KB + +SharedMemoryReceiver::SharedMemoryReceiver(const char *shMemName) : m_name(shMemName) +{ + init(); +} +#ifndef _WIN32 +void SharedMemoryReceiver::init() +{ + m_shm_fd = shm_open(m_name.c_str(), O_CREAT | O_EXCL | O_RDWR, 0666); + if (m_shm_fd == -1) + { + if (errno == EEXIST) + { + m_shm_fd = shm_open(m_name.c_str(), O_RDWR, 0666); + if (m_shm_fd == -1) + { + perror("shm_open failed"); + exit(EXIT_FAILURE); + } + } + else + { + perror("shm_open failed"); + exit(EXIT_FAILURE); + } + } + else + { + // Segment created successfully, truncate it to the desired size + if (ftruncate(m_shm_fd, SHARED_MEMORY_SIZE) == -1) + { + perror("ftruncate failed"); + exit(EXIT_FAILURE); + } + } + + m_ptr = mmap(0, SHARED_MEMORY_SIZE, PROT_READ, MAP_SHARED, m_shm_fd, 0); + if (m_ptr == MAP_FAILED) + { + perror("mmap failed"); + return; + } +} +void SharedMemoryReceiver::finish() +{ + // Unmap and close the shared memory object + if (munmap(m_ptr, SHARED_MEMORY_SIZE) == -1) + { + std::cerr << "munmap failed" << std::endl; + } + if (close(m_shm_fd) == -1) + { + std::cerr << "close failed" << std::endl; + } +} +#else +void SharedMemoryReceiver::init() +{ + std::wstring wshMemName(m_name.begin(), m_name.end()); + m_shm_fd = OpenFileMappingW( + FILE_MAP_ALL_ACCESS, + FALSE, + wshMemName.c_str()); + + if (m_shm_fd == NULL) + { + m_shm_fd = CreateFileMappingW( + INVALID_HANDLE_VALUE, // use paging file + NULL, // default security + PAGE_READWRITE, // read/write access + 0, // maximum object size (high-order DWORD) + SHARED_MEMORY_SIZE, // maximum object size (low-order DWORD) + wshMemName.c_str()); // name of mapping object + + if (m_shm_fd == NULL) + { + printf(("Could not open file mapping object (%d).\n"), + GetLastError()); + return; + } + } + + m_ptr = (void *)MapViewOfFile(m_shm_fd, // handle to map object + FILE_MAP_ALL_ACCESS, // read/write permission + 0, + 0, + SHARED_MEMORY_SIZE); + + if (m_ptr == NULL) + { + printf("Could not map view of file (%d).\n", GetLastError()); + + CloseHandle(m_shm_fd); + + return; + } +} + +void SharedMemoryReceiver::finish() +{ + UnmapViewOfFile(m_ptr); + CloseHandle(m_shm_fd); +} +#endif + +Message *SharedMemoryReceiver::receiveMessage() +{ + Message *message(static_cast(m_ptr)); + return message; +} \ No newline at end of file diff --git a/sh_mem/SharedMemoryReceiver.h b/sh_mem/SharedMemoryReceiver.h new file mode 100755 index 0000000..d739242 --- /dev/null +++ b/sh_mem/SharedMemoryReceiver.h @@ -0,0 +1,23 @@ +#pragma once + +#include +#include "Message.hpp" + +class SharedMemoryReceiver +{ +public: + SharedMemoryReceiver(const char *shMemName); + void init(); + void finish(); + Message *receiveMessage(); + +private: +#ifndef _WIN32 + int m_shm_fd; +#else + HANDLE m_shm_fd; +#endif + + void *m_ptr; + std::string m_name; +}; diff --git a/sh_mem/SharedMemorySender.cpp b/sh_mem/SharedMemorySender.cpp new file mode 100755 index 0000000..6edef67 --- /dev/null +++ b/sh_mem/SharedMemorySender.cpp @@ -0,0 +1,121 @@ +#include +#include +#include +#ifndef _WIN32 +#include +#include +#include +#endif +#include +#include +#include +#include "SharedMemorySender.h" + +const int SHARED_MEMORY_SIZE = 4096; // 4KB + +SharedMemorySender::SharedMemorySender(const char *shMemName) : m_name(shMemName) +{ + init(); +} +#ifndef _WIN32 +void SharedMemorySender::init() +{ + m_shm_fd = shm_open(m_name.c_str(), O_CREAT | O_EXCL | O_RDWR, 0666); + if (m_shm_fd == -1) + { + if (errno == EEXIST) + { + m_shm_fd = shm_open(m_name.c_str(), O_RDWR, 0666); + if (m_shm_fd == -1) + { + perror("shm_open failed"); + exit(EXIT_FAILURE); + } + } + else + { + perror("shm_open failed"); + exit(EXIT_FAILURE); + } + } + else + { + if (ftruncate(m_shm_fd, SHARED_MEMORY_SIZE) == -1) + { + perror("ftruncate failed"); + exit(EXIT_FAILURE); + } + } + + // Map the shared memory object into the address space of the process + m_ptr = mmap(0, SHARED_MEMORY_SIZE, PROT_WRITE, MAP_SHARED, m_shm_fd, 0); + if (m_ptr == MAP_FAILED) + { + std::cerr << "mmap failed" << std::endl; + throw std::exception(); + } +} + +void SharedMemorySender::finish() +{ + if (munmap(m_ptr, SHARED_MEMORY_SIZE) == -1) + { + std::cerr << "munmap failed" << std::endl; + } + if (close(m_shm_fd) == -1) + { + std::cerr << "close failed" << std::endl; + } + + if (shm_unlink(m_name.c_str()) == -1) + { + std::cerr << "shm_unlink failed" << std::endl; + } +} +void SharedMemorySender::sendMessage(const Message *msg) +{ + // std::cout<<"sendMessage\n"; + + std::memcpy(m_ptr, msg, msg->size); +} +#else +void SharedMemorySender::init() +{ + std::wstring wshMemName(m_name.begin(), m_name.end()); + m_shm_fd = CreateFileMappingW( + INVALID_HANDLE_VALUE, // use paging file + NULL, // default security + PAGE_READWRITE, // read/write access + 0, // maximum object size (high-order DWORD) + SHARED_MEMORY_SIZE, // maximum object size (low-order DWORD) + wshMemName.c_str()); // name of mapping object + + if (m_shm_fd == NULL) + { + printf("Could not create file mapping object (%d).\n", + GetLastError()); + } + m_ptr = (void *)MapViewOfFile(m_shm_fd, // handle to map object + FILE_MAP_ALL_ACCESS, // read/write permission + 0, + 0, + SHARED_MEMORY_SIZE); + + if (m_ptr == NULL) + { + printf("Could not map view of file (%d).\n", GetLastError()); + CloseHandle(m_shm_fd); + } +} + +void SharedMemorySender::finish() +{ + UnmapViewOfFile(m_ptr); + CloseHandle(m_shm_fd); +} + +void SharedMemorySender::sendMessage(const Message *msg) +{ + CopyMemory(m_ptr, msg, msg->size); +} +#endif diff --git a/sh_mem/SharedMemorySender.h b/sh_mem/SharedMemorySender.h new file mode 100755 index 0000000..83d3b33 --- /dev/null +++ b/sh_mem/SharedMemorySender.h @@ -0,0 +1,29 @@ +#pragma once + +#include +#include "Message.hpp" +#ifdef _WIN32 +#include +#include +#include +#include +#pragma comment(lib, "user32.lib") +#endif + +class SharedMemorySender +{ +public: + SharedMemorySender(const char *shMemName); + void init(); + void finish(); + void sendMessage(const Message *msg); + +private: +#ifndef _WIN32 + int m_shm_fd; +#else + HANDLE m_shm_fd; +#endif + void *m_ptr; + std::string m_name; +}; \ No newline at end of file diff --git a/sh_mem/main.cpp b/sh_mem/main.cpp new file mode 100755 index 0000000..ba0ed55 --- /dev/null +++ b/sh_mem/main.cpp @@ -0,0 +1,180 @@ +#include "ProcCommunicator.h" +#include "ServerProcCommunicator.h" +#include "ClientProcCommunicator.h" +#include +#include +#include +#include +#ifndef _WIN32 +#include +#endif + +static const std::string shared_mem_name{"/shmsh__47"}; +static constexpr size_t MSG_COUNT = 10000; + +void backgroundTask1() +{ + std::cout << "Background Master_1 starting...\n"; + ClientProcCommunicator master(shared_mem_name); + Message request{1, MessageType::HANDSHAKE}; + Message response{666, MessageType::HANDSHAKE}; + + int counter = 0; + + while (counter < MSG_COUNT) + { + master.sendRequestGetResponse(&request, response); + std::cout << "m 1 =" << response.id << " " << response.type << std::endl; + counter++; + } + + std::cout << "Background Master_1 completed.\n"; +} + +void backgroundTask2() +{ + // std::cout << "Background Master_2 starting...\n"; + ClientProcCommunicator master(shared_mem_name); + Message request{2, MessageType::HANDSHAKE}; + Message response{666, MessageType::HANDSHAKE}; + + int counter = 0; + + while (counter < MSG_COUNT) + { + master.sendRequestGetResponse(&request, response); + // std::cout << "m 2 =" << response.id << std::endl; + counter++; + } + + std::cout << "Background Master_2 completed.\n"; +} + +void backgroundTask3() +{ + std::cout << "Background Master_3 starting...\n"; + ClientProcCommunicator master(shared_mem_name); + Message request{3, MessageType::HANDSHAKE}; + Message response{666, MessageType::HANDSHAKE}; + + int counter = 0; + + while (counter < MSG_COUNT) + { + master.sendRequestGetResponse(&request, response); + counter++; + } + + std::cout << "Background Master_3 completed.\n"; +} + +void backgroundTask4() +{ + std::cout << "Background Master_4 starting...\n"; + ClientProcCommunicator master(shared_mem_name); + Message request{4, MessageType::HANDSHAKE}; + Message response{666, MessageType::HANDSHAKE}; + + int counter = 0; + + while (counter < MSG_COUNT) + { + master.sendRequestGetResponse(&request, response); + // std::cout << "m 2 =" << response.id << std::endl; + counter++; + } + + std::cout << "Background Master_4 completed.\n"; +} + +void backgroundTask5() +{ + std::cout << "Background Master_5 starting...\n"; + ClientProcCommunicator master(shared_mem_name); + Message request{5, MessageType::HANDSHAKE}; + Message response{666, MessageType::HANDSHAKE}; + + int counter = 0; + + while (counter < MSG_COUNT) + { + master.sendRequestGetResponse(&request, response); + // std::cout << "m 5 =" << response.id << std::endl; + counter++; + } + + std::cout << "Background Master_5 completed.\n"; +} +int main() +{ + { + // test: one to one + std::cout << "Server starts...\n"; + ServerProcCommunicator *slave = new ServerProcCommunicator(shared_mem_name); + Message *res = nullptr; + + int counter = 0; + std::thread worker_master1(backgroundTask1); + + while (counter < MSG_COUNT * 1) + { + Message msg{777, MessageType::HANDSHAKE_OK}; + Message *res = slave->receive(); + // usleep(6000); + msg.id = res->id; + slave->send(&msg); + + counter++; + } + std::cout << "Server syncing...\n"; + + if (worker_master1.joinable()) + worker_master1.join(); + + delete slave; + std::cout << "Server has finished work...\n"; + } + + { + // test: one to many + std::cout << "Server starts...\n"; + ServerProcCommunicator *slave = new ServerProcCommunicator(shared_mem_name); + Message *res = nullptr; + + int counter = 0; + std::thread worker_master1(backgroundTask1); + std::thread worker_master2(backgroundTask2); + std::thread worker_master3(backgroundTask3); + std::thread worker_master4(backgroundTask4); + std::thread worker_master5(backgroundTask5); + + while (counter < MSG_COUNT * 5) + { + // std::cout << "Server st1 "<receive(); + // usleep(6000); + msg.id = res->id; + slave->send(&msg); + + counter++; + // std::cout << "Server st1 "< +#include +#include +#include +#include "gtest/gtest.h" +static const std::string shared_mem_name{"/shmem_test"}; + +// Function to be executed in a separate thread +void backgroundTask() +{ + std::cout << "Background task starts.\n"; + Message request{1, MessageType::HANDSHAKE}; + Message response{666, MessageType::HANDSHAKE}; + ClientProcCommunicator master(shared_mem_name); + int counter = 0; + + while (counter < 10) + { + //each client must receive its id + master.sendRequestGetResponse(&request, response); + EXPECT_EQ(response.id, 1); + EXPECT_EQ(response.type, MessageType::HANDSHAKE_OK); + counter++; + } + + std::cout << "Background task completed.\n"; +} + +void backgroundTaskMasterMaster() +{ + std::cout << "Background Master task started...\n"; + ClientProcCommunicator master( shared_mem_name); + Message request{2, MessageType::HANDSHAKE}; + Message response{666, MessageType::HANDSHAKE}; + int counter = 0; + + while (counter < 10) + { + //each client must receive its id + master.sendRequestGetResponse(&request, response); + EXPECT_EQ(response.id, 2); + EXPECT_EQ(response.type, MessageType::HANDSHAKE_OK); + counter++; + } + + std::cout << "Background Master task completed.\n"; +} +TEST(MessagingTest, TestMultiMasterMode) +{ + std::cout << "Server starts...\n"; + ServerProcCommunicator *slave = new ServerProcCommunicator(shared_mem_name); + Message *res = nullptr; + + int counter = 0; + std::thread worker(backgroundTask); + std::thread worker_master(backgroundTaskMasterMaster); + while (counter < 20) + { + Message msg{777, MessageType::HANDSHAKE_OK}; + Message *res = slave->receive(); + msg.id = res->id; + slave->send(&msg); + counter++; + } + + delete slave; + + if (worker.joinable()) + worker.join(); + + if (worker_master.joinable()) + worker_master.join(); +} \ No newline at end of file diff --git a/unit_tests/MovementDetectorTest.cpp b/unit_tests/MovementDetectorTest.cpp index 7b62d5d..dcf02c4 100644 --- a/unit_tests/MovementDetectorTest.cpp +++ b/unit_tests/MovementDetectorTest.cpp @@ -20,7 +20,7 @@ TEST(MovementDetectionTest, checkTwoObjectsMovements) movement::ImagePairPtr pair(std::make_shared(firstBmp, secondtBmp)); std::multiset m1; - am::configuration::ConfigurationReader reader; + configuration::ConfigurationReader reader; auto conf = reader.getConfigurationFromFile("inputs/configuration.csv"); movement::MovementDetector detector(3, conf, lPtr); @@ -124,7 +124,7 @@ TEST(MovementDetectionTest, checkMovementOnEqualImages) obj_r.addPixel(20, 20); m_objs.emplace(obj_r); - am::configuration::ConfigurationReader reader; + configuration::ConfigurationReader reader; auto conf = reader.getConfigurationFromFile("inputs/configuration.csv"); movement::MovementDetector detector(4, conf, lPtr); detector.setTrackingObjects(m_objs); diff --git a/unit_tests/ObjectDetectorTest.cpp b/unit_tests/ObjectDetectorTest.cpp index 117fec6..2ebc5db 100644 --- a/unit_tests/ObjectDetectorTest.cpp +++ b/unit_tests/ObjectDetectorTest.cpp @@ -16,7 +16,7 @@ using namespace am::common::types; using namespace am::analyze; -using namespace am::configuration; +using namespace configuration; using namespace am::analyze::algorithm; struct ObjectDetectorWrapper : public ::testing::Test { @@ -39,8 +39,8 @@ struct ObjectDetectorWrapper : public ::testing::Test std::shared_ptr loggerPtr; std::unique_ptr extractor; const size_t opt_threads = am::common::getOptimalThreadsCount(); - am::configuration::ConfigurationReader reader; - std::shared_ptr conf = reader.getConfigurationFromFile("inputs/configuration.csv"); + configuration::ConfigurationReader reader; + Configuration conf = reader.getConfigurationFromFile("inputs/configuration.csv"); }; TEST_F(ObjectDetectorWrapper, Check3ObjsFHD) @@ -66,7 +66,7 @@ TEST_F(ObjectDetectorWrapper, Check2Objs10x10) algorithm::ImagePair pair(data[0], data[1]); // configuration where object with 1 pixel could be detected Configuration conf_s10x10{1, 1, 1, 1, 1, 1}; - std::shared_ptr conf1 = std::make_shared(conf_s10x10); + Configuration conf1 = Configuration(conf_s10x10); algorithm::ObjectDetector detector = algorithm::ObjectDetector(opt_threads, conf1, loggerPtr); algorithm::DescObjects rects1 = detector.getObjectsRects(pair); @@ -83,7 +83,7 @@ TEST_F(ObjectDetectorWrapper, Check5Objs20x20) algorithm::ImagePair pair(data[0], data[1]); // configuration where object with 1 pixel could be detected Configuration conf_s10x10{1, 1, 1, 1, 1, 1}; - std::shared_ptr conf1 = std::make_shared(conf_s10x10); + Configuration conf1 = Configuration(conf_s10x10); algorithm::ObjectDetector detector = algorithm::ObjectDetector(opt_threads, conf1, loggerPtr); algorithm::DescObjects rects1 = detector.getObjectsRects(pair); @@ -111,7 +111,7 @@ TEST_F(ObjectDetectorWrapper, CheckTimeLimitation) algorithm::ImagePair pair(data[0], data[1]); // configuration where object with 1 pixel could be detected Configuration conf_s10x10{50, 3, 1, duration_70ms, 1, 1}; - std::shared_ptr conf1 = std::make_shared(conf_s10x10); + Configuration conf1 = Configuration(conf_s10x10); // note: big count of threads also require longer time to sync algorithm::ObjectDetector detector = algorithm::ObjectDetector(opt_threads, conf1, loggerPtr);