Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create mechanics for some queries of the broker to reset on changes #1617

Merged
merged 4 commits into from
Oct 2, 2020

Conversation

phlptp
Copy link
Member

@phlptp phlptp commented Oct 2, 2020

Summary

If merged this pull request will add a reset counter to some of the broker queries, dependecy_graph, data_flow_graph,and some others.

Proposed changes

  • add reset counter to detect changes in the federation
  • add a query for the counter to cores and brokers

phlptp and others added 3 commits October 2, 2020 04:38
Co-authored-by: Philip Top <top1@llnl.gov>
Co-authored-by: HELICS-bot <HELICS-bot@users.noreply.github.com>
@phlptp
Copy link
Member Author

phlptp commented Oct 2, 2020

Addresses Issue #1610

src/helics/core/CommonCore.cpp Outdated Show resolved Hide resolved
src/helics/core/CoreBroker.cpp Outdated Show resolved Hide resolved
Co-authored-by: Ryan Mast <nightlark@users.noreply.github.com>
@phlptp phlptp merged commit 9329f26 into develop Oct 2, 2020
@phlptp phlptp deleted the query_reset branch October 2, 2020 20:42
phlptp added a commit that referenced this pull request Oct 27, 2020
…1617)

* Create mechanics for some queries of the broker to reset on changes add counter query.

* Automated formatting of repo files (#1618)

Co-authored-by: Philip Top <top1@llnl.gov>
Co-authored-by: HELICS-bot <HELICS-bot@users.noreply.github.com>

* fix static analyzer warnings

* Apply suggestions from code review

Co-authored-by: Ryan Mast <nightlark@users.noreply.github.com>

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: HELICS-bot <HELICS-bot@users.noreply.github.com>
Co-authored-by: Ryan Mast <nightlark@users.noreply.github.com>
# Conflicts:
#	src/helics/core/CommonCore.cpp
#	src/helics/core/CoreBroker.cpp
phlptp added a commit that referenced this pull request Nov 6, 2020
…1617)

* Create mechanics for some queries of the broker to reset on changes add counter query.

* Automated formatting of repo files (#1618)

Co-authored-by: Philip Top <top1@llnl.gov>
Co-authored-by: HELICS-bot <HELICS-bot@users.noreply.github.com>

* fix static analyzer warnings

* Apply suggestions from code review

Co-authored-by: Ryan Mast <nightlark@users.noreply.github.com>

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: HELICS-bot <HELICS-bot@users.noreply.github.com>
Co-authored-by: Ryan Mast <nightlark@users.noreply.github.com>
# Conflicts:
#	src/helics/core/CommonCore.cpp
#	src/helics/core/CoreBroker.cpp
phlptp added a commit that referenced this pull request Nov 6, 2020
* #1380 (#1600)

Co-authored-by: Vyacheslav Barsuk <vbarsuk@nrel.gov>

* add a message clear operation for Message to the C++/C/C++98 APi's (#1622)

* add a message clear operation for Message to the C++/C/C++98 APi's

* Automated formatting of repo files (#1623)

Co-authored-by: Philip Top <top1@llnl.gov>
Co-authored-by: HELICS-bot <HELICS-bot@users.noreply.github.com>

* Update src/helics/shared_api_library/MessageFederate.h

Co-authored-by: Ryan Mast <nightlark@users.noreply.github.com>

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: HELICS-bot <HELICS-bot@users.noreply.github.com>
Co-authored-by: Ryan Mast <nightlark@users.noreply.github.com>
# Conflicts:
#	src/helics/core/core-data.hpp
#	src/helics/shared_api_library/MessageFederateExport.cpp

* add a requested time field to the current_time query result  (#1619)

* add a requested time field to the query result and fix a bug that could potentially cause deadlock if particular queries were made while a federate was using an async call.

* Automated formatting of repo files (#1620)

Co-authored-by: Philip Top <top1@llnl.gov>
Co-authored-by: HELICS-bot <HELICS-bot@users.noreply.github.com>

* Update docs/user-guide/queries.md

Co-authored-by: Ryan Mast <nightlark@users.noreply.github.com>

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: HELICS-bot <HELICS-bot@users.noreply.github.com>
Co-authored-by: Ryan Mast <nightlark@users.noreply.github.com>

* Create mechanics for some queries of the broker to reset on changes (#1617)

* Create mechanics for some queries of the broker to reset on changes add counter query.

* Automated formatting of repo files (#1618)

Co-authored-by: Philip Top <top1@llnl.gov>
Co-authored-by: HELICS-bot <HELICS-bot@users.noreply.github.com>

* fix static analyzer warnings

* Apply suggestions from code review

Co-authored-by: Ryan Mast <nightlark@users.noreply.github.com>

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: HELICS-bot <HELICS-bot@users.noreply.github.com>
Co-authored-by: Ryan Mast <nightlark@users.noreply.github.com>
# Conflicts:
#	src/helics/core/CommonCore.cpp
#	src/helics/core/CoreBroker.cpp

* Issue #1548 (#1642)

* add tests and additional strings for verification of the index translations

* specify .*JPG is binary

* Automated formatting of repo files (#1643)

Co-authored-by: Philip Top <top1@llnl.gov>
Co-authored-by: HELICS-bot <HELICS-bot@users.noreply.github.com>

* add missing include

* fix some formatting issues

* fix some missing underscores

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: HELICS-bot <HELICS-bot@users.noreply.github.com>
# Conflicts:
#	docs/introduction/hello-world-VS.md
#	docs/introduction/hello-world.md
#	src/helics/application_api/FederateInfo.cpp
#	tests/helics/shared_library/CMakeLists.txt

* C api query callback (#1634)

* Add a query callback for the C api

* add queryCallback to the C api including some additional tests

* Automated formatting of repo files (#1635)

Co-authored-by: Philip Top <top1@llnl.gov>
Co-authored-by: HELICS-bot <HELICS-bot@users.noreply.github.com>

* Fix static analyzer issues

* Automated formatting of repo files (#1636)

Co-authored-by: Philip Top <top1@llnl.gov>
Co-authored-by: HELICS-bot <HELICS-bot@users.noreply.github.com>

* fix seg fault

* Automated formatting of repo files (#1637)

Co-authored-by: Philip Top <top1@llnl.gov>
Co-authored-by: HELICS-bot <HELICS-bot@users.noreply.github.com>

* Fix some codacy and asan errors in the queryTests

* update comment spacing

* Automated formatting of repo files (#1638)

Co-authored-by: Philip Top <top1@llnl.gov>
Co-authored-by: HELICS-bot <HELICS-bot@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Ryan Mast <nightlark@users.noreply.github.com>

* Update Federate.hpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: HELICS-bot <HELICS-bot@users.noreply.github.com>
Co-authored-by: Ryan Mast <nightlark@users.noreply.github.com>
# Conflicts:
#	src/helics/core/CommonCore.cpp
#	src/helics/core/Core.hpp

* merge in a series of fixes from Helics 2 into HELICS 3

* Automated formatting of repo files (#1694)

Co-authored-by: Philip Top <top1@llnl.gov>
Co-authored-by: HELICS-bot <HELICS-bot@users.noreply.github.com>

* fix broken tests

Co-authored-by: Slava Barsuk <50117112+vbarsuk@users.noreply.github.com>
Co-authored-by: Vyacheslav Barsuk <vbarsuk@nrel.gov>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: HELICS-bot <HELICS-bot@users.noreply.github.com>
Co-authored-by: Ryan Mast <nightlark@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants