Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 856e1ccd4559
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ec4018a309cf
Choose a head ref
  • 5 commits
  • 4 files changed
  • 1 contributor

Commits on Aug 17, 2021

  1. Copy the full SHA
    6ff6923 View commit details
  2. Copy the full SHA
    1e069cb View commit details
  3. Merge branch '3089' of https://github.com/pleroy/Principia into 3089

    # Conflicts:
    #	journal/profiles.cpp
    pleroy committed Aug 17, 2021
    Copy the full SHA
    5d2c7ac View commit details
  4. 0

    pleroy committed Aug 17, 2021
    Copy the full SHA
    6912841 View commit details

Commits on Aug 18, 2021

  1. Merge pull request #3100 from pleroy/3089

    A few improvements to journal replaying
    pleroy authored Aug 18, 2021
    Copy the full SHA
    ec4018a View commit details
Showing with 14 additions and 6 deletions.
  1. +2 −0 journal/player.cpp
  2. +0 −2 journal/player.hpp
  3. +1 −1 journal/player_test.cpp
  4. +11 −3 journal/profiles.cpp
2 changes: 2 additions & 0 deletions journal/player.cpp
Original file line number Diff line number Diff line change
@@ -13,6 +13,8 @@
#include "journal/profiles.hpp"
#include "glog/logging.h"

#define PRINCIPIA_PLAYER_ALLOW_VERSION_MISMATCH 0

namespace principia {

using base::GetLine;
2 changes: 0 additions & 2 deletions journal/player.hpp
Original file line number Diff line number Diff line change
@@ -8,8 +8,6 @@

#include "serialization/journal.pb.h"

#define PRINCIPIA_PLAYER_ALLOW_VERSION_MISMATCH 0

namespace principia {
namespace journal {

2 changes: 1 addition & 1 deletion journal/player_test.cpp
Original file line number Diff line number Diff line change
@@ -88,7 +88,7 @@ TEST_F(PlayerTest, DISABLED_SECULAR_Debug) {
// An example of how journaling may be used for debugging. You must set
// |path| and fill the |method_in| and |method_out_return| protocol buffers.
std::string path =
R"(P:\Public Mockingbird\Principia\Saves\3064\JOURNAL.20210714-175107)"; // NOLINT
R"(P:\Public Mockingbird\Principia\Journals\JOURNAL.20210811-183504)"; // NOLINT
Player player(path);
int count = 0;
while (player.Play(count)) {
14 changes: 11 additions & 3 deletions journal/profiles.cpp
Original file line number Diff line number Diff line change
@@ -80,11 +80,19 @@ std::uint64_t SerializePointer(T* t) {

} // namespace

// To remove the check, define this macro to be:
// auto aa = (a); auto bb = (b);
#define PRINCIPIA_CHECK_EQ(a, b) CHECK((a) == (b))
#define PRINCIPIA_PERFORM_RUN_CHECKS 1
#define PRINCIPIA_SET_VERBOSE_LOGGING 1

#if PRINCIPIA_PERFORM_RUN_CHECKS
#define PRINCIPIA_CHECK_EQ(a, b) CHECK((a) == (b))
#else
#define PRINCIPIA_CHECK_EQ(a, b) \
{ \
[[maybe_unused]] auto const aa = (a); \
[[maybe_unused]] auto const bb = (b); \
}
#endif

#include "journal/profiles.generated.cc"

#undef PRINCIPIA_SET_VERBOSE_LOGGING