X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ba9a4cfeba4eb00e84cd17603fc9654e81445655..4bcfd40036f842e976d329cd0cee7349b8e0f4d6:/src/mc/mc_hash.cpp

diff --git a/src/mc/mc_hash.cpp b/src/mc/mc_hash.cpp
index 72dd93cfac..8c23131509 100644
--- a/src/mc/mc_hash.cpp
+++ b/src/mc/mc_hash.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2014-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2014-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -8,12 +7,12 @@
 
 #include <cstdint>
 
-#include <xbt/log.h>
+#include "xbt/log.h"
 
-#include "src/mc/mc_private.h"
-#include "src/mc/mc_snapshot.h"
 #include "mc/datatypes.h"
 #include "src/mc/mc_hash.hpp"
+#include "src/mc/mc_private.hpp"
+#include "src/mc/sosp/mc_snapshot.hpp"
 #include <mc/mc.h>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_hash, mc, "Logging specific to mc_hash");
@@ -24,12 +23,13 @@ namespace mc {
 namespace {
 
 class djb_hash {
-  hash_type state_ = 5381ll;
+  hash_type state_ = 5381LL;
+
 public:
   template<class T>
   void update(T& x)
   {
-    state_ = (state_ << 5) + state_ + state_;
+    state_ = (state_ << 5) + state_ + x;
   }
   hash_type value()
   {
@@ -41,14 +41,15 @@ public:
 
 hash_type hash(Snapshot const& snapshot)
 {
-  XBT_DEBUG("START hash %i", snapshot.num_state);
+  XBT_DEBUG("START hash %i", snapshot.num_state_);
   djb_hash hash;
-  // TODO, nb_processes
-  // TODO, heap_bytes_used
-  // TODO, root variables
-  // TODO, basic stack frame information
-  // TODO, stack frame local variables
-  XBT_DEBUG("END hash %i", snapshot.num_state);
+  // TODO:
+  // * nb_processes
+  // * heap_bytes_used
+  // * root variables
+  // * basic stack frame information
+  // * stack frame local variables
+  XBT_DEBUG("END hash %i", snapshot.num_state_);
   return hash.value();
 }